From e986f0cbd641ff83eafe4aee5425950e04ab3d6a Mon Sep 17 00:00:00 2001 From: Luc Bourlier Date: Wed, 26 Sep 2012 11:52:02 +0200 Subject: [PATCH] Added a profile to set the scala versions The profile runs a tool which git the versions from the properties files unzipped during the toolchain build. Set a value to SET_VERSION to trigger the extra step. --- build-all.sh | 29 +++++++++++++++-------------- pom.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/build-all.sh b/build-all.sh index cc989e44a7..651bad37a6 100755 --- a/build-all.sh +++ b/build-all.sh @@ -2,12 +2,11 @@ # run in sequences the different maven calls needed to fully build Scala IDE from scratch - #ROOT_DIR=$(dirname $(readlink -f $0)) # not as good as the readlink version, but it is not working on os X ROOT_DIR=$(dirname $0) - -RUNNING_DIR=${PWD} +cd ${ROOT_DIR} +ROOT_DIR=${PWD} if [ -z "$*" ] then @@ -18,8 +17,8 @@ fi echo "Running with: mvn ${ARGS}" -# the parent project -cd ${ROOT_DIR} +# the toolchain +cd ${ROOT_DIR}/org.scala-ide.build-toolchain mvn ${ARGS} RES=$? @@ -28,19 +27,21 @@ then exit ${RES} fi -# the toolchain -cd ${RUNNING_DIR} -cd ${ROOT_DIR}/org.scala-ide.build-toolchain -mvn ${ARGS} - -RES=$? -if [ ${RES} != 0 ] +# set the versions if required +cd ${ROOT_DIR} +if [ -n "${SET_VERSIONS}" ] then - exit ${RES} + mvn -Pset-versions exec:java + RES=$? + if [ ${RES} != 0 ] + then + exit ${RES} + fi +else + echo "Not running UpdateScalaIDEManifests." fi # the plugins -cd ${RUNNING_DIR} cd ${ROOT_DIR}/org.scala-ide.sdt.build mvn ${ARGS} diff --git a/pom.xml b/pom.xml index 0117d19f15..3593b6b10d 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,49 @@ + + + + set-versions + + + org.scala-ide + build-tools_2.9.2 + 0.1.0 + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + copy.reflect + + java + + + + + compile + org.scalaide.buildtools.UpdateScalaIDEManifests + + + + + + + + typesafe-ide + Typesafe IDE repository + http://repo.typesafe.com/typesafe/ide-2.9 + true + + + +