Browse Source

Finished up the clojure tests

msmith-techempower 10 years ago
parent
commit
d41422f82f

+ 0 - 3
frameworks/Clojure/http-kit/install.sh

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

+ 6 - 6
frameworks/Clojure/http-kit/setup.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
-source $IROOT/java7.installed
-export LEIN_HOME=$IROOT/lein
+
+fw_depends leiningen java7
 
 cd hello
-$LEIN_HOME/bin/lein clean
-$LEIN_HOME/bin/lein deps
+lein clean
+lein deps
 rm -rf target
 # pack all dependencies into a single jar: target/http-kit-standalone.jar
-$LEIN_HOME/bin/lein uberjar
+lein uberjar
 # -server is much faster
 # 'lein run' passes '-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1' which make it starts fast, but runs slow
-$JAVA_HOME/bin/java -server -jar target/http-kit-standalone.jar --db-host ${DBHOST} &
+java -server -jar target/http-kit-standalone.jar --db-host ${DBHOST} &

+ 0 - 3
frameworks/Clojure/luminus/install.sh

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

+ 4 - 8
frameworks/Clojure/luminus/setup.sh

@@ -1,16 +1,12 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
-export RESIN_HOME=${IROOT}/resin-4.0.41
-
-# Path vars must be set here
-export PATH="$JAVA_HOME/bin:$PATH"
+fw_depends java7 resin leiningen 
 
 sed -i 's|:subname "//.*:3306|:subname "//'"${DBHOST}"':3306|g' hello/src/hello/models/schema.clj
 
 cd hello
-$IROOT/lein/bin/lein clean
-$IROOT/lein/bin/lein ring uberwar
+lein clean
+lein ring uberwar
 rm -rf $RESIN_HOME/webapps/*
 cp target/hello-luminus-standalone.war $RESIN_HOME/webapps/luminus.war
-$RESIN_HOME/bin/resinctl start
+resinctl start

+ 1 - 1
toolset/setup/linux/languages/java7.sh

@@ -15,6 +15,6 @@ sudo apt-get install -y openjdk-7-jdk
 # Setup environment variables
 JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-`dpkg --print-architecture`
 echo "export JAVA_HOME=${JAVA_HOME}" > $JAVA.installed
-echo "export PATH=${JAVA_HOME}/bin:$PATH" >> $JAVA.installed
+echo -e "export PATH=${JAVA_HOME}/bin:\$PATH" >> $JAVA.installed
 
 source $JAVA.installed

+ 1 - 1
toolset/setup/linux/systools/leiningen.sh

@@ -12,6 +12,6 @@ chmod +x lein/bin/lein
 
 LEIN_HOME=$IROOT/lein
 echo "export LEIN_HOME=${LEIN_HOME}" > $IROOT/lein.installed
-echo "export PATH=${LEIN_HOME}/bin:${PATH}" >> $IROOT/lein.installed
+echo -e "export PATH=${LEIN_HOME}/bin:\${PATH}" >> $IROOT/lein.installed
 
 source $IROOT/lein.installed

+ 1 - 1
toolset/setup/linux/webservers/resin.sh

@@ -26,6 +26,6 @@ mv conf/resin.xml conf/resin.xml.orig
 cat $FWROOT/config/resin.xml > conf/resin.xml
 
 echo "export RESIN_HOME=${RESIN_HOME}" > $RESIN_HOME.installed
-echo "export PATH=${RESIN_HOME}/bin:$PATH" >> $RESIN_HOME.installed
+echo -e "export PATH=${RESIN_HOME}/bin:\$PATH" >> $RESIN_HOME.installed
 
 source $RESIN_HOME.installed