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

Timestamp:

2009-05-25T15:30:41+12:00 (15 years ago)

Author:

oranfry

Message:

separating out cdrom code for linux and mac too

File:

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

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

@@ -6 +6 @@
         <antcall target="create-objects"/>
         <antcall target="compile-wrapper-web"/>
-        <antcall target="compile-wrapper-cdrom"/>
-        <antcall target="archive-cdrom-components-and-installer"/>
     </target>
 
@@ -34 +32 @@
 
         <echo level="info">create an object file (extension .o) for each file to bundle</echo>
-        <!-- jar (web) -->
+        <!-- jar -->
         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer">
             <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/>
-        </exec>
-        <!-- jar (cdrom) -->
-        <exec executable="/usr/bin/objcopy" dir="installer">
-            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_cdrom_jar_start=greenstone2jar --readonly-text cdrom.jar ../wrapped-installer/cdrom.jar.o"/>
         </exec>
         <!-- java -->
@@ -60 +54 @@
         <exec executable="ls" dir="wrapped-installer" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec>
         <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
-
-        <!-- jar(cdrom) -->
-        <exec executable="ls" dir="installer" outputproperty="cdrom.jar.ls"><arg line="-l cdrom.jar"/></exec>
-        <exec executable="sed" inputstring="${cdrom.jar.ls}" outputproperty="cdrom.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
         <!-- java -->
@@ -91 +81 @@
     </target>
 
-    <target name="compile-wrapper-cdrom" depends="calculate-object-sizes">
-        <echo level="info">creating wrapper header file</echo>
-        <delete file="wrapper.h"/>
-        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h"><arg line="extern const char greenstone2jar[${cdrom.jar.size}];"/></exec>
-        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
-        <exec executable="echo" output="${basedir}/wrapped-installer/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
-
-        <echo level="info">compile the wrapper program</echo>
-        <exec executable="g++" dir="wrapped-installer">
-            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
-        </exec>
-
-        <echo level="info">link the compiled code and bundled files</echo>
-        <exec executable="g++" dir="${basedir}/wrapped-installer">
-            <arg line="-static -static-libgcc -o ../wrapped-installer/cdrom-linux wrapper.o libsearch4j.o cdrom.jar.o java.o"/>
-        </exec>
-
-    </target>
-
-    <target name="archive-cdrom-components-and-installer">
-        <mkdir dir="products"/>
-        <tar destfile="products/cdrom-components-${version}-linux.tar.gz" compression="gzip">
-            <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset>
-            <tarfileset dir="wrapped-installer"><include name="cdrom-linux"/></tarfileset>
-        </tar>
-    </target>
-
 </project>