calling build-gui with a release-tag (#570) (#571)

also cleaned up the delivery.properties

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() {

installation/build/build-gui.xml

@@ -35,7 +35,7 @@
 
     <!-- modeller -->
     <exec executable="git" failonerror="true">
-      <arg line="clone --recurse-submodules ${repository-url}/${modeller.git} ${modeller.dir}" />
+      <arg line="clone --recurse-submodules ${repository-url}/${modeller.git} --branch ${modeller.tag} ${modeller.dir}" />
     </exec>
   </target>
 

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=[email protected]
-#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