Added a bunch more tests

frameworks/Elixir/phoenix/setup.sh

@@ -11,7 +11,6 @@ mix local.rebar --force
 mix deps.get --force
 
 MIX_ENV=prod
-mix compile.protocols --force
 
-MIX_ENV=prod 
+mix compile.protocols --force
 elixir --detached -pa _build/$MIX_ENV/consolidated -S mix phoenix.server

frameworks/Groovy/grails/install.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export RESIN_HOME=${IROOT}/resin-4.0.41
-export GRAILS_PATH=${IROOT}/grails-2.4.4/bin/
-
-fw_depends java7 grails resin 

frameworks/Groovy/grails/setup.sh

@@ -1,19 +1,13 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
-
-export RESIN_HOME=${IROOT}/resin-4.0.41
-export GRAILS_PATH=${IROOT}/grails-2.4.4/bin/
-
-export PATH=${GRAILS_PATH}:$PATH
-export GRAILS_AGENT_CACHE_DIR=${IROOT}/.grails/.slcache
-
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' hello/grails-app/conf/DataSource.groovy
 
+fw_depends java7 grails resin 
+
 cd hello
 grails -Dgrails.work.dir=${IROOT}/.grails -non-interactive -plain-output refresh-dependencies
 grails -Dgrails.work.dir=${IROOT}/.grails -non-interactive -plain-output compile
 grails -Dgrails.work.dir=${IROOT}/.grails prod -non-interactive -plain-output war
 rm -rf $RESIN_HOME/webapps/*
 cp target/hello-0.1.war $RESIN_HOME/webapps/grails.war
-$RESIN_HOME/bin/resinctl start
+resinctl start

frameworks/Haskell/snap/install.sh

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

frameworks/Haskell/snap/setup.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
-export CABAL_HOME=/opt/cabal/1.20
-export HASKELL_HOME=/opt/ghc/7.8.3
-export LANG=en_US.UTF-8
 
 sed -i 's|host=".*"|host="'"${DBHOST}"'"|g' bench/cfg/db.cfg
 
-export PATH=${HASKELL_HOME}/bin:$PATH
+fw_depends haskell
 
 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
+cabal update
+cabal sandbox init
+cabal --bindir=${TROOT}/bench/dist/build/snap-bench install
 
-dist/build/snap-bench/snap-bench +RTS -A4M -N -qg2 -I0 -G2 &
+dist/build/snap-bench/snap-bench +RTS -A4M -N -qg2 -I0 -G2 &

frameworks/Haskell/wai/install.sh

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

frameworks/Haskell/wai/setup.sh

@@ -1,14 +1,11 @@
 #!/bin/bash
-export CABAL_HOME=/opt/cabal/1.20
-export HASKELL_HOME=/opt/ghc/7.8.3
-export LANG=en_US.UTF-8
 
-export PATH=${HASKELL_HOME}/bin:$PATH
+fw_depends haskell
 
 cd bench
 
-${CABAL_HOME}/bin/cabal update
-${CABAL_HOME}/bin/cabal sandbox init
-${CABAL_HOME}/bin/cabal --bindir=${TROOT}/bench/dist/build/bench install
+cabal update
+cabal sandbox init
+cabal --bindir=${TROOT}/bench/dist/build/bench install
 
-dist/build/bench/bench ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &
+dist/build/bench/bench ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

frameworks/Haskell/yesod/install.sh

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

frameworks/Haskell/yesod/setup.sh

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

frameworks/Java/activeweb/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 resin maven

frameworks/Java/activeweb/setup.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
-export RESIN_HOME=${IROOT}/resin-4.0.41
-
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/java/app/config/DbConfig.java
 
+fw_depends java7 resin maven
+
 mvn clean package
 rm -rf $RESIN_HOME/webapps/*
 cp target/activeweb.war $RESIN_HOME/webapps/
-$RESIN_HOME/bin/resinctl start
+resinctl start

frameworks/Java/curacao/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 sbt

frameworks/Java/curacao/setup.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 sbt
 
-${IROOT}/sbt/bin/sbt assembly
+sbt assembly
 
-java -jar dist/curacao-standalone.jar &
+java -jar dist/curacao-standalone.jar &

frameworks/Java/dropwizard-mongodb/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/dropwizard-mongodb/setup.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 maven
 
 mvn clean package
 
-java -jar target/dropwizard-mongodb-0.0.1-SNAPSHOT.jar server hello-world.yml &
+java -jar target/dropwizard-mongodb-0.0.1-SNAPSHOT.jar server hello-world.yml &

frameworks/Java/dropwizard/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/dropwizard/setup.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
-
 sed -i 's|url: jdbc:mysql://.*/hello_world|url: jdbc:mysql://'"${DBHOST}"':3306/hello_world|g' hello-world.yml
 
