Browse Source

Fixed a LOT of the broken stuff I did

msmith-techempower 10 years ago
parent
commit
80dc9024ca
45 changed files with 146 additions and 283 deletions
  1. 1 1
      frameworks/C++/ULib/setup-mysql.sh
  2. 1 1
      frameworks/C++/cpoll_cppsp/setup.sh
  3. 0 38
      frameworks/C++/treefrog/setup-thread.py
  4. 17 0
      frameworks/C++/treefrog/setup-thread.sh
  5. 0 3
      frameworks/C++/treefrog/setup.sh
  6. 0 26
      frameworks/C++/wt/setup_postgres.py
  7. 10 0
      frameworks/C++/wt/setup_postgres.sh
  8. 1 1
      frameworks/C/lwan/setup-mysql.sh
  9. 2 2
      frameworks/C/onion/setup.sh
  10. 3 1
      frameworks/Go/beego/bash_profile.sh
  11. 3 1
      frameworks/Go/gin/bash_profile.sh
  12. 0 2
      frameworks/Go/gin/setup.sh
  13. 3 1
      frameworks/Go/webgo/bash_profile.sh
  14. 4 0
      frameworks/Haskell/snap/bash_profile.sh
  15. 1 1
      frameworks/Haskell/snap/install.sh
  16. 0 27
      frameworks/Haskell/snap/setup.py
  17. 13 0
      frameworks/Haskell/snap/setup.sh
  18. 4 3
      frameworks/Haskell/wai/bash_profile.sh
  19. 1 1
      frameworks/Haskell/wai/install.sh
  20. 0 27
      frameworks/Haskell/wai/setup.py
  21. 11 0
      frameworks/Haskell/wai/setup.sh
  22. 4 3
      frameworks/Haskell/yesod/bash_profile.sh
  23. 1 1
      frameworks/Haskell/yesod/install.sh
  24. 0 27
      frameworks/Haskell/yesod/setup.py
  25. 11 0
      frameworks/Haskell/yesod/setup.sh
  26. 0 58
      frameworks/Java/play2-java/setup_common.py
  27. 0 6
      frameworks/Java/play2-java/setup_java.py
  28. 5 0
      frameworks/Java/play2-java/setup_java.sh
  29. 0 6
      frameworks/Java/play2-java/setup_java_ebean_bonecp.py
  30. 5 0
      frameworks/Java/play2-java/setup_java_ebean_bonecp.sh
  31. 0 6
      frameworks/Java/play2-java/setup_java_ebean_hikaricp.py
  32. 5 0
      frameworks/Java/play2-java/setup_java_ebean_hikaricp.sh
  33. 0 6
      frameworks/Java/play2-java/setup_java_jpa_bonecp.py
  34. 5 0
      frameworks/Java/play2-java/setup_java_jpa_bonecp.sh
  35. 0 6
      frameworks/Java/play2-java/setup_java_jpa_hikaricp.py
  36. 5 0
      frameworks/Java/play2-java/setup_java_jpa_hikaricp.sh
  37. 10 0
      frameworks/Java/servlet3-cass/setup.sh
  38. 3 0
      frameworks/Lua/openresty/bash_profile.sh
  39. 2 4
      frameworks/Lua/openresty/setup.sh
  40. 0 5
      toolset/run-ci.py
  41. 3 1
      toolset/setup/linux/languages/go.sh
  42. 5 4
      toolset/setup/linux/languages/haskell.sh
  43. 0 10
      toolset/setup/linux/languages/haskell78.sh
  44. 5 2
      toolset/setup/linux/languages/java.sh
  45. 2 2
      toolset/setup/linux/webservers/openresty.sh

+ 1 - 1
frameworks/C++/ULib/setup-mysql.sh

@@ -8,4 +8,4 @@ export ORM_OPTION="host=${DBHOST} user=benchmarkdbuser password=benchmarkdbpass
 sed -i 's|PREFORK_CHILD .*|PREFORK_CHILD '"${MAX_THREADS}"'|g' $ULIB_ROOT/benchmark.cfg
 
 # 2. Start ULib Server (userver_tcp)
-$ULIB_ROOT/bin/userver_tcp -c $ULIB_ROOT/benchmark.cfg
+$ULIB_ROOT/bin/userver_tcp -c $ULIB_ROOT/benchmark.cfg &

+ 1 - 1
frameworks/C++/cpoll_cppsp/setup.sh

