Changeset 16187

Timestamp:

2008-06-25T16:22:39+12:00 (15 years ago)

Author:

oranfry

Message:

changes after renaming resources->classes

Location:

release-kits

Files:

• lirk2/ant-scripts/create-installer.xml (modified) (2 diffs)
• lirk3/ant-scripts/build.xml (modified) (1 diff)
• lirk3/ant-scripts/create-installer.xml (modified) (4 diffs)
• lirk3/ant-scripts/wrap.xml (modified) (3 diffs)
• wirk3/ant-scripts/init.xml (modified) (1 diff)

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

@@ -14 +14 @@
             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/build.xml" overwrite="true"/>
-            <copy todir="${basedir}/installer/resources" overwrite="true">
-                <fileset dir="${lirk2.home}/greenstone2/installer-resources"/>
+            <copy todir="${basedir}/installer/classes" overwrite="true">
+                <fileset dir="${lirk2.home}/greenstone2/installer-classes"/>
             </copy>
 
@@ -79 +79 @@
                     icons="bluecurve">
 
-                <zipfileset dir="${basedir}/installer" includes="resources/*"/>
+                <zipfileset dir="${basedir}/installer" includes="classes/*"/>
                 <zipfileset dir="${lirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
                 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>

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

@@ -14 +14 @@
 
     <!-- the version numbers of bundled things -->
-    <property name="bundled.version.java" value="1.6.0_05"/>
     <property name="bundled.version.tomcat" value="5.5.25"/>
     <property name="bundled.version.ant" value="1.6.5"/>
-
-    <!-- information about the bundled java (to be changed manually when the bundled version changes) -->
-    <property name="java.installer" value="jre_6u5_tar_gz"/> <!-- set this to the name of the archive in LIRK3_HOME/wrapper. can only contain A-Za-z_ -->
-    <property name="java.extracted" value="jre1.6.0_05"/> <!-- set this to the name of the top level directory in the above archive -->
-    <property name="component.size.java" value="97Mb"/>
 
     <!-- for the benefit of the shared scripts, set release-kit home -->

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

@@ -23 +23 @@
             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
-            <copy todir="${basedir}/installer/resources" overwrite="true">
-                <fileset dir="${lirk3.home}/greenstone3/installer-resources"/>
+            <copy todir="${basedir}/installer/classes" overwrite="true">
+                <fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
             </copy>
 
             <!-- put the concrete values of things in the config -->
             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.java}"/>
+            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.linux-java@" replacement="${component.size.linux-java}"/>
             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/>
             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.ant@" replacement="${component.size.ant}"/>
 
             <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${java.extracted}"/>
+            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
 
 
@@ -42 +42 @@
             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/>
             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
@@ -49 +49 @@
             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/>
             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
@@ -71 +71 @@
 
                 <!-- copy all the important files into the archive to be extracted for install -->
-                <zipfileset dir="${basedir}/installer" includes="resources/*"/>
+                <zipfileset dir="${basedir}/installer" includes="classes/*"/>
                 <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
 

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

@@ -16 +16 @@
             <!-- copy bundled files -->
             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/search4j" />
-            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${java.installer}"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
 
             <!-- substitute the real java installer filename and min version into various files -->
-            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
+            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone3"/>
-            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${java.extracted}"/>
+            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
 
@@ -43 +43 @@
             </exec>
             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/>
+                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
             </exec>
 
@@ -60 +60 @@
 
             <!-- get size of java -->
-            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec>
+            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
             <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 

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

@@ -47 +47 @@
     <!-- CONSTANTS -->
     <property name="resources.chunksize" value="8388608"/><!-- resources split into 8MiB chunks -->
-    <tempfile property="temp.file" destdir="${java.io.tmpdir}" prefix="delete" suffix=".tmp"/><!-- somewhere to store temporary text -->
-    <property name="svn.root" value="http://svn.greenstone.org"/><!-- svn root -->
-    <property name="java.min.version" value="1.5.0_00"/><!-- the minimum java version we require end users to have -->
-    <property name="java.installer" value="jre-6u3-windows-i586-p-s.exe"/><!-- relative to WIRK3_HOME/wrapper -->
 
     <!-- the version numbers of bundled things (entered manually to save us autodetecting; update as needed) -->
-    <property name="bundled.version.java" value="1.6.0_05"/>
     <property name="bundled.version.tomcat" value="5.5.25"/>
     <property name="bundled.version.ant" value="1.6.5"/>