Fixed calling convention

msmith-techempower · msmith-techempower · commit ab2d2b2c14cf · 2015-06-17T14:12:17.000-07:00
diff --git a/frameworks/C++/ULib/install.sh b/frameworks/C++/ULib/install.sh
@@ -53,7 +53,7 @@ fi
 
 # 1. Download ULib
 cd $IROOT
-fw_get -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz 
+fw_get -o ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz 
 fw_untar  ULib-${ULIB_VERSION}.tar.gz
 
 # 2. Compile application (userver_tcp)
diff --git a/frameworks/C++/cpoll_cppsp/install.sh b/frameworks/C++/cpoll_cppsp/install.sh
@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/cppsp.installed)
 
 sudo apt-get install -y postgresql-server-dev-9.3 libpq-dev
 
-fw_get -O cppsp_0.2.3.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
+fw_get -o cppsp_0.2.3.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
 fw_untar cppsp_0.2.3.tar.xz
 
 # Using cp+rm over mv intentionally, because apparently this download
diff --git a/frameworks/C++/silicon/install.sh b/frameworks/C++/silicon/install.sh
@@ -9,7 +9,7 @@ CXX=/usr/bin/g++-4.9 ./install.sh $IROOT
 
 # Install microhttpd
 cd $DIR
-fw_get http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-0.9.39.tar.gz
+fw_get -O http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-0.9.39.tar.gz
 fw_untar libmicrohttpd-0.9.39.tar.gz
 cd libmicrohttpd-0.9.39
 ./configure --prefix=$IROOT
diff --git a/frameworks/Ur/urweb/install.sh b/frameworks/Ur/urweb/install.sh
@@ -6,7 +6,7 @@ COMPILER=${IROOT}/urweb
 RETCODE=$(fw_exists $COMPILER)
 [ ! "$RETCODE" == 0 ] || [ ! `$COMPILER | grep -oE '[^ ]+$'` == "$VERSION" ] || { return 0; }
 
-fw_get http://www.impredicative.com/ur/urweb-$VERSION.tgz
+fw_get -O http://www.impredicative.com/ur/urweb-$VERSION.tgz
 fw_untar urweb-$VERSION.tgz
 cd urweb-$VERSION
 ./configure --prefix=${IROOT}/urweb
diff --git a/toolset/setup/linux/frameworks/duda.sh b/toolset/setup/linux/frameworks/duda.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists duda-0.23.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://duda.io/releases/duda-client/dudac-0.23.tar.gz -O dudac-0.23.tar.gz
+fw_get http://duda.io/releases/duda-client/dudac-0.23.tar.gz -O
 fw_untar dudac-0.23.tar.gz
 
 cd dudac-0.23
diff --git a/toolset/setup/linux/frameworks/grails.sh b/toolset/setup/linux/frameworks/grails.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/grails-2.4.4.installed)
 [ ! "$RETCODE" == 0 ] || { 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_get http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-2.4.4.zip -O
 fw_unzip grails-2.4.4.zip
 
 touch ${IROOT}/grails-2.4.4.installed
diff --git a/toolset/setup/linux/frameworks/play1.sh b/toolset/setup/linux/frameworks/play1.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/play-1.2.5.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://downloads.typesafe.com/releases/play-1.2.5.zip -O play-1.2.5.zip
+fw_get http://downloads.typesafe.com/releases/play-1.2.5.zip -O
 fw_unzip play-1.2.5.zip
 
 touch ${IROOT}/play-1.2.5.installed
diff --git a/toolset/setup/linux/frameworks/play2.sh b/toolset/setup/linux/frameworks/play2.sh
@@ -3,5 +3,5 @@
 RETCODE=$(fw_exists play-2.2.0)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://downloads.typesafe.com/play/2.2.0/play-2.2.0.zip -O play-2.2.0.zip
+fw_get http://downloads.typesafe.com/play/2.2.0/play-2.2.0.zip -O
 fw_unzip play-2.2.0.zip
diff --git a/toolset/setup/linux/frameworks/treefrog.sh b/toolset/setup/linux/frameworks/treefrog.sh
@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/treefrog.installed)
 
 sudo apt-get install -y qt4-qmake libqt4-dev libqt4-sql-mysql libqt4-sql-psql g++
 
-fw_get http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz -O treefrog-1.7.7.tar.gz
+fw_get http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz -O
 fw_untar treefrog-1.7.7.tar.gz
 cd treefrog-1.7.7
 # Someday we can try this... I couldn't get it working
diff --git a/toolset/setup/linux/frameworks/wt.sh b/toolset/setup/linux/frameworks/wt.sh
@@ -26,7 +26,7 @@ elif [ "$TFB_DISTRIB_CODENAME" == "precise" ]; then
     sudo apt-get -y install libboost1.48-all-dev
 fi
 
-fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O wt-3.3.3.tar.gz
+fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O
 fw_untar wt-3.3.3.tar.gz
 
 cd wt-3.3.3
diff --git a/toolset/setup/linux/languages/crystal-0.7.1.sh b/toolset/setup/linux/languages/crystal-0.7.1.sh
@@ -7,7 +7,7 @@ URL=https://github.com/manastech/crystal/releases/download/0.7.1/crystal-0.7.1-1
 
 # Default filename is too long, causing problems
 # Use -O to specify
-fw_get -O $SAVE_AS $URL
+fw_get -o $SAVE_AS $URL
 
 fw_untar crystal-0.7.1-1-linux-x86_64.tar.gz
 
diff --git a/toolset/setup/linux/languages/dart.sh b/toolset/setup/linux/languages/dart.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/dart-sdk.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://storage.googleapis.com/dart-archive/channels/stable/release/42828/sdk/dartsdk-linux-x64-release.zip
+fw_get -O http://storage.googleapis.com/dart-archive/channels/stable/release/42828/sdk/dartsdk-linux-x64-release.zip
 fw_unzip dartsdk-linux-x64-release.zip
 
 touch ${IROOT}/dart-sdk.installed
diff --git a/toolset/setup/linux/languages/dlang.sh b/toolset/setup/linux/languages/dlang.sh
@@ -7,7 +7,7 @@ RETCODE=$(fw_exists ${DLANG}.installed)
   return 0; }
 
 mkdir -p $DLANG
-fw_get http://downloads.dlang.org/releases/2.x/2.067.1/dmd_2.067.1-0_amd64.deb
+fw_get -O http://downloads.dlang.org/releases/2.x/2.067.1/dmd_2.067.1-0_amd64.deb
 dpkg-deb -x dmd_2.067.1-0_amd64.deb $DLANG
 
 # According to this file (dmd.conf) dmd will, upon execution, look for
diff --git a/toolset/setup/linux/languages/elixir.sh b/toolset/setup/linux/languages/elixir.sh
@@ -10,7 +10,7 @@ VERSION="1.0.4-1"
 RELEASE="trusty"
 ARCH="amd64"
 
-fw_get http://packages.erlang-solutions.com/site/esl/elixir/FLAVOUR_2_download/elixir_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
+fw_get -O 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
 
diff --git a/toolset/setup/linux/languages/erlang.sh b/toolset/setup/linux/languages/erlang.sh
@@ -7,7 +7,7 @@ VERSION="17.4-2"
 RELEASE="trusty"
 ARCH="amd64"
 
-fw_get http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_esl/esl-erlang_${VERSION}~ubuntu~${RELEASE}_${ARCH}.deb
+fw_get -O 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
 
diff --git a/toolset/setup/linux/languages/go.sh b/toolset/setup/linux/languages/go.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/go1.4.2.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
+fw_get -O https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
 fw_untar go1.4.2.linux-amd64.tar.gz
 
 touch ${IROOT}/go1.4.2.installed
diff --git a/toolset/setup/linux/languages/nvm.sh b/toolset/setup/linux/languages/nvm.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/nvm.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get https://raw.githubusercontent.com/creationix/nvm/v0.24.1/install.sh
+fw_get -O https://raw.githubusercontent.com/creationix/nvm/v0.24.1/install.sh
 NVM_DIR=$IROOT/nvm bash install.sh
 
