diff options
Diffstat (limited to '')
| -rwxr-xr-x | sca-cpp/trunk/ubuntu/ubuntu-install | 16 | ||||
| -rwxr-xr-x | sca-cpp/trunk/ubuntu/ubuntu-install-all | 5 |
2 files changed, 16 insertions, 5 deletions
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install index 0cb688ea39..26088745e2 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-install +++ b/sca-cpp/trunk/ubuntu/ubuntu-install @@ -22,6 +22,9 @@ # Display commands as they are executed set -x +# Get the Ubuntu version +osver=`cat /etc/issue | awk '{ print $2 }'` + # Build and install in the current directory build=`pwd` @@ -58,9 +61,16 @@ if [ "$?" != "0" ]; then fi # Install TraceMonkey -sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev -if [ "$?" != "0" ]; then - exit $? +if [ "$osver" = "9.10" ]; then + sudo apt-get -y install xulrunner-1.9.1 xulrunner-1.9.1-dev + if [ "$?" != "0" ]; then + exit $? + fi +else + sudo apt-get -y install xulrunner-1.9.2 xulrunner-1.9.2-dev + if [ "$?" != "0" ]; then + exit $? + fi fi # Install Python diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all index 9a717781e7..cfeed713a2 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-install-all +++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all @@ -171,6 +171,7 @@ cd $build # Build Libexpat wget http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download +mv download expat-2.0.1.tar.gz tar xzf expat-2.0.1.tar.gz cd expat-2.0.1 ./configure --prefix=$build/expat-2.0.1-bin @@ -262,7 +263,7 @@ fi cd $build # Build Apache Thrift -sudo apt-get -y install bison flex +sudo apt-get -y install bison flex python-dev if [ "$?" != "0" ]; then exit $? fi @@ -315,7 +316,7 @@ fi cd $build # Build Tuscany SCA -sudo apt-get -y install python-dev +sudo apt-get -y install if [ "$?" != "0" ]; then exit $? fi |