瀏覽代碼

Help finagle find sbt

Hamilton Turner 11 年之前
父節點
當前提交
be159f20b4
共有 3 個文件被更改,包括 8 次插入5 次删除
  1. 5 0
      frameworks/Scala/finagle/bash_profile.sh
  2. 1 0
      frameworks/Scala/finagle/install.sh
  3. 2 5
      frameworks/Scala/finagle/setup.py

+ 5 - 0
frameworks/Scala/finagle/bash_profile.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export SBT_HOME=${IROOT}/sbt
+
+export PATH="$SBT_HOME/bin:$PATH"

+ 1 - 0
frameworks/Scala/finagle/install.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
 
+fw_depends java sbt

+ 2 - 5
frameworks/Scala/finagle/setup.py

@@ -6,19 +6,16 @@ import os
 
 def start(args, logfile, errfile):
 
-
     if os.name == 'nt':
       subprocess.check_call("..\\sbt\\sbt.bat update compile", shell=True, cwd="finagle", stderr=errfile, stdout=logfile)
       subprocess.Popen("..\\sbt\\sbt.bat -Ddb.host=" + args.database_host + " run", cwd="finagle", shell=True, stderr=errfile, stdout=logfile)
     else:
-      subprocess.check_call("../sbt/sbt update compile", shell=True, cwd="finagle", stderr=errfile, stdout=logfile)
-      subprocess.Popen("../sbt/sbt -Ddb.host=" + args.database_host + " run", cwd="finagle", shell=True, stderr=errfile, stdout=logfile)
+      subprocess.check_call("sbt update compile", shell=True, cwd="finagle", stderr=errfile, stdout=logfile)
+      subprocess.Popen("sbt -Ddb.host=" + args.database_host + " run", cwd="finagle", shell=True, stderr=errfile, stdout=logfile)
 
-    time.sleep(5)
     return 0
 
 
-
 def stop(logfile, errfile):
   if os.name == 'nt':
     subprocess.check_call("wmic process where \"CommandLine LIKE '%\\\\sbt\\\\sbt%'\" call terminate", stderr=errfile, stdout=logfile)