Browse Source

remove bash_profile.sh from unfiltered

Lita Gratrix 10 years ago
parent
commit
d6f3133891

+ 0 - 3
frameworks/Scala/unfiltered/bash_profile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export SBT_HOME=${IROOT}/sbt

+ 0 - 29
frameworks/Scala/unfiltered/setup_unfiltered.py

@@ -1,29 +0,0 @@
-
-import subprocess
-import sys
-import setup_util
-import os
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("unfiltered/src/main/resources/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
-  setup_util.replace_text("unfiltered/src/main/resources/application.conf", "maxThreads = \\d+", "maxThreads = " + str(args.max_threads))
-
-  subprocess.check_call("../sbt/sbt assembly", shell=True, cwd="unfiltered", stderr=errfile, stdout=logfile)
-  subprocess.Popen("java -jar bench-assembly-1.0.0.jar", shell=True, cwd="unfiltered/target/scala-2.10", stderr=errfile, stdout=logfile)
-
-  return 0
-def stop(logfile, errfile):
-  p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
-  out, err = p.communicate()
-  for line in out.splitlines():
-    if 'bench-assembly' in line or 'java' in line:
-      pid = int(line.split(None, 2)[1])
-      os.kill(pid, 15)
-
-  # Takes up so much disk space
-  if os.name == 'nt':
-    subprocess.check_call("del /f /s /q target", shell=True, cwd="unfiltered", stderr=errfile, stdout=logfile)
-  else:
-    subprocess.check_call("rm -rf target", shell=True, cwd="unfiltered", stderr=errfile, stdout=logfile)
-
-  return 0

+ 1 - 0
frameworks/Scala/unfiltered/setup_unfiltered.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 #!/bin/bash
+export SBT_HOME=${IROOT}/sbt
 
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' src/main/resources/application.conf
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' src/main/resources/application.conf
 sed -i 's|maxThreads = .*|maxThreads = '"${MAX_THREADS}"'|g' src/main/resources/application.conf
 sed -i 's|maxThreads = .*|maxThreads = '"${MAX_THREADS}"'|g' src/main/resources/application.conf