Changeset 19475

Timestamp:

2009-05-14T13:53:23+12:00 (15 years ago)

Author:

oranfry

Message:

got the release kit to work under java 1.5

Location:

release-kits/wirk3/ant-scripts

Files:

• compile.xml (modified) (2 diffs)
• create-distribution.xml (modified) (1 diff)
• operations-on-gs3home.xml (modified) (3 diffs)

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

@@ -47 +47 @@
             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared" revision="${branch.revision}"/>
         </svn>
-        <javac srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
-        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
 
         <echo>Define Classpath</echo>
@@ -59 +57 @@
             <pathelement path="compiled/gli/classes"/>
         </path>
+
+        <javac classpathref="documentation.compile.classpath" srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
+        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
                     
         <echo>Apply XSLT</echo>

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

@@ -12 +12 @@
         <antcall target="insert-uninstaller-jar"/> <!-- from rk3-targets -->
 
+        <ant target="configure-java-version" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"/>
+            
         <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
             <property name="app.version" value="${version}"/>

release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

@@ -10 +10 @@
 
 <project name="opeations-on-gs3home" default="usage">
+
+    <path id="runtime.classpath">
+        <fileset dir="${web.lib}" includes="**/*.jar"/>
+    </path>
+
   
     <!-- include standard build file -->
@@ -88 +93 @@
 
         <!-- put gs2build source code in a tidy place -->
-        <move todir="${gs2build.home}/source/src" failonerror="false"><fileset dir="${gs2build.home}/src" defaultexcludes="no"/></move>
-        <move todir="${gs2build.home}/source/lib" failonerror="false"><fileset dir="${gs2build.home}/lib" defaultexcludes="no"/></move>
-        <move todir="${gs2build.home}/source/packages" failonerror="false"><fileset dir="${gs2build.home}/packages" defaultexcludes="no"/></move>
-        <move todir="${gs2build.home}/source/indexers" failonerror="false"><fileset dir="${gs2build.home}/indexers" defaultexcludes="no"/></move>
-        <move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/>
-        <!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>-->
-        <!--<move file="${gs2build.home}/win32cfg.h" tofile="${gs2build.home}/source/win32cfg.h"/>-->
-
+        <if><bool><available file="${gs2build.home}/source/src"/></bool>
+            <move todir="${gs2build.home}/source/src" failonerror="false"><fileset dir="${gs2build.home}/src" defaultexcludes="no"/></move>
+            <move todir="${gs2build.home}/source/lib" failonerror="false"><fileset dir="${gs2build.home}/lib" defaultexcludes="no"/></move>
+            <move todir="${gs2build.home}/source/packages" failonerror="false"><fileset dir="${gs2build.home}/packages" defaultexcludes="no"/></move>
+            <move todir="${gs2build.home}/source/indexers" failonerror="false"><fileset dir="${gs2build.home}/indexers" defaultexcludes="no"/></move>
+            <move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/>
+            <!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>-->
+            <!--<move file="${gs2build.home}/win32cfg.h" tofile="${gs2build.home}/source/win32cfg.h"/>-->
+        </if>
+        
         <!-- clean up -->
         <delete includeemptydirs="true">
@@ -139 +146 @@
 
     <target name="run-xslt-source" depends="init">
-        <xslt in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml-source.xsl"/>
+        <xslt classpathref="runtime.classpath" in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml-source.xsl"/>
     </target>
   
     <target name="run-xslt-binary" depends="init">
-        <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
+        <xslt classpathref="runtime.classpath" in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
     </target>