Changeset 17446 for release-kits/lirk3/ant-scripts/wrap.xml

Timestamp:

2008-10-02T10:30:18+13:00 (16 years ago)

Author:

oranfry

Message:

got the component scheme working in lirk3

File:

• release-kits/lirk3/ant-scripts/wrap.xml (modified) (5 diffs)

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

@@ -18 +18 @@
         <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 -->
@@ -34 +33 @@
         </exec>
         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
-        </exec>
-        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
             <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>
-
 
         <!-- get size of greenstone.jar -->
@@ -45 +40 @@
         <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
-        <!-- get size of greenstone-with-java.jar -->
-        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
-        <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
-
         <!-- get size of java -->
         <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>
-
-
-        <echo level="info">creating the header file for no java version</echo>
-        <delete file="wrapper.h"/>
-        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
-
-        <echo level="info">compile the wrapper program</echo>
-        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
-            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
-        </exec>
 
         <echo level="info">compile libsearch4j</echo>
@@ -68 +49 @@
         </exec>
 
-        <echo level="info">link, bundling the files to be bundled</echo>
-        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
-            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/>
-        </exec>
-
-
         <echo level="info">creating the header file for bundled java version</echo>
         <delete file="wrapper.h"/>
-        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
+        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
@@ -87 +62 @@
         <echo level="info">relink, bundling the files to be bundled</echo>
         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
-            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/>
+            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o java.o"/>
         </exec>