-touch ${IROOT}/nvm.installed
+touch ${IROOT}/nvm.installed
diff --git a/toolset/setup/linux/languages/perl.sh b/toolset/setup/linux/languages/perl.sh
@@ -3,11 +3,11 @@
 RETCODE=$(fw_exists ${IROOT}/perl-5.18.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get https://raw.github.com/tokuhirom/Perl-Build/master/perl-build -O perl-build.pl
+fw_get https://raw.github.com/tokuhirom/Perl-Build/master/perl-build -o perl-build.pl
 # compile with optimizations, n.b. this does not turn on debugging
 perl perl-build.pl -DDEBUGGING=-g 5.18.2 perl-5.18 2>&1 | tee $IROOT/perl-install.log | awk '{ if (NR%100 == 0) printf "."}'
 
-fw_get http://cpanmin.us -O cpanminus.pl
+fw_get http://cpanmin.us -o cpanminus.pl
 perl-5.18/bin/perl cpanminus.pl --notest --no-man-page App::cpanminus
 # Install only a bare-bones of Perl modules
 # Install others in the per-framework install script or cpanfile
diff --git a/toolset/setup/linux/languages/php.sh b/toolset/setup/linux/languages/php.sh
@@ -13,7 +13,7 @@ RETCODE=$(fw_exists ${IROOT}/php.installed)
 
 VERSION="5.5.17"
 
-fw_get http://php.net/distributions/php-${VERSION}.tar.gz -O php-${VERSION}.tar.gz
+fw_get http://php.net/distributions/php-${VERSION}.tar.gz -o php-${VERSION}.tar.gz
 fw_untar php-${VERSION}.tar.gz
 mv php-${VERSION} php
 cd php
diff --git a/toolset/setup/linux/languages/pypy.sh b/toolset/setup/linux/languages/pypy.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/pypy.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-linux64.tar.bz2 -O pypy-2.6.0-linux64.tar.bz2
+fw_get https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-linux64.tar.bz2 -o pypy-2.6.0-linux64.tar.bz2
 fw_untar pypy-2.6.0-linux64.tar.bz2
 ln -sf pypy-2.6.0-linux64 pypy
 
diff --git a/toolset/setup/linux/languages/python2.sh b/toolset/setup/linux/languages/python2.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/py2.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
+fw_get -O http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
 fw_untar Python-2.7.10.tgz
 cd Python-2.7.10
 ./configure --prefix=${IROOT}/py2 --disable-shared --quiet
diff --git a/toolset/setup/linux/languages/python3.sh b/toolset/setup/linux/languages/python3.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/py3.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz
+fw_get -O http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz
 fw_untar Python-3.4.3.tar.xz
 cd Python-3.4.3
 ./configure --prefix=${IROOT}/py3 --disable-shared --with-computed-gotos --quiet
diff --git a/toolset/setup/linux/languages/racket.sh b/toolset/setup/linux/languages/racket.sh
@@ -5,12 +5,12 @@ if [ "$RET" == 0 ]; then
   return 0;
 fi
 
-fw_get http://mirror.racket-lang.org/installers/recent/racket-src.tgz -O racket-src.tar.gz
+fw_get http://mirror.racket-lang.org/installers/recent/racket-src.tgz -o racket-src.tar.gz
 fw_untar racket-src.tar.gz
 mv racket racket-install
 cd racket-install/src 
 ./configure --prefix=${IROOT}/racket
 make
 make install
 
-touch ${IROOT}/racket.installed
+touch ${IROOT}/racket.installed
diff --git a/toolset/setup/linux/languages/ringojs.sh b/toolset/setup/linux/languages/ringojs.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/ringojs_0.10.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://www.ringojs.org/downloads/ringojs_0.10-1_all.deb
+fw_get -O http://www.ringojs.org/downloads/ringojs_0.10-1_all.deb
 sudo apt-get install -y jsvc
 sudo dpkg -i ringojs_0.10-1_all.deb
 
diff --git a/toolset/setup/linux/languages/rust.sh b/toolset/setup/linux/languages/rust.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists $IROOT/rust.installed)
 [ ! "$RETCODE" == 0 ] || { . $IROOT/rust.installed; return 0; }
 