@@ -3,6 +3,6 @@
 sed -i 's|#define BENCHMARK_DB_HOST ".*"|#define BENCHMARK_DB_HOST "'"$DBHOST"'"|g' www/connectioninfo.H
 
 make clean
-make -C $CPPSP_HOME
+make
 cd $CPPSP_HOME
 ./run_application $TROOT/www -g g++-4.8 -m /forcedynamic.cppsm &

+ 0 - 38
frameworks/C++/treefrog/setup-thread.py

@@ -1,38 +0,0 @@
-
-import subprocess
-import sys
-import setup_util
-from os.path import expanduser
-
-home = expanduser("~")
-
-##############
-# start(args)
-##############
-def start(args, logfile, errfile):
-  setup_util.replace_text("treefrog/config/database.ini", "HostName=.*", "HostName=" + args.database_host)
-  setup_util.replace_text("treefrog/config/application.ini", "MultiProcessingModule=.*", "MultiProcessingModule=thread")
-
-  # 1. Generate Makefile
-  # 2. Compile applicaton
-  # 3. Clean log files
-  # 4. Start TreeFrog
-  try:
-    subprocess.check_call("qmake -r CONFIG+=release", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
-    subprocess.check_call("make clean", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
-    subprocess.check_call("make -j8", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
-    subprocess.check_call("rm -f log/*.log", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
-    subprocess.check_call("treefrog -d $TROOT", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-
-##############
-# stop()
-##############
-def stop(logfile, errfile):
-  try:
-    subprocess.call("treefrog -k abort $TROOT", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1

+ 17 - 0
frameworks/C++/treefrog/setup-thread.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+sed -i 's|HostName=.*|HostName='"$DBHOST"'|g' config/database.ini
+sed -i "s|MultiProcessingModule=.*|MultiProcessingModule=thread|g" config/application.ini
+
+# 1. Generate Makefile
+qmake -r CONFIG+=release
+
+# 2. Compile applicaton
+make clean
+make -j8
+
+# 3. Clean log files
+rm -f log/*.log
+
+# 4. Start TreeFrog
+treefrog -d $TROOT &

+ 0 - 3
frameworks/C++/treefrog/setup.sh

@@ -3,9 +3,6 @@
 sed -i 's|HostName=.*|HostName='"$DBHOST"'|g' config/database.ini
 sed -i "s|MultiProcessingModule=.*|MultiProcessingModule=hybrid|g" config/application.ini
 
-# 0. Set PATH up
-export PATH=$IROOT/treefrog/bin:$PATH
-
 # 1. Generate Makefile
 qmake -r CONFIG+=release
 

+ 0 - 26
frameworks/C++/wt/setup_postgres.py

@@ -1,26 +0,0 @@
-import subprocess
-import os
-import setup_util
-
-def start(args, logfile, errfile, cwd='wt'):
-    setup_util.replace_text("wt/benchmark.cpp", "INSERT_DB_HOST_HERE", args.database_host);
-    subprocess.check_call('g++-4.8 -O3 -DNDEBUG -DBENCHMARK_USE_POSTGRES -std=c++0x -L${BOOST_LIB} -I${BOOST_INC} -L${WT_LIB} -I${WT_INC} -o benchmark_postgres.wt benchmark.cpp -lwt -lwthttp -lwtdbo -lwtdbopostgres -lboost_thread', shell=True, cwd=cwd, stderr=errfile, stdout=logfile)
-    subprocess.Popen(['./benchmark_postgres.wt',
-        '-c', 'wt_config.xml',
-        '-t', str(args.max_threads),
-    	'--docroot', '.',
-        '--http-address', '0.0.0.0',
-        '--http-port', '8080',
-        '--accesslog=-',
-        '--no-compression'],
-        cwd=cwd, 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 'benchmark_postgres.wt' in line:
-            pid = int(line.split(None, 2)[1])
-            os.kill(pid, 15)
-    return 0

+ 10 - 0
frameworks/C++/wt/setup_postgres.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This has to be included here since it is one of the vars NOT copied from the original environment
+export LD_LIBRARY_PATH="${BOOST_LIB}:${WT_LIB}:${LD_LIBRARY_PATH}"
+
+sed -i 's|INSERT_DB_HOST_HERE|'"${DBHOST}"'|g' benchmark.cpp
+
+g++-4.8 -O3 -DNDEBUG -std=c++0x -L${BOOST_LIB} -I${BOOST_INC} -L${WT_LIB} -I${WT_INC} -o benchmark.wt benchmark.cpp -lwt -lwthttp -lwtdbo -lwtdbomysql -lboost_thread
+
+./benchmark_postgres.wt -c wt_config.xml -t ${MAX_THREADS} --docroot . --http-address 0.0.0.0 --http-port 8080 --accesslog=- --no-compression &

+ 1 - 1
frameworks/C/lwan/setup-mysql.sh

@@ -7,4 +7,4 @@ export MYSQL_HOST=$DBHOST
 export MYSQL_DB=hello_world
 
 cd $LWAN_ROOT/techempower
-$LWAN_BUILD/techempower/techempower
+$LWAN_BUILD/techempower/techempower &

+ 2 - 2
frameworks/C/onion/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 rm -f *.o
-cp -R $IROOT/onion onion/onion
-rm CMakeCache.txt
+ln -s $IROOT/onion onion
+rm -f onion/build/CMakeCache.txt
 make
 ./hello &

+ 3 - 1
frameworks/Go/beego/bash_profile.sh

@@ -1,4 +1,6 @@
+#!/bin/bash
+
 # Set the root of our go installation
 export GOROOT=${IROOT}/go
 
-export GOPATH=${TROOT}
+export GOPATH=${TROOT}

+ 3 - 1
frameworks/Go/gin/bash_profile.sh

@@ -1,4 +1,6 @@
+#!/bin/bash
+
 # Set the root of our go installation
 export GOROOT=${IROOT}/go
 
-export GOPATH=${TROOT}
+export GOPATH=${TROOT}

+ 0 - 2
frameworks/Go/gin/setup.sh

@@ -3,6 +3,4 @@
 # Where to find the go executable
 export PATH="$GOROOT/bin:$PATH"
 
-go get ./...
-
 go run hello.go &

+ 3 - 1
frameworks/Go/webgo/bash_profile.sh

@@ -1,4 +1,6 @@
+#!/bin/bash
+
 # Set the root of our go installation
 export GOROOT=${IROOT}/go
 
-export GOPATH=${TROOT}
+export GOPATH=${TROOT}

+ 4 - 0
frameworks/Haskell/snap/bash_profile.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export CABAL_HOME=/opt/cabal/1.20
+export HASKELL_HOME=/opt/ghc/7.8.3

+ 1 - 1
frameworks/Haskell/snap/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends haskell
+fw_depends haskell

+ 0 - 27
frameworks/Haskell/snap/setup.py

@@ -1,27 +0,0 @@
-import subprocess
-import sys
-import setup_util
-import os
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("snap/bench/cfg/db.cfg", "host=\".*\"", "host=\"" + args.database_host + "\"")
-  subprocess.check_call("cabal update", shell=True, cwd="snap/bench", stderr=errfile, stdout=logfile)
-  subprocess.check_call("cabal install", shell=True, cwd="snap/bench", stderr=errfile, stdout=logfile)
-  subprocess.check_call("cabal configure", shell=True, cwd="snap/bench", stderr=errfile, stdout=logfile)
-  subprocess.check_call("cabal build", shell=True, cwd="snap/bench", stderr=errfile, stdout=logfile)
-
-  subprocess.Popen("dist/build/snap-bench/snap-bench +RTS -A4M -N -qg2 -I0 -G2", shell=True, cwd="snap/bench", 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 'snap-bench' in line:
-      try:
-        pid = int(line.split(None, 2)[1])
-        os.kill(pid, 15)
-      except OSError:
-        pass
-
-  return 0

+ 13 - 0
frameworks/Haskell/snap/setup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+sed -i 's|host=".*"|host="'"${DBHOST}"'"|g' bench/cfg/db.cfg
+
+export PATH=${HASKELL_HOME}/bin:$PATH
+
+cd bench
+
+${CABAL_HOME}/bin/cabal update
+${CABAL_HOME}/bin/cabal sandbox init
+${CABAL_HOME}/bin/cabal --bindir=${TROOT}/bench/dist/build/snap-bench install
+
+dist/build/snap-bench/snap-bench +RTS -A4M -N -qg2 -I0 -G2 &

+ 4 - 3
frameworks/Haskell/wai/bash_profile.sh

@@ -1,3 +1,4 @@
-# Where to find the ghc and cabal executables
-export PATH="/opt/ghc/7.8.3/bin:/opt/cabal/1.20/bin:$PATH"
-export LANG=en_US.UTF-8
+#!/bin/bash
+
+export CABAL_HOME=/opt/cabal/1.20
+export HASKELL_HOME=/opt/ghc/7.8.3

+ 1 - 1
frameworks/Haskell/wai/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends haskell78
+fw_depends haskell

+ 0 - 27
frameworks/Haskell/wai/setup.py

@@ -1,27 +0,0 @@
-
-import subprocess
-import sys
-import setup_util
-import os
-
-def start(args, logfile, errfile):
-  subprocess.check_call("cabal update", shell=True, cwd="wai/bench", stderr=errfile, stdout=logfile)
-  subprocess.check_call("cabal install", shell=True, cwd="wai/bench", stderr=errfile, stdout=logfile)
-
-  db_host = args.database_host
-  threads = str(args.max_threads)
-  subprocess.Popen("dist/build/bench/bench " + threads + " " + db_host + " +RTS -A32m -N" + threads, shell=True, cwd="wai/bench", 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' in line:
-      try:
-        pid = int(line.split(None, 2)[1])
-        os.kill(pid, 15)
-      except OSError:
-        pass
-
-  return 0

+ 11 - 0
frameworks/Haskell/wai/setup.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export PATH=${HASKELL_HOME}/bin:$PATH
+
+cd bench
+
+${CABAL_HOME}/bin/cabal update
+${CABAL_HOME}/bin/cabal sandbox init
+${CABAL_HOME}/bin/cabal --bindir=${TROOT}/bench/dist/build/bench install
+
+dist/build/bench/bench ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

+ 4 - 3
frameworks/Haskell/yesod/bash_profile.sh

@@ -1,3 +1,4 @@
-# Where to find the ghc and cabal executables
-export PATH="/opt/ghc/7.8.3/bin:/opt/cabal/1.20/bin:$PATH"
-export LANG=en_US.UTF-8
+#!/bin/bash
+
+export CABAL_HOME=/opt/cabal/1.20
+export HASKELL_HOME=/opt/ghc/7.8.3

+ 1 - 1
frameworks/Haskell/yesod/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends haskell78
+fw_depends haskell

+ 0 - 27
frameworks/Haskell/yesod/setup.py

@@ -1,27 +0,0 @@
-
-import subprocess
-import sys
-import setup_util
-import os
-
-def start(args, logfile, errfile):
-  subprocess.check_call("cabal update", shell=True, cwd="yesod/bench", stderr=errfile, stdout=logfile)
-  subprocess.check_call("cabal install", shell=True, cwd="yesod/bench", stderr=errfile, stdout=logfile)
-
-  db_host = args.database_host
-  threads = str(args.max_threads)
-  subprocess.Popen("dist/build/bench/bench " + threads + " " + db_host + " +RTS -A32M -N" + threads, shell=True, cwd="yesod/bench", 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' in line:
-      try:
-        pid = int(line.split(None, 2)[1])
-        os.kill(pid, 15)
-      except OSError:
-        pass
-
-  return 0

+ 11 - 0
frameworks/Haskell/yesod/setup.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export PATH=${HASKELL_HOME}/bin:$PATH
+
+cd bench
+
+${CABAL_HOME}/bin/cabal update
+${CABAL_HOME}/bin/cabal sandbox init
+${CABAL_HOME}/bin/cabal --bindir=${TROOT}/bench/dist/build/bench install
+
+dist/build/bench/bench ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

+ 0 - 58
frameworks/Java/play2-java/setup_common.py

@@ -1,58 +0,0 @@
-# This file and frameworks/Scala/play2-java/setup_common.py are
-# duplicates and should be kept in sync.
-
-import os, setup_util, signal, subprocess
-
-# Create start and stop functions for the Play project with the given dir
-# and install them in the given module's globals.
-def make_setup_for_dir(module_globals, subtest_name):
-
-  def start(args, logfile, errfile):
-    kill_running_process(logfile)
-
-    subtest_dir = get_subtest_dir()
-    install_dir = os.environ['IROOT']
-
-    is_windows = os.name == "nt"
-    cmd_suffix = '.bat' if is_windows else ''
-    sbt_cmd = os.path.join(install_dir, 'sbt', 'bin', 'sbt'+cmd_suffix)
-    app_cmd = os.path.join(subtest_dir, 'target','universal','stage','bin',subtest_name+cmd_suffix)
-
-    setup_util.replace_text(
-      os.path.join(subtest_dir,'conf','application.conf'),
-      "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
-    logfile.write('Staging app: '+sbt_cmd+' stage\n')
-    subprocess.call(
-      [sbt_cmd, 'stage'],
-      stdin=subprocess.PIPE, cwd=subtest_dir, stderr=errfile, stdout=logfile)
-    logfile.write('Starting app: '+app_cmd+'\n')
-    subprocess.Popen(
-      [app_cmd],
-      shell=True, stdin=subprocess.PIPE, cwd=subtest_dir, stderr=errfile, stdout=logfile)
-    return 0
-
-  def stop(logfile, errfile):
-    kill_running_process(logfile)  
-    return 0
-
-  # Install the start and stop functions in the calling module
-  module_globals['start'] = start
-  module_globals['stop'] = stop
-
-  def get_subtest_dir():
-    test_dir = os.environ['TROOT']
-    return os.path.join(test_dir, subtest_name)
-
-  # Kill the running process and delete the RUNNING_PID file (if any).
-  def kill_running_process(logfile):
-    subtest_dir = get_subtest_dir()
-    pidfile = os.path.join(subtest_dir,"target","universal","stage","RUNNING_PID")
-    if not os.path.exists(pidfile):
-      logfile.write('No PID file: {}\n'.format(pidfile))
-      return
-    logfile.write('Reading and deleting PID file: {}\n'.format(pidfile))
-    with open(pidfile) as f:
-      pid = int(f.read())
-    os.remove(pidfile)
-    logfile.write('Sending SIGTERM to process: {}\n'.format(pid))
-    os.kill(pid, signal.SIGTERM)

+ 0 - 6
frameworks/Java/play2-java/setup_java.py

@@ -1,6 +0,0 @@
-
-# This file was generated by frameworks/Java/play2-java/generate_config.py.
-# Do not edit this file directly, use the script to regenerate.
-from .setup_common import make_setup_for_dir
-
-make_setup_for_dir(globals(), 'play2-java')

+ 5 - 0
frameworks/Java/play2-java/setup_java.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd play2-java
+${IROOT}/sbt/bin/sbt stage
+target/universal/stage/bin/play2-java &

+ 0 - 6
frameworks/Java/play2-java/setup_java_ebean_bonecp.py

@@ -1,6 +0,0 @@
-
-# This file was generated by frameworks/Java/play2-java/generate_config.py.
-# Do not edit this file directly, use the script to regenerate.
-from .setup_common import make_setup_for_dir
-
-make_setup_for_dir(globals(), 'play2-java-ebean-bonecp')

+ 5 - 0
frameworks/Java/play2-java/setup_java_ebean_bonecp.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd play2-java-ebean-bonecp
+${IROOT}/sbt/bin/sbt stage
+target/universal/stage/bin/play2-java-ebean-bonecp &

+ 0 - 6
frameworks/Java/play2-java/setup_java_ebean_hikaricp.py

@@ -1,6 +0,0 @@
-
-# This file was generated by frameworks/Java/play2-java/generate_config.py.
-# Do not edit this file directly, use the script to regenerate.
-from .setup_common import make_setup_for_dir
-
-make_setup_for_dir(globals(), 'play2-java-ebean-hikaricp')

+ 5 - 0
frameworks/Java/play2-java/setup_java_ebean_hikaricp.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd play2-java-ebean-hikaricp
+${IROOT}/sbt/bin/sbt stage
+target/universal/stage/bin/play2-java-ebean-hikaricp &

+ 0 - 6
frameworks/Java/play2-java/setup_java_jpa_bonecp.py

@@ -1,6 +0,0 @@
-
-# This file was generated by frameworks/Java/play2-java/generate_config.py.
-# Do not edit this file directly, use the script to regenerate.
-from .setup_common import make_setup_for_dir
-
-make_setup_for_dir(globals(), 'play2-java-jpa-bonecp')

+ 5 - 0
frameworks/Java/play2-java/setup_java_jpa_bonecp.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd play2-java-jpa-bonecp
+${IROOT}/sbt/bin/sbt stage
+target/universal/stage/bin/play2-java-jpa-bonecp &

+ 0 - 6
frameworks/Java/play2-java/setup_java_jpa_hikaricp.py

@@ -1,6 +0,0 @@
-
-# This file was generated by frameworks/Java/play2-java/generate_config.py.
-# Do not edit this file directly, use the script to regenerate.
-from .setup_common import make_setup_for_dir
-
-make_setup_for_dir(globals(), 'play2-java-jpa-hikaricp')

+ 5 - 0
frameworks/Java/play2-java/setup_java_jpa_hikaricp.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd play2-java-jpa-hikaricp
+${IROOT}/sbt/bin/sbt stage
+target/universal/stage/bin/play2-java-jpa-hikaricp &

+ 10 - 0
frameworks/Java/servlet3-cass/setup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#!/bin/bash
+
+sed -i 's|localhost|'"${DBHOST}"'|g' src/main/resources/application.properties
+
+mvn clean compile war:war
+rm -rf $RESIN_HOME/webapps/*
+cp target/servlet3-cass.war $RESIN_HOME/webapps
+$RESIN_HOME/bin/resinctl start

+ 3 - 0
frameworks/Lua/openresty/bash_profile.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+export OPENRESTY_HOME=${IROOT}/openresty-1.7.4.1

+ 2 - 4
frameworks/Lua/openresty/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-export PWD=$(pwd)
-
-sed -i 's|CWD|'"${PWD}"'|g' nginx.conf
+sed -i 's|CWD|'"${TROOT}"'|g' nginx.conf
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' app.lua
 
-/usr/local/openresty/nginx/sbin/nginx -c $TROOT/nginx.conf -g "worker_processes '$MAX_THREADS';" &
+${OPENRESTY_HOME}/nginx/sbin/nginx -c $TROOT/nginx.conf -g 'worker_processes \x27'"${MAX_THREADS}"'\x27;' &

+ 0 - 5
toolset/run-ci.py

@@ -395,11 +395,6 @@ class CIRunnner:
     # Set the default shell for testrunner to /bin/bash
     sudo sed -i 's|/home/testrunner:/bin/sh|/home/testrunner:/bin/bash|g' /etc/passwd
 
-    # TEST 
-    sudo cat /etc/group
-    sudo cat /etc/passwd
-    sudo cat /etc/sudoers
-
     # =============Setup Databases===========================
     # NOTE: Do not run `--install database` in travis-ci! 
     #       It changes DB configuration files and will break everything

+ 3 - 1
toolset/setup/linux/languages/go.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists go)
+RETCODE=$(fw_exists ${IROOT}/go1.3.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get https://storage.googleapis.com/golang/go1.3.linux-amd64.tar.gz
 fw_untar go1.3.linux-amd64.tar.gz
+
+touch ${IROOT}/go1.3.installed

+ 5 - 4
toolset/setup/linux/languages/haskell.sh

@@ -1,6 +1,7 @@
-#!/bin/bash
+#!/bin/bash 
 
-RETCODE=$(fw_exists /usr/bin/haskell-compiler)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+export LANG=en_US.UTF-8
 
-sudo apt-get install -y ghc cabal-install
+sudo add-apt-repository -y ppa:hvr/ghc
+sudo apt-get update
+sudo apt-get install -y ghc-7.8.3 cabal-install-1.20 libpcre3-dev

+ 0 - 10
toolset/setup/linux/languages/haskell78.sh

@@ -1,10 +0,0 @@
-#!/bin/bash 
-
-RETCODE=$(fw_exists /opt/ghc/7.8.3/bin/ghc)
-[ ! "$RETCODE" == 0 ] || { return 0; }
-
-export LANG=en_US.UTF-8
-
-sudo add-apt-repository -y ppa:hvr/ghc
-sudo apt-get update
-sudo apt-get install -y ghc-7.8.3 cabal-install-1.20 libpcre3-dev

+ 5 - 2
toolset/setup/linux/languages/java.sh

@@ -2,5 +2,8 @@
 
 # TODO include a check before we do all this, because it's 
 # annoyingly slow to run apt-get if we don't need to
-sudo apt-get install -y openjdk-7-jdk
-sudo apt-get remove -y --purge openjdk-6-jre openjdk-6-jre-headless
+
+# First remove java6
+sudo apt-get remove -y --purge openjdk-6-jre openjdk-6-jre-headless
+# Then install java7
+sudo apt-get install -y openjdk-7-jdk

+ 2 - 2
toolset/setup/linux/webservers/openresty.sh

@@ -9,8 +9,8 @@ fw_get http://openresty.org/download/ngx_openresty-1.7.4.1.tar.gz
 fw_untar ngx_openresty-1.7.4.1.tar.gz
 
 cd ngx_openresty-1.7.4.1
-./configure --with-luajit-xcflags=-DLUAJIT_NUMMODE=2 --with-http_postgres_module -j4
+./configure --with-luajit-xcflags=-DLUAJIT_NUMMODE=2 --with-http_postgres_module --prefix=${IROOT}/openresty-1.7.4.1 -j4
 make -j4
-sudo make install
+make install
 
 touch ${IROOT}/openresty-1.7.4.1.installed