More fixes for travis

.travis.yml

@@ -29,7 +29,7 @@ env:
     - "TESTDIR=C++/cpoll_cppsp"
     - "TESTDIR=C++/silicon"
     - "TESTDIR=C++/treefrog"
-    - "TESTDIR=C++/ULib"
+    - "TESTDIR=C++/ulib"
     - "TESTDIR=C++/wt"
     - "TESTDIR=Clojure/compojure"
     - "TESTDIR=Clojure/http-kit"
@@ -39,10 +39,10 @@ env:
     - "TESTDIR=Crystal/crystal-raw"
     - "TESTDIR=Crystal/moonshine"
     - "TESTDIR=D/vibed"
-    - "TESTDIR=Dart/dart"
-    - "TESTDIR=Dart/dart-redstone"
-    - "TESTDIR=Dart/dart-start"
-    - "TESTDIR=Dart/dart-stream"
+    - "TESTDIR=Dart/dart-raw"
+    - "TESTDIR=Dart/redstone"
+    - "TESTDIR=Dart/start"
+    - "TESTDIR=Dart/stream"
     - "TESTDIR=Elixir/phoenix"
     - "TESTDIR=Elixir/cowboy"
     - "TESTDIR=Erlang/cowboy"
@@ -50,9 +50,9 @@ env:
     - "TESTDIR=Go/beego"
     - "TESTDIR=Go/falcore"
     - "TESTDIR=Go/gin"
-    - "TESTDIR=Go/go"
+    - "TESTDIR=Go/go-raw"
     - "TESTDIR=Go/goji"
-    - "TESTDIR=Go/go-mongodb"
+    - "TESTDIR=Go/go-raw-mongodb"
     - "TESTDIR=Go/revel"
     - "TESTDIR=Go/revel-jet"
     - "TESTDIR=Go/revel-qbs"
@@ -112,29 +112,29 @@ env:
     - "TESTDIR=PHP/cygnite-php-framework"
     - "TESTDIR=PHP/codeigniter"
     - "TESTDIR=PHP/clancats"
-    - "TESTDIR=PHP/php-fatfree"
+    - "TESTDIR=PHP/fat-free"
     - "TESTDIR=PHP/fuel"
     - "TESTDIR=PHP/kohana"
-    - "TESTDIR=PHP/php-laravel"
+    - "TESTDIR=PHP/laravel"
     - "TESTDIR=PHP/limonade"
     - "TESTDIR=PHP/lithium"
     - "TESTDIR=PHP/lumen"
-    - "TESTDIR=PHP/php-micromvc"
-    - "TESTDIR=PHP/php-phalcon"
-    - "TESTDIR=PHP/php-phalcon-micro"
-    - "TESTDIR=PHP/php-phpixie"
-    - "TESTDIR=PHP/php-pimf"
-    - "TESTDIR=PHP/php-silex"
-    - "TESTDIR=PHP/php-silex-orm"
-    - "TESTDIR=PHP/php-slim"
+    - "TESTDIR=PHP/micromvc"
+    - "TESTDIR=PHP/phalcon"
+    - "TESTDIR=PHP/phalcon-micro"
+    - "TESTDIR=PHP/phpixie"
+    - "TESTDIR=PHP/pimf"
+    - "TESTDIR=PHP/silex"
+    - "TESTDIR=PHP/silex-orm"
+    - "TESTDIR=PHP/slim"
     - "TESTDIR=PHP/symfony2"
     - "TESTDIR=PHP/symfony2-stripped"
-    - "TESTDIR=PHP/php-yaf"
-    - "TESTDIR=PHP/Yii2"
-    - "TESTDIR=PHP/php-zend-framework"
-    - "TESTDIR=PHP/php-zend-framework1"
+    - "TESTDIR=PHP/yaf"
+    - "TESTDIR=PHP/yii2"
+    - "TESTDIR=PHP/zend"
+    - "TESTDIR=PHP/zend1"
     - "TESTDIR=PHP/phreeze"
-    - "TESTDIR=Python/AsyncIO"
+    - "TESTDIR=Python/asyncio"
     - "TESTDIR=Python/bottle"
     - "TESTDIR=Python/cherrypy"
     - "TESTDIR=Python/django"

frameworks/Clojure/pedestal/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-source $IROOT/java7.installed
-
-source $IROOT/lein.installed
+fw_depends java7 leiningen
 
 lein clean
 

frameworks/Java/jetty-servlet/setup.sh

@@ -5,4 +5,4 @@ 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.2-jar-with-dependencies.jar &

frameworks/Java/sabina/bash_profile.sh

@@ -1,3 +0,0 @@
-#@IgnoreInspection AddShebang
-
-export JAVA_HOME=/opt/java8

frameworks/Java/sabina/jetty-mongodb.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+fw_depends java8 maven
+
 ./setup.sh -Dsabina.backend=jetty -Dsabina.benchmark.repository=mongodb

