Browse Source

Fix Nim frameworks - Jester and Nawak (#2081)

use earlier version of cesources repo and update mongrel2 repo location
Nate 9 years ago
parent
commit
445e91572a

+ 4 - 1
toolset/setup/linux/languages/nim.sh

@@ -4,8 +4,9 @@ RETCODE=$(fw_exists ${IROOT}/nim.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/nim.installed
   return 0; }
-  
+
 NIM_VERSION="0.11.2"
+NIM_CSOURCES="6bf2282"
 
 fw_get -O https://github.com/nim-lang/Nim/archive/v$NIM_VERSION.tar.gz
 fw_untar v$NIM_VERSION.tar.gz
@@ -14,6 +15,7 @@ cd nim
 
 git clone git://github.com/nim-lang/csources.git
 cd csources
+git checkout $NIM_CSOURCES
 sh build.sh
 cd ..
 
@@ -26,3 +28,4 @@ echo "export NIM_HOME=${IROOT}/nim" > $IROOT/nim.installed
 echo -e "export PATH=\$NIM_HOME/bin:\$PATH" >> $IROOT/nim.installed
 
 source $IROOT/nim.installed
+

+ 5 - 4
toolset/setup/linux/webservers/mongrel2.sh

@@ -8,6 +8,7 @@ RETCODE=$(fw_exists ${IROOT}/mongrel2.installed)
   return 0; }
 
 MONGREL2=$IROOT/mongrel2
+MONGREL2_VERSION="v1.8.1"
 
 # TODO: Get away from apt-get
 # Dependencies
@@ -16,14 +17,14 @@ sudo apt-get install -y sqlite3 libsqlite3-dev uuid uuid-runtime uuid-dev
 # Update linker cache
 sudo ldconfig -v
 
-fw_get -o mongrel2.tar.gz https://github.com/zedshaw/mongrel2/tarball/v1.8.1
+fw_get -o mongrel2.tar.gz https://github.com/mongrel2/mongrel2/tarball/$MONGREL2_VERSION
 fw_untar mongrel2.tar.gz
 
-# mongrel2 untars into this folder 
-mv zedshaw-mongrel2-aa2ecf8 mongrel2-install
+# mongrel2 untars into this folder
+mv mongrel2-mongrel2-aa2ecf8 mongrel2-install
 
 # for zmq4, we update the following file manually (not in v1.8.1)
-fw_get -O https://raw.github.com/zedshaw/mongrel2/9b565eeea003783c47502c2d350b99c9684ce97c/src/zmq_compat.h
+fw_get -O https://raw.githubusercontent.com/mongrel2/mongrel2/2cbf31de625b3476dfa541d6409f24364026f63a/src/zmq_compat.h
 mv -f zmq_compat.h mongrel2-install/src/
 
 cd mongrel2-install