Browse Source

Merge pull request #1993 from cjnething/change-ant-dependency-location-gemini-test-jn

Delete ant from prerequisites and move to its own script file
Mike Smith 9 years ago
parent
commit
65a9e36d6b

+ 1 - 1
frameworks/Java/gemini/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-fw_depends java resin maven
+fw_depends java resin maven ant
 
 
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':3306/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':3306/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml

+ 1 - 2
toolset/setup/linux/prerequisites.sh

@@ -54,8 +54,7 @@ sudo apt-get -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options:
   libboost-dev                      `# Silicon relies on boost::lexical_cast.` \
   libboost-dev                      `# Silicon relies on boost::lexical_cast.` \
   postgresql-server-dev-9.3         `# Needed by cpoll.` \
   postgresql-server-dev-9.3         `# Needed by cpoll.` \
   xdg-utils                         `# Needed by dlang.` \
   xdg-utils                         `# Needed by dlang.` \
-  python-pip \
-  ant
+  python-pip
 
 
 sudo pip install colorama==0.3.1
 sudo pip install colorama==0.3.1
 # Version 2.3 has a nice Counter() and other features
 # Version 2.3 has a nice Counter() and other features

+ 15 - 0
toolset/setup/linux/systools/ant.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+RETCODE=$(fw_exists ${IROOT}/ant.installed)
+[ ! "$RETCODE" == 0 ] || { \
+source $IROOT/ant.installed
+return 0; }
+
+sudo apt-get update
+sudo apt-get -y --force-yes install ant
+
+echo "export PATH=/usr/share/ant/bin:\$PATH" > $IROOT/ant.installed
+
+ant -version
+
+source $IROOT/ant.installed

+ 2 - 7
toolset/setup/linux/systools/maven.sh

@@ -8,14 +8,9 @@ return 0; }
 sudo add-apt-repository "deb http://ppa.launchpad.net/natecarlson/maven3/ubuntu precise main"
 sudo add-apt-repository "deb http://ppa.launchpad.net/natecarlson/maven3/ubuntu precise main"
 sudo apt-get update
 sudo apt-get update
 sudo apt-get -y --force-yes install maven3
 sudo apt-get -y --force-yes install maven3
-if [ -e /usr/bin/mvn ]
-then
-    sudo rm -f /usr/bin/mvn
-fi
-sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/mvn
 
 
-mvn -version
+echo "export PATH=/usr/share/maven3/bin:\$PATH" > $IROOT/maven.installed
 
 
-touch $IROOT/maven.installed
+mvn -version
 
 
 source $IROOT/maven.installed
 source $IROOT/maven.installed