frameworks/Java/sabina/jetty.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+fw_depends java8 maven
+
 ./setup.sh -Dsabina.backend=jetty -Dsabina.benchmark.repository=mysql

frameworks/Java/sabina/setup.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 
-fw_depends java8 maven
-
 mvn clean package -DskipTests -Ddb.host=${DBHOST}
 $JAVA_HOME/bin/java -jar target/sabina-1.0.0.jar &

frameworks/Java/sabina/undertow-mongodb.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+fw_depends java8 maven
+
 ./setup.sh -Dsabina.backend=undertow -Dsabina.benchmark.repository=mongodb

frameworks/Java/sabina/undertow.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+fw_depends java8 maven
+
 ./setup.sh -Dsabina.backend=undertow -Dsabina.benchmark.repository=mysql

frameworks/Lua/openresty/setup.sh

@@ -5,6 +5,6 @@ sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' app.lua
 
 fw_depends lua luarocks openresty 
 
-luarocks install lua-rest-template
+luarocks install lua-resty-template
 
 nginx -c $TROOT/nginx.conf -g "worker_processes '"${MAX_THREADS}"';" &

frameworks/Python/wsgi/setup.sh

@@ -2,4 +2,6 @@
 
 fw_depends python2
 
+pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
+
 gunicorn hello:app -c gunicorn_conf.py &

frameworks/Python/wsgi/setup_nginxuwsgi.sh

@@ -4,5 +4,7 @@ fw_depends python2 nginx
 
 sed -i 's|include .*/conf/uwsgi_params;|include '"${NGINX_HOME}"'/conf/uwsgi_params;|g' nginx.conf
 
+pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
+
 nginx -c $TROOT/nginx.conf
 uwsgi --ini uwsgi.ini --processes $MAX_THREADS --wsgi hello:app &

toolset/setup/linux/frameworks/duda.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${$IROOT}/duda.installed)
+RETCODE=$(fw_exists ${IROOT}/duda.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/duda.installed
   return 0; }

toolset/setup/linux/languages/hhvm.sh

@@ -6,7 +6,7 @@ RETCODE=$(fw_exists ${IROOT}/hhvm.installed)
   return 0; }
 
 # TODO: Someday move away from apt-get
-curl -Os http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
+fw_get http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
 echo deb http://dl.hhvm.com/ubuntu `lsb_release -sc` main | sudo tee /etc/apt/sources.list.d/hhvm.list
 sudo apt-get update
 sudo apt-get install -y hhvm

toolset/setup/linux/languages/perl.sh

@@ -19,6 +19,8 @@ perl-$VERSION/bin/perl cpanminus.pl --notest --no-man-page App::cpanminus
 perl-$VERSION/bin/cpanm -f --notest --no-man-page Carton JSON JSON::XS IO::Socket::IP IO::Socket::SSL
 
 echo "export PERL_HOME=${PERL}" > $IROOT/perl.installed
-echo -e "export PATH=:\$PERL/bin:\$PATH" >> $IROOT/perl.installed
+echo -e "export PERL_CARTON_PATH=\$TROOT/local" >> $IROOT/perl.installed
+echo -e "export PERL5LIB=\$PERL_CARTON_PATH/lib/perl5" >> $IROOT/perl.installed
+echo -e "export PATH=\$PERL_CARTON_PATH/bin:\$PERL_HOME/bin:\$PATH" >> $IROOT/perl.installed
 
 source $IROOT/perl.installed

toolset/setup/linux/systools/luarocks.sh

@@ -14,10 +14,9 @@ fw_get -O http://luarocks.org/releases/luarocks-$LUAROCKS_VERSION.tar.gz
 fw_untar luarocks-$LUAROCKS_VERSION.tar.gz
 
 cd $LUAROCKS
-./configure --prefix=$LUAROCKS --with-lua=$LUA_HOME
+./configure --prefix=$LUA_HOME --with-lua=$LUA_HOME
 make bootstrap
 
-echo "export LUAROCKS_HOME=${LUAROCKS}" > $IROOT/luarocks.installed
-echo -e "export PATH=\$LUAROCKS_HOME/bin:\$PATH" >> $IROOT/luarocks.installed
+echo "" > $IROOT/luarocks.installed
 
 source $IROOT/luarocks.installed

toolset/setup/linux/webservers/openresty.sh

@@ -15,7 +15,7 @@ fw_get -O http://openresty.org/download/ngx_openresty-$OPENRESTY_VERSION.tar.gz
 fw_untar ngx_openresty-$OPENRESTY_VERSION.tar.gz
 
 cd ngx_openresty-$OPENRESTY_VERSION
-./configure --with-luajit-xcflags=-DLUAJIT_NUMMODE=2 --with-lua51=$LUA_HOME --with-http_postgres_module --prefix=$OPENRESTY_HOME -j4
+./configure --with-luajit-xcflags=-DLUAJIT_NUMMODE=2 --with-http_postgres_module --prefix=$OPENRESTY_HOME -j4
 make -j4
 make install