+fw_depends java7 maven
+
 mvn clean package
 
-java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world.yml &
+java -jar target/hello-world-0.0.1-SNAPSHOT.jar server hello-world.yml &

frameworks/Java/grizzly-bm/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/grizzly-bm/setup.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 maven
 
 mvn clean compile assembly:single
 
 cd target
-java -Dorg.glassfish.grizzly.nio.transport.TCPNIOTransport.max-receive-buffer-size=16384 -Dorg.glassfish.grizzly.http.io.OutputBuffer.default-buffer-size=1024 -Dorg.glassfish.grizzly.memory.BuffersBuffer.bb-cache-size=32 -jar grizzly-bm-0.1-jar-with-dependencies.jar &
+java -Dorg.glassfish.grizzly.nio.transport.TCPNIOTransport.max-receive-buffer-size=16384 -Dorg.glassfish.grizzly.http.io.OutputBuffer.default-buffer-size=1024 -Dorg.glassfish.grizzly.memory.BuffersBuffer.bb-cache-size=32 -jar grizzly-bm-0.1-jar-with-dependencies.jar &

frameworks/Java/grizzly-jersey/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/grizzly-jersey/setup.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 maven
 
 mvn clean package
 
-java -jar target/grizzly-jersey-example.jar -dbhost ${DBHOST} &
+java -jar target/grizzly-jersey-example.jar -dbhost ${DBHOST} &

frameworks/Java/jetty-servlet/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/jetty-servlet/setup.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 maven
 
 mvn clean compile assembly:single
 
 cd target
-java -jar jetty-servlet-example-0.1-jar-with-dependencies.jar &
+java -jar jetty-servlet-example-0.1-jar-with-dependencies.jar &

frameworks/Java/netty/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/netty/setup.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 maven
 
 mvn clean compile assembly:single
 
 cd target
-java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar netty-example-0.1-jar-with-dependencies.jar &
+java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar netty-example-0.1-jar-with-dependencies.jar &

frameworks/Java/ninja-standalone/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/ninja-standalone/setup.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
-
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/java/conf/application.conf
 
+fw_depends java7 maven
+
 mvn clean compile assembly:single
 
-java -Dninja.port=8080 -jar target/ninja-standalone-0.0.1-SNAPSHOT-jar-with-dependencies.jar &
+java -Dninja.port=8080 -jar target/ninja-standalone-0.0.1-SNAPSHOT-jar-with-dependencies.jar &

frameworks/Java/play1/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 play1 

frameworks/Java/play1/setup.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
-export PLAY1_HOME=${IROOT}/play-1.2.5
-
-# load java environment variables
-source $IROOT/java7.installed
 
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 
-$PLAY1_HOME/play start --%prod
+fw_depends java7 play1 
+
+$PLAY1_HOME/play start --%prod

frameworks/Java/play1siena/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 play1 siena resin

frameworks/Java/play1siena/setup.sh

