Changeset 17898 for release-kits/mark3/ant-scripts/compile.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/compile.xml (modified) (4 diffs)

release-kits/mark3/ant-scripts/compile.xml

@@ -9 +9 @@
         <!-- preparation -->
         <antcall target="greenstone3-set-version-numbers">
-            <param name="greenstone3basedir" value="${basedir}/greenstone3"/>
+            <param name="greenstone3basedir" value="${basedir}/compiled"/>
         </antcall>
         <antcall target="set-gdbm-installed-path" />
-        <ant target="prepare-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+        <ant target="prepare-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
         
         <!-- update -->
-        <ant target="update-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+        <ant target="update-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
 
         <!-- configure -->
-        <ant target="configure-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+        <ant target="configure-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
         <antcall target="tweak-makefiles" />
 
         <!-- build -->
-        <ant target="build-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+        <ant target="build-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
         <antcall target="linux-strip-execs" />
 
@@ -35 +35 @@
     <target name="checkout-greenstone3">
         <svn javahl="false">
-            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
+            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/>
         </svn>
     </target>
 
     <target name="set-version-number-property">
-        <rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
+        <rsr file="compiled/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
     </target>
 
     <target name="set-gdbm-installed-path">
-        <rsr file="greenstone3/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
+        <rsr file="compiled/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
     </target>
 
     <target name="tweak-makefiles">
         <rsr
-            file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
+            file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
             pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
             replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
 
         <rsr
-            file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
+            file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
             pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
             replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
 
         <rsr
-            file="${basedir}/greenstone3/src/packages/javagdbm/jni/Makefile"
+            file="${basedir}/compiled/src/packages/javagdbm/jni/Makefile"
             pattern="^(GDBM_LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
             replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
@@ -65 +65 @@
 
     <target name="linux-strip-execs">
-        <exec dir="greenstone3/gs2build/bin/darwin" executable="find">
+        <exec dir="compiled/gs2build/bin/darwin" executable="find">
             <arg line=". ! -name . -exec strip {} &#59;"/>
         </exec>
@@ -71 +71 @@
 
     <target name="prepare-documentation">
-        <mkdir dir="greenstone3/gsdl-manuals"/>
+        <mkdir dir="compiled/gsdl-manuals"/>
         <svn javahl="false">
-            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/>
-            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
+            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
+            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
         </svn>
-        <javac srcdir="greenstone3/gsdl-manuals/shared"
-              destdir="greenstone3/gsdl-manuals/shared"
+        <javac srcdir="compiled/gsdl-manuals/shared"
+              destdir="compiled/gsdl-manuals/shared"
               debug="on">
             <include name="*.java"/>
         </javac>
-        <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
+        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
 
         <path id="documentation.compile.classpath">
-            <fileset dir="greenstone3/gsdl-manuals">
+            <fileset dir="compiled/gsdl-manuals">
                 <include name="**/*.jar"/>
             </fileset>
-            <pathelement path="greenstone3/gsdl-manuals/shared"/>
-            <pathelement path="greenstone3/gsdl-manuals/manuals"/>
+            <pathelement path="compiled/gsdl-manuals/shared"/>
+            <pathelement path="compiled/gsdl-manuals/manuals"/>
         </path>
 
-        <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
-            <arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
-            <arg value="greenstone3/gli/help/en/help.xml" />
-            <arg value="greenstone3" />
+        <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
+            <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
+            <arg value="compiled/gli/help/en/help.xml" />
+            <arg value="compiled" />
         </java>
 
-        <chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
+        <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
         <echo>Run generate-pdf.sh</echo>
-        <exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
+        <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh">
             <arg line="generate-pdf.sh u en" />
         </exec>