summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/ubuntu
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-11-30 03:47:01 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-11-30 03:47:01 +0000
commit0119ce10b0ee065e7313be44a1633c62a6198b42 (patch)
treeb69772ee2aa83071cde0d086ee4679bfab6c5508 /sca-cpp/trunk/ubuntu
parentd59fdfce0fb7822f55cd39cdf5f3c55e92e2a53f (diff)
Minor build and install script fixes. Install missing dev tools. Add a missing cd command.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1208241 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/ubuntu')
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-bin-all-image2
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-bin-image2
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-install3
-rwxr-xr-xsca-cpp/trunk/ubuntu/ubuntu-install-all3
4 files changed, 6 insertions, 4 deletions
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
index 79a2104af0..c76af435a6 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image
@@ -34,7 +34,7 @@ sudo chgrp $g /mnt/tuscany
cd /mnt/tuscany
# Install core dev tools
-sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make gdb vim
if [ "$?" != "0" ]; then
exit $?
fi
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-bin-image b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
index 664d585021..032c4e4978 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-bin-image
+++ b/sca-cpp/trunk/ubuntu/ubuntu-bin-image
@@ -34,7 +34,7 @@ sudo chgrp $g /mnt/tuscany
cd /mnt/tuscany
# Install core dev tools
-sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make gdb vim
if [ "$?" != "0" ]; then
exit $?
fi
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install b/sca-cpp/trunk/ubuntu/ubuntu-install
index 7b46ee0872..df1271ad73 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install
@@ -26,7 +26,7 @@ set -x
build=`pwd`
# Install core dev tools
-sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make gdb vim
if [ "$?" != "0" ]; then
exit $?
fi
@@ -245,6 +245,7 @@ cp -R optional_rules $build/modsecurity-apache-2.6.1-bin
if [ "$?" != "0" ]; then
exit $?
fi
+cd $build
# Build Apache Thrift
sudo apt-get -y install bison flex python-dev libboost-dev libboost-filesystem-dev
diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all
index fc071931ac..789a2acc31 100755
--- a/sca-cpp/trunk/ubuntu/ubuntu-install-all
+++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all
@@ -26,7 +26,7 @@ set -x
build=`pwd`
# Install core dev tools
-sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make
+sudo apt-get -y install curl git-core subversion autoconf pkg-config automake libtool g++ make gdb vim
if [ "$?" != "0" ]; then
exit $?
fi
@@ -299,6 +299,7 @@ cp -R optional_rules $build/modsecurity-apache-2.6.1-bin
if [ "$?" != "0" ]; then
exit $?
fi
+cd $build
# Build PostgreSQL
sudo apt-get -y install libreadline-dev