@@ -1,13 +1,9 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
-
-export PLAY1_HOME=${IROOT}/play-1.2.5
-export RESIN_HOME=${IROOT}/resin-4.0.41
-
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 
+fw_depends java7 play1 siena resin
+
 rm -rf $RESIN_HOME/webapps/*
-$PLAY1_HOME/play war -o $RESIN_HOME/webapps/play1 --exclude benchmark_config.json
-$RESIN_HOME/bin/resinctl start
+play war -o $RESIN_HOME/webapps/play1 --exclude benchmark_config.json
+resinctl start

frameworks/Java/play2-java/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 sbt

frameworks/Java/play2-java/setup_java.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 sbt
 
 cd play2-java
 
-# If application is running, clear old running app.
-if [ -f ${TROOT}/play2-java/target/universal/stage/RUNNING_PID ]
-then
-  rm -f -r ${TROOT}/play2-java/target/universal/stage/RUNNING_PID
-fi
+rm -rf target/universal/stage/RUNNING_PID
 
-${IROOT}/sbt/bin/sbt stage
+sbt stage
 target/universal/stage/bin/play2-java &

toolset/setup/linux/frameworks/grails.sh

@@ -1,9 +1,17 @@
 #!/bin/bash
 
+VERSION="2.4.4"
+GRAINS_HOME=$IROOT/grains-$VERSION
 RETCODE=$(fw_exists ${IROOT}/grails-2.4.4.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+[ ! "$RETCODE" == 0 ] || { \
+  source $GRAILS_HOME.installed
+  return 0; }
 
-fw_get http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-2.4.4.zip -O grails-2.4.4.zip
-fw_unzip grails-2.4.4.zip
+fw_get http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-$VERSION.zip -O grails-$VERSION.zip
+fw_unzip grails-$VERSION.zip
 
-touch ${IROOT}/grails-2.4.4.installed
+echo "export GRAILS_HOME=${GRAILS_HOME}" > $GRAILS_HOME.installed
+echo -e "export PATH=${GRAILS_HOME}/bin:\$PATH" >> $GRAILS_HOME.installed
+echo "export GRAILS_AGENT_CACHE_DIR=${IROOT}/.grails/.slcache" >> $GRAILS_HOME.installed
+
+source $GRAILS_HOME.installed

toolset/setup/linux/frameworks/play1.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/play-1.2.5.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+VERSION="1.2.5"
+PLAY1_HOME=$IROOT/play-$VERSION
+RETCODE=$(fw_exists ${IROOT}/play1.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/play1.installed
+  return 0; }
 
-fw_get http://downloads.typesafe.com/releases/play-1.2.5.zip -O play-1.2.5.zip
-fw_unzip play-1.2.5.zip
+fw_get http://downloads.typesafe.com/releases/play-$VERSION.zip -O play-$VERSION.zip
+fw_unzip play-$VERSION.zip
 
-touch ${IROOT}/play-1.2.5.installed
+echo "export PLAY1_HOME=${PLAY1_HOME}" > $IROOT/play1.installed
+echo -e "export PATH=${PLAY1_HOME}:\$PATH" >> $IROOT/play1.installed
+
+source $IROOT/play1.installed

toolset/setup/linux/frameworks/siena.sh

@@ -1,9 +1,15 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/siena-2.0.6.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+VERSION="2.0.6"
+SIENNA=$IROOT/siena-$VERSION
+RETCODE=$(fw_exists ${SIENA}.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $SIENNA.installed
+  return 0; }
 
 fw_depends play1
-yes | ${IROOT}/play-1.2.5/play install siena-2.0.6
+yes | play install siena-2.0.6
 
-touch ${IROOT}/siena-2.0.6.installed
+echo "" > $SIENA.installed
+
+source $SIENA.installed

toolset/setup/linux/languages/haskell.sh

@@ -1,7 +1,19 @@
 #!/bin/bash 
 
-export LANG=en_US.UTF-8
+CABAL_HOME=/opt/cabal/1.20
+HASKELL_HOME=/opt/ghc/7.8.3
+RETCODE=$(fw_exists ${IROOT}/haskell.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/haskell.installed
+  return 0; }
 
 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
+sudo apt-get install -y ghc-7.8.3 cabal-install-1.20 libpcre3-dev
+
+echo "export LANG=en_US.UTF-8" > $IROOT/haskell.installed
+echo "export CABAL_HOME=${CABAL_HOME}" >> $IROOT/haskell.installed
+echo "export HASKELL_HOME=${HASKELL_HOME}" >> $IROOT/haskell.installed
+echo -e "export PATH=${HASKELL_HOME}/bin:${CABAL_HOME}/bin:\$PATH" >> $IROOT/haskell.installed
+
+source $IROOT/haskell.installed

toolset/setup/linux/systools/sbt.sh

@@ -1,10 +1,14 @@
 #!/bin/bash
 
+VERSION="0.13.8"
 RETCODE=$(fw_exists ${IROOT}/sbt.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/sbt.installed
+  return 0; }
 
-sbt_ver=0.13.8
-fw_get http://dl.bintray.com/sbt/native-packages/sbt/$sbt_ver/sbt-$sbt_ver.zip -O sbt-$sbt_ver.zip
-fw_unzip sbt-$sbt_ver.zip
+fw_get http://dl.bintray.com/sbt/native-packages/sbt/$VERSION/sbt-$VERSION.zip -O sbt-$VERSION.zip
+fw_unzip sbt-$VERSION.zip
 
-touch ${IROOT}/sbt.installed
+echo -e "export PATH=${IROOT}/sbt/bin:\$PATH" > $IROOT/sbt.installed
+
+source $IROOT/sbt.installed