Changeset 28717 for other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml

Timestamp:

2013-11-28T17:49:20+13:00 (10 years ago)

Author:

ak19

Message:

jts21 - Removed unused installer targets and variables, renamed some java variables, made installing a JRE an optional installation component

File:

• other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml (modified) (7 diffs)

other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml

@@ -22 +22 @@
             <rsr file="wrapped-installer/wrapper.cpp">
                 <job pattern="@projectname@" replacement="${projectname}"/>
-                <job pattern="@java.installer@" replacement="${windows-java.installer}"/>
+                <job pattern="@java.installer@" replacement="${java.installer}"/>
                 <job pattern="@java.min.version@" replacement="${java.min.version}"/>
                 <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
@@ -33 +33 @@
             <!-- split the resources into chunks, creating a resource script of the chunks -->
             <rsplit
-                resource="${rk.home}/shared/windows/wrapper/${windows-java.installer}"
+                resource="${rk.home}/shared/windows/wrapper/${java.installer}"
                 outputDir="wrapped-installer"                   
                 resourceScript="wrapped-installer/wrapper.rc"
@@ -78 +78 @@
 
             <!-- copy bundled files into place -->
-            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/>
+            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${java.installer}"/>
             <copy tofile="wrapped-installer/${projectname}.jar" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
 
@@ -84 +84 @@
             <rsr file="wrapped-installer/wrapper.cpp">
                 <job pattern="@projectname@" replacement="${projectname}"/>
-                <job pattern="@java.installer@" replacement="${linux-java.installer}"/>
+                <job pattern="@java.installer@" replacement="${java.installer}"/>
                 <job pattern="@java.extracted@" replacement="${java.extracted}"/>
                 <job pattern="@java.min.version@" replacement="${java.min.version}"/>
@@ -95 +95 @@
             </exec>
             <exec executable="/usr/bin/objcopy" dir="wrapped-installer">
-              <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
+              <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/>
             </exec>
 
@@ -103 +103 @@
               </exec>
               <exec executable="/usr/bin/objcopy" dir="wrapped-installer" failonerror="true">
-                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
+                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/>
               </exec>
              </else>
@@ -118 +118 @@
 
             <!-- figure out java size -->
-            <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
+            <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec>
             <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>