Changeset 20937 for release-kits

Timestamp:

2009-11-13T10:23:26+13:00 (14 years ago)

Author:

oranfry

Message:

collaped properties linux-java.extracted and windows-java.extracted into java.extracted

Location:

release-kits/shared

Files:

• core/ant-scripts/init.xml (modified) (3 diffs)
• greenstone2/installer/build.xml (modified) (2 diffs)

release-kits/shared/core/ant-scripts/init.xml

@@ -34 +34 @@
         <!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository -->
         <!-- change this info when the bundled version changes -->
+        <property name="java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive -->
+
         <!-- linux -->
         <property name="linux-java.installer" value="jre_bin"/>
         <property name="bundled.version.linux-java" value="1.6.0_05"/> <!-- set this to the version number of java in the above archive -->
-        <property name="linux-java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive -->
         <property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive -->
 
@@ -43 +44 @@
         <property name="windows-java.installer" value="jre.exe"/>
         <property name="bundled.version.windows-java" value="1.6.0_07"/> <!-- set this to the version number of java in the above archive -->
-        <property name="windows-java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive -->
         <property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive -->
 
@@ -307 +307 @@
             <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/>
             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <job pattern="@windows-java.extracted@" replacement="${windows-java.extracted}"/>
-            <job pattern="@linux-java.extracted@" replacement="${linux-java.extracted}"/>
+            <job pattern="@java.extracted@" replacement="${java.extracted}"/>
         </rsr>
 

release-kits/shared/greenstone2/installer/build.xml

@@ -42 +42 @@
     <!-- determine if a bundled java exists -->
     <condition property="bundled.java.exists">
-        <available file="../@linux-java.extracted@/bin/java"/>
+        <available file="../@java.extracted@/bin/java"/>
     </condition>
 
@@ -67 +67 @@
         <mkdir dir="${installDir}/packages"/>
         <copy todir="${installDir}/packages/jre" failonerror="false">
-            <fileset dir="../@linux-java.extracted@"/>
+            <fileset dir="../@java.extracted@"/>
         </copy>
         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>