Changeset 17268 for release-kits

Timestamp:

2008-09-12T11:29:06+12:00 (16 years ago)

Author:

oranfry

Message:

compile search4j in release process and started standardising java installtion

Location:

release-kits

Files:

• lirk2/ant-scripts/compile.xml (modified) (1 diff)
• lirk2/ant-scripts/create-distribution.xml (modified) (1 diff)
• lirk3/ant-scripts/compile.xml (modified) (1 diff)
• lirk3/ant-scripts/create-distribution.xml (modified) (1 diff)
• mark2/ant-scripts/compile.xml (modified) (1 diff)
• mark2/ant-scripts/create-distribution.xml (modified) (1 diff)
• mark3/ant-scripts/compile.xml (modified) (1 diff)
• mark3/ant-scripts/create-distribution.xml (modified) (1 diff)
• wirk2/ant-scripts/compile.xml (modified) (1 diff)
• wirk2/ant-scripts/wrap.xml (modified) (1 diff)
• wirk3/ant-scripts/compile.xml (modified) (1 diff)
• wirk3/ant-scripts/create-installer.xml (modified) (1 diff)
• wirk3/ant-scripts/wrap.xml (modified) (2 diffs)

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

@@ -19 +19 @@
         <antcall target="strip-execs"/>
 
+        <!-- search4j -->
+        <antcall target="compile-search4j" /> <!-- from rk2-targets -->
+
         <!-- uninstaller -->
-        <antcall target="compile-uninstaller" /> <!-- from global-targets -->
+        <antcall target="compile-uninstaller" /> <!-- from rk2-targets -->
 
         <!-- build collections -->

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

@@ -38 +38 @@
         <delete dir="distributions/web/bin/linux" />
         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="gsdl/bin/search4j distributions/web/bin"/></exec>
         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>

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

@@ -25 +25 @@
         <antcall target="linux-strip-execs" />
 
+        <!-- search4j -->
+        <antcall target="compile-search4j" /> <!-- from rk3-targets -->
+
         <!-- uninstaller -->
-        <antcall target="compile-uninstaller" /> <!-- from global-targets -->
+        <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
 
         <!-- documentation -->

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

@@ -60 +60 @@
         <delete dir="distribution/greenstone3/gs2build/bin/linux"/>
         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>
 
         <delete dir="distribution/greenstone3/gs2build/bin/java"/>

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

@@ -17 +17 @@
         <antcall target="strip-execs"/>
 
+        <!-- search4j -->
+        <antcall target="compile-search4j" /> <!-- from rk2-targets -->
+
         <!-- uninstaller -->
-        <antcall target="compile-uninstaller" /> <!-- from global-targets -->
+        <antcall target="compile-uninstaller" /> <!-- from rk2-targets -->
 
         <!-- build collections -->

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

@@ -45 +45 @@
         <delete dir="distributions/web/bin/darwin" />
         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="gsdl/bin/search4j distributions/web/bin"/></exec>
         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>

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

@@ -22 +22 @@
         <ant target="build-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
         <antcall target="linux-strip-execs" />
+
+        <!-- search4j -->
         <antcall target="compile-search4j" /> <!-- from rk3-targets -->
 
         <!-- uninstaller -->
-        <antcall target="compile-uninstaller" /> <!-- from global-targets -->
+        <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
 
         <!-- documentation -->

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

@@ -60 +60 @@
         <delete dir="distribution/greenstone3/gs2build/bin/darwin"/>
         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>
 
         <delete dir="distribution/greenstone3/gs2build/bin/java"/>

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

@@ -9 +9 @@
         <antcall target="insert-perl" />
         <antcall target="compile-c-code" />
-        <antcall target="compile-uninstaller" /> <!-- from global-targets -->
+        <antcall target="compile-uninstaller" /> <!-- from rk2-targets -->
         <antcall target="build-demo-collection" />
     </target>

release-kits/wirk2/ant-scripts/wrap.xml

@@ -19 +19 @@
         <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/>
         <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/>
+
     </target>
     
     <target name="tweak-files-for-wrapping">
-        <!-- substitute the real java installer filename and min version into various files -->
         <echo>Substitute concrete values of things into source files</echo>
         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>

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

@@ -15 +15 @@
             <property name="branch.revision" value="${branch.revision}"/>
         </ant>
-        <antcall target="compile-uninstaller" /> <!-- from global-targets -->
+        <antcall target="compile-uninstaller" /> <!-- from rk3-targets -->
         <antcall target="prepare-documentation" />
     </target>

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

@@ -9 +9 @@
 
     <target name="copy-installer-files">
+
         <echo>Getting things ready to compile the installer</echo>
         <mkdir dir="${basedir}/installer/resources"/>
+
+        <!-- the installer descriptors -->
         <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml" overwrite="true" />
         <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml" overwrite="true" />
+
+        <!-- the language files and other canned classes for the installer -->
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${wirk3.home}/windows/installer-classes"/>
             <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
         </copy>
+
+        <!-- some classes from jars, unpacked to be repacked into installer -->
         <unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+
     </target>
 

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

@@ -12 +12 @@
 
     <target name="copy-files-for-wrapping">
-        <!--create a directory to build the wrapped installer in -->
+        <echo>Copying wrapper source files</echo>
         <mkdir dir="${basedir}/wrapped-installer/build"/>
-        <!-- copy source files -->
         <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/>
         <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/packages/search4j/libsearch4j.cpp"/>
@@ -21 +20 @@
     
     <target name="tweak-files-for-wrapping">
-        <!-- substitute the real java installer filename and min version into various files -->
-        <echo>Substitute concrete values of things into source files</echo>
+        <echo>Substituting concrete values into source files</echo>
         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
+        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${windows-java.extracted}"/>
         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
     </target>