Changeset 19847 for release-kits/wirk2/installer/build.xml

Timestamp:

2009-06-15T17:00:37+12:00 (15 years ago)

Author:

oranfry

Message:

changes that went in for the 2.82cd release

File:

• release-kits/wirk2/installer/build.xml (modified) (3 diffs)

release-kits/wirk2/installer/build.xml

@@ -48 +48 @@
         <!-- create the installation directory -->
         <echo message="Creating Installation directory"/>
-        <mkdir dir="${installDir}"/>
+        <mkdir dir="${installDir}/packages"/>
         
         <!-- extract 7za tool -->
@@ -64 +64 @@
         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
         <delete file="core.comp"/>
+        <copy todir="${installDir}/packages/jre" failonerror="false">
+            <fileset dir="../@windows-java.extracted@"/>
+        </copy>
         <!-- end web -->
 
@@ -71 +74 @@
             <fileset dir="${orig.dir}/Software/core/windows"/>
         </copy>
+        <copy todir="${installDir}/packages/jre" failonerror="false">
+            <fileset dir="${orig.dir}/Java/Windows/jre"/>
+        </copy>
         <!-- end cdrom -->
-
-        <!-- jre -->
-        <mkdir dir="${installDir}/packages"/>
-        <copy todir="${installDir}/packages/jre" failonerror="false">
-            <fileset dir="../@windows-java.extracted@"/>
-        </copy>
         
         <echo>Correcting perl shebangs in perl scripts</echo>