Changeset 17898 for release-kits/mark3/ant-scripts/create-distribution.xml

Timestamp:

2008-11-20T16:33:21+13:00 (15 years ago)

Author:

oranfry

Message:

Standardised names of directories used in release kits

• gsdl and greenstone3 -> compiled
• distribution and distributions -> distributions
• greenstone3 and web -> web

And, expect more specifically named properties files, e.g., lirk3-build.properties, wirk2-build.properties

File:

• release-kits/mark3/ant-scripts/create-distribution.xml (modified) (2 diffs)

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

@@ -6 +6 @@
         <!-- create distribution -->
         <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>
+        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web"/></antcall>
+        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
         <antcall target="insert-user-manual"/>
         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
 
-        <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
+        <antcall target="copy-web-to-source" /> <!-- from init -->
 
-        <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+        <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
             <property name="app.version" value="${version}"/>
             <property name="branch.path" value="${branch.path}"/>
         </ant>
 
-        <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+        <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
             <property name="app.version" value="${version}"/>
             <property name="branch.path" value="${branch.path}"/>
         </ant>
 
-        <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+        <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
             <property name="app.version" value="${version}"/>
             <property name="branch.path" value="${branch.path}"/>
@@ -32 +32 @@
         <antcall target="export-imagemagick-darwin-binaries" />
         <antcall target="export-ghostscript-darwin-binaries" />
-        <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
+        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
     </target>
 
     <target name="export-greenstone3-gli">
-        <mkdir dir="distribution"/>
-        <delete dir="distribution/greenstone3"/>
+        <mkdir dir="distributions"/>
+        <delete dir="distributions/web"/>
         <svn javahl="false">
-            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
-            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
+            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/>
+            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
         </svn>
     </target>
     
     <target name="export-imagemagick-darwin-binaries">
-        <delete dir="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/>
+        <delete dir="distributions/web/gs2build/bin/darwin/imagemagick"/>
         <svn>
-            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/>
+            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distributions/web/gs2build/bin/darwin/imagemagick"/>
         </svn>
     </target>
     
     <target name="export-ghostscript-darwin-binaries">
-        <delete dir="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/>
+        <delete dir="distributions/web/gs2build/bin/darwin/ghostscript"/>
         <svn>
-            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/>
+            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distributions/web/gs2build/bin/darwin/ghostscript"/>
         </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>
-
     <target name="copy-over-build-xml">
-        <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
+        <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
     </target>
 
     <target name="insert-user-manual">
-        <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
+        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
     </target>
 
     <target name="insert-compiled-binaries">
-        <delete dir="distribution/greenstone3/lib/jni"/>
-        <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
+        <delete dir="distributions/web/lib/jni"/>
+        <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec>
 
-        <delete dir="distribution/greenstone3/gs2build/bin/darwin"/>
-        <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec>
+        <delete dir="distributions/web/gs2build/bin/darwin"/>
+        <exec executable="cp"><arg line="-r compiled/gs2build/bin/darwin distributions/web/gs2build/bin"/></exec>
 
-        <delete dir="distribution/greenstone3/gs2build/bin/java"/>
-        <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
-        <exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>
+        <delete dir="distributions/web/gs2build/bin/java"/>
+        <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec>
+        <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec>
     </target>
 
-    <target name="rename-build-xml-for-transit">
-        <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
-    </target>
-
-
 </project>