Browse Source

Merge branch 'treefrog_v1_7_7-2' of http://github.com/treefrogframework/FrameworkBenchmarks into 922

James Yen 11 years ago
parent
commit
11ae42f79d
1 changed files with 8 additions and 10 deletions
  1. 8 10
      toolset/setup/linux/frameworks/treefrog.sh

+ 8 - 10
toolset/setup/linux/frameworks/treefrog.sh

@@ -1,22 +1,20 @@
 #!/bin/bash
 
-RET1=$(fw_exists /usr/bin/treefrog)
-RET2=$(fw_exists /usr/bin/tspawn)
-if [ "$RET1" == 0 ] && [ "$RET2" == 0 ]; then 
-  return 0;
-fi
+RETCODE=$(fw_exists treefrog-1.7.7)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 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.5.tar.gz
-fw_untar treefrog-1.7.5.tar.gz
-cd treefrog-1.7.5
+fw_get http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz
+fw_untar treefrog-1.7.7.tar.gz
+rm -f treefrog-1.7.7.tar.gz
+cd treefrog-1.7.7
 ./configure
 
 cd src
-make
+make -j4
 sudo make install
 
 cd ../tools
-make
+make -j4
 sudo make install