-fw_get https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz
+fw_get -O https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz
 fw_untar rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz
 (
 	cd rust-1.0.0-x86_64-unknown-linux-gnu
diff --git a/toolset/setup/linux/systools/composer.sh b/toolset/setup/linux/systools/composer.sh
@@ -10,11 +10,11 @@ PHP_HOME=${PHP_HOME:-${IROOT}/php-5.5.17}
 mkdir -p php-composer
 cd php-composer
 
-fw_get https://getcomposer.org/installer -O composer-installer.php
+fw_get https://getcomposer.org/installer -o composer-installer.php
 
 # Use the PHP and composer from our PHP_HOME directory and 
 # COMPOSER_HOME directories
 ${PHP_HOME}/bin/php composer-installer.php --install-dir=${COMPOSER_HOME}
 
 cd ..
-touch ${IROOT}/php-composer.installed
+touch ${IROOT}/php-composer.installed
diff --git a/toolset/setup/linux/systools/dub.sh b/toolset/setup/linux/systools/dub.sh
@@ -8,7 +8,7 @@ RETCODE=$(fw_exists ${DUB}.installed)
 
 mkdir dub
 cd dub
-fw_get http://code.dlang.org/files/dub-0.9.23-linux-x86_64.tar.gz
+fw_get -O http://code.dlang.org/files/dub-0.9.23-linux-x86_64.tar.gz
 fw_untar dub-0.9.23-linux-x86_64.tar.gz
 
 echo -e "export PATH=${DUB}:\$PATH" > $DUB.installed
diff --git a/toolset/setup/linux/systools/leiningen.sh b/toolset/setup/linux/systools/leiningen.sh
@@ -4,7 +4,7 @@ RETCODE=$(fw_exists ${IROOT}/lein.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 mkdir -p lein/bin
-fw_get https://raw.github.com/technomancy/leiningen/stable/bin/lein -O leinbin
+fw_get https://raw.github.com/technomancy/leiningen/stable/bin/lein -o leinbin
 mv leinbin lein/bin/lein
 chmod +x lein/bin/lein
 
diff --git a/toolset/setup/linux/systools/sbt.sh b/toolset/setup/linux/systools/sbt.sh
@@ -4,7 +4,7 @@ RETCODE=$(fw_exists ${IROOT}/sbt.installed)
 [ ! "$RETCODE" == 0 ] || { 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_get http://dl.bintray.com/sbt/native-packages/sbt/$sbt_ver/sbt-$sbt_ver.zip -O
 fw_unzip sbt-$sbt_ver.zip
 
 touch ${IROOT}/sbt.installed
diff --git a/toolset/setup/linux/webservers/mongrel2.sh b/toolset/setup/linux/webservers/mongrel2.sh
@@ -11,14 +11,14 @@ sudo apt-get install -y sqlite3 libsqlite3-dev uuid uuid-runtime uuid-dev
 # Update linker cache
 sudo ldconfig -v
 
-fw_get https://github.com/zedshaw/mongrel2/tarball/v1.8.1 -O mongrel2.tar.gz
+fw_get https://github.com/zedshaw/mongrel2/tarball/v1.8.1 -o mongrel2.tar.gz
 fw_untar mongrel2.tar.gz
 
 # mongrel2 untars into this folder 
 mv zedshaw-mongrel2-aa2ecf8 mongrel2-install
 
 # for zmq4, we update the following file manually (not in v1.8.1)
-fw_get https://raw.github.com/zedshaw/mongrel2/9b565eeea003783c47502c2d350b99c9684ce97c/src/zmq_compat.h
+fw_get -O https://raw.github.com/zedshaw/mongrel2/9b565eeea003783c47502c2d350b99c9684ce97c/src/zmq_compat.h
 mv -f zmq_compat.h mongrel2-install/src/
 
 cd mongrel2-install
diff --git a/toolset/setup/linux/webservers/nginx.sh b/toolset/setup/linux/webservers/nginx.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/nginx.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://nginx.org/download/nginx-1.4.1.tar.gz
+fw_get -O http://nginx.org/download/nginx-1.4.1.tar.gz
 fw_untar nginx-1.4.1.tar.gz
 cd nginx-1.4.1
 
diff --git a/toolset/setup/linux/webservers/openresty.sh b/toolset/setup/linux/webservers/openresty.sh
@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/openresty-1.7.10.1.installed)
 
 fw_depends nginx lua
 
-fw_get http://openresty.org/download/ngx_openresty-1.7.10.1.tar.gz
+fw_get -O http://openresty.org/download/ngx_openresty-1.7.10.1.tar.gz
 fw_untar ngx_openresty-1.7.10.1.tar.gz
 
 cd ngx_openresty-1.7.10.1
diff --git a/toolset/setup/linux/webservers/resin.sh b/toolset/setup/linux/webservers/resin.sh
@@ -8,7 +8,7 @@ RETCODE=$(fw_exists ${IROOT}/resin-$RVER.installed)
 fw_depends java7
 sudo cp -r $JAVA_HOME/include $JAVA_HOME/jre/bin/
 
-fw_get http://www.caucho.com/download/resin-$RVER.tar.gz
+fw_get -O http://www.caucho.com/download/resin-$RVER.tar.gz
 fw_untar resin-$RVER.tar.gz
 cd resin-$RVER
 ./configure --prefix=`pwd`
diff --git a/toolset/setup/linux/webservers/zeromq.sh b/toolset/setup/linux/webservers/zeromq.sh
@@ -3,7 +3,7 @@
 RETCODE=$(fw_exists ${IROOT}/zeromq-4.0.3.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
-fw_get http://download.zeromq.org/zeromq-4.0.3.tar.gz
+fw_get -O http://download.zeromq.org/zeromq-4.0.3.tar.gz
 fw_untar zeromq-4.0.3.tar.gz
 mv zeromq-4.0.3 zeromq-4.0.3-install
 cd zeromq-4.0.3-install

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`RETCODE=$(fw_exists $IROOT/rust.installed)`
`4`	`4`	`[ ! "$RETCODE" == 0 ] \|\| { . $IROOT/rust.installed; return 0; }`
`5`	`5`
`6`		`-fw_get https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz`
	`6`	`+fw_get -O https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz`
`7`	`7`	`fw_untar rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz`
`8`	`8`	`(`
`9`	`9`	`cd rust-1.0.0-x86_64-unknown-linux-gnu`