Changeset 17336 for release-kits/wirk3

Timestamp:

2008-09-19T09:25:33+12:00 (16 years ago)

Author:

oranfry

Message:

made sure version numbers are changed before compiling in dist, and copy most up-to-date icon into release

File:

• release-kits/wirk3/ant-scripts/create-distribution.xml (modified) (3 diffs)

release-kits/wirk3/ant-scripts/create-distribution.xml

@@ -4 +4 @@
     <target name="create-distribution">
         <!-- create distribution -->
-        <antcall target="export-greenstone3" />
+        <antcall target="export-greenstone3-gli" />
+        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3" /></antcall>
+        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall>
         <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
             <property name="app.version" value="${version}"/>
@@ -20 +22 @@
             <property name="branch.revision" value="${branch.revision}"/>
         </ant>
-        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall>
         <antcall target="copy-over-build-xml" />
         <antcall target="insert-user-manual"/>
         <antcall target="insert-compiled-binaries"/>
+        <antcall target="insert-icon"/>
         <antcall target="insert-uninstaller"/> <!-- from rk3-targets -->
         <antcall target="rename-build-xml-for-transit"/>
     </target>
 
-    <target name="export-greenstone3">
+    <target name="export-greenstone3-gli">
         <mkdir dir="distribution"/>
         <delete dir="distribution/greenstone3"/>
         <svn>
             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/>
+            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli" revision="${branch.revision}"/>
         </svn>
-    </target>
-
-    <target name="dist-set-version-number-property">
-        <rsr
-            file="distribution/greenstone3/resources/java/global.properties.in"
-            pattern="(.*)@gsdl3version@(.*)"
-            replacement="$1${version}$2" />
     </target>
 
@@ -63 +59 @@
         <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy>
     </target>
+    
+    <target name="insert-icon">
+        <copy
+            file="${wirk3.home}/greenstone3/icon/icon.ico"
+            tofile="distribution/greenstone3/resources/images/gs3.ico"/>
+    </target>
 
     <target name="rename-build-xml-for-transit">