Changeset 16175 for release-kits/lirk2/ant-scripts/wrap.xml

Timestamp:

2008-06-25T13:33:37+12:00 (16 years ago)

Author:

oranfry

Message:

made lirk2 work under the new shared code scheme

File:

• release-kits/lirk2/ant-scripts/wrap.xml (modified) (4 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-        .......................................................... 
-         September 2007
-         Greenstone3 'release maker' script
-         Oran Fry
-        ..........................................................
--->
-
 <project name="lirk2-wrap" default="wrap">
 
@@ -25 +16 @@
 
             <!-- copy bundled files -->
-            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/search4j/search4j"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${java.installer}"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/search4j"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/>
             <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/greenstone-${version}-linux.jar"/>
             <copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"/>
 
             <!-- substitute in real values -->
-            <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="greenstone2"/>
-            <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}"/>
 
@@ -53 +44 @@
             </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>
 
@@ -69 +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>