diff --git a/installation/build.sh b/installation/build.sh index 2b55f6d47..bc94fa6d3 100755 --- a/installation/build.sh +++ b/installation/build.sh @@ -284,9 +284,10 @@ build_prerequisites() { } build_modeller() { - echo "building Modeller GUI" + MODELLER_TAG=$(cat ${SCRIPT_DIR}/delivery/delivery.properties | grep ^xynamodeller.release.tag | cut -d'=' -f2) #e.g. 9.0.0.0 + echo "building Modeller GUI from tag ${MODELLER_TAG}" cd $SCRIPT_DIR/build - ant -f build-gui.xml + ant -f build-gui.xml -Dmodeller.tag=${MODELLER_TAG} } build_xyna_factory() { diff --git a/installation/build/build-gui.xml b/installation/build/build-gui.xml index e62f5114e..dbe95e788 100644 --- a/installation/build/build-gui.xml +++ b/installation/build/build-gui.xml @@ -35,7 +35,7 @@ - + diff --git a/installation/delivery/delivery.properties b/installation/delivery/delivery.properties index b33191ead..b55931afd 100644 --- a/installation/delivery/delivery.properties +++ b/installation/delivery/delivery.properties @@ -7,30 +7,5 @@ delivery.name=Xyna delivery.dir=/tmp #release number of the delivery item release.number=v9.0.3.0 - -#Include "func_lib" from this SVN-URL -func_lib.svn.url=svn://svn/trunk/xyna/prerequisites/installation/install/func_lib - - -##svn properties -#=============== -#root of the svn repository -svn.root=svn://svn -#svn tag for the delivery item (must contain release number) -svn.tag=XYNA_BLACK_${release.number} -#svn path to the project (after trunk). example xfbb/processing -svn.project=xyna/blackedition -#svn branch of the project (only set if checkout from branch). example XFBB_PROCESSING_2.2.2.1_branch -#svn.branch=XYNA_BLACK_evolve_branch - - -##git properties -#=============== -#host of the git repository -git.host=xyna@10.0.10.48 -#svn tag for the delivery item (must contain release number) -git.tag=${release.number} -#svn path to the project (after trunk). example xfbb/processing -git.project=/home/xyna/git/xyna-factory.git -#svn branch of the project (only set if checkout from branch). example XFBB_PROCESSING_2.2.2.1_branch -#svn.branch=XYNA_BLACK_evolve_branch +#tag of xyna-modeller release +xynamodeller.release.tag=9.0.3.1