Switch to dpkg install for faster builds

frameworks/Elixir/phoenix/setup.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+source $IROOT/erlang.installed
 source $IROOT/elixir.installed
 
 sed -i 's|db_host: "localhost",|db_host: "${DBHOST}",|g' config/config.exs

frameworks/Erlang/cowboy/install.sh

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

frameworks/Erlang/cowboy/setup.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 
 source $IROOT/erlang.installed
-source $IROOT/rebar.installed
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/hello_world_app.erl
 
 rm -rf deps/* ebin/*
-$REBAR_HOME/rebar get-deps
-$REBAR_HOME/rebar compile
+rebar get-deps
+rebar compile
 erl -pa ebin deps/*/ebin +sbwt very_long +swt very_low -s hello_world -noshell -detached

frameworks/Erlang/elli/install.sh

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

frameworks/Erlang/elli/setup.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 
 source $IROOT/erlang.installed
-source $IROOT/rebar.installed
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/elli_bench_sup.erl
 
 rm -rf deps/* ebin/*
-$REBAR_HOME/rebar get-deps
-$REBAR_HOME/rebar compile
+rebar get-deps
+rebar compile
 erl -pa ebin deps/*/ebin +sbwt very_long +swt very_low -s elli_bench -noshell -detached

toolset/setup/linux/languages/elixir.sh

@@ -4,16 +4,14 @@ RETCODE=$(fw_exists $IROOT/elixir.installed)
 [ ! "$RETCODE" == 0 ] || { . $IROOT/elixir.installed; return 0; }
 
 fw_depends erlang
-export PATH=$PATH:$IROOT/erlang/bin
+source $IROOT/erlang.installed
 
-VERSION="1.0.4"
-fw_get https://codeload.github.com/elixir-lang/elixir/tar.gz/v$VERSION
-fw_untar v$VERSION
+VERSION="1.0.4-1"
+RELEASE="trusty"
+ARCH="amd64"
 
-(
-	mv elixir-$VERSION elixir
-	cd elixir
-	make compile
-)
+fw_get http://packages.erlang-solutions.com/site/esl/elixir/FLAVOUR_2_download/elixir_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
+dpkg -x elixir_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb $IROOT/elixir
+$IROOT/erlang/usr/lib/erlang/Install -minimal $IROOT/erlang/usr/lib/erlang
 
-echo "export PATH=$IROOT/erlang/bin:$IROOT/elixir/bin:$PATH" >> $IROOT/elixir.installed
+echo "export PATH=\$IROOT/elixir/usr/local/bin:\$PATH" >> $IROOT/elixir.installed

toolset/setup/linux/languages/erlang.sh

@@ -3,16 +3,12 @@
 RETCODE=$(fw_exists $IROOT/erlang.installed)
 [ ! "$RETCODE" == 0 ] || { . $IROOT/erlang.installed; return 0; }
 
-export OTP_SRC="otp_src_17.5"
-fw_get http://www.erlang.org/download/${OTP_SRC}.tar.gz
-fw_untar ${OTP_SRC}.tar.gz
+VERSION="17.4-2"
+RELEASE="trusty"
+ARCH="amd64"
 
-(
-	cd $OTP_SRC
-	export ERL_TOP=`pwd`
-	./configure --prefix=$IROOT/erlang --without-termcap
-	make
-	make install
-)
+fw_get http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_esl/esl-erlang_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
+dpkg -x esl-erlang_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb $IROOT/erlang
+$IROOT/erlang/usr/lib/erlang/Install -minimal $IROOT/erlang/usr/lib/erlang
 
-echo "export PATH=$IROOT/erlang/bin:$PATH" >> $IROOT/erlang.installed
+echo "export PATH=\$IROOT/erlang/usr/bin:\$PATH" >> $IROOT/erlang.installed

toolset/setup/linux/systools/rebar.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-RETCODE=$(fw_exists $IROOT/rebar.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
-
-fw_depends erlang
-source $IROOT/erlang.installed
-
-fw_get https://github.com/rebar/rebar/archive/2.5.1.tar.gz -O rebar-2.5.1.tar.gz
-fw_untar rebar-2.5.1.tar.gz
-mv rebar-2.5.1 rebar
-cd rebar
-./bootstrap
-
-echo "export REBAR_HOME=$IROOT/rebar" >> $IROOT/rebar.installed