Changeset 17352

Timestamp:

2008-09-19T16:13:24+12:00 (16 years ago)

Author:

oranfry

Message:

only create with bundled java

Location:

release-kits/lirk2/ant-scripts

Files:

• create-installer.xml (modified) (1 diff)
• wrap.xml (modified) (3 diffs)

release-kits/lirk2/ant-scripts/create-installer.xml

@@ -23 +23 @@
 
     <target name="compile-installer">
+
         <!-- create the installer with java -->
-        <installer file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"
-                compress="true"
-                extractType="NonExtractor"
-                installConfig="${basedir}/installer/antinstall-config.xml"
-                buildFile="${basedir}/installer/build.xml"
-                antInstallLib="${lirk2.home}/packages/ant-installer/lib"
-                antLib="${lirk2.home}/packages/ant/lib"
-                validateConfig="true"
-                failOnError="false"
-                icons="bluecurve">
-
-            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-            <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
-
-        </installer>
-
-        <!-- delete the bundled java lines from the installer config -->
-        <dcff
-            file="${basedir}/installer/antinstall-config.xml"
-            startTag=".*&lt;!-- start bundled java only --&gt;"
-            endTag=".*&lt;!-- end bundled java only --&gt;"/>
-
-        <!-- create the installer without java -->
-        <installer file="${basedir}/installer/greenstone-${version}-linux.jar"
+        <installer file="${basedir}/installer/Greenstone-${version}-linux.jar"
                 compress="true"
                 extractType="NonExtractor"

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

@@ -18 +18 @@
         <!-- copy bundled files -->
         <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"/>
+        <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/Greenstone-${version}-linux.jar"/>
 
         <!-- substitute in real values -->
@@ -32 +31 @@
 
         <echo level="info">create an object file (extension .o) for each file to bundle</echo>
+        <!-- jar -->
         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
             <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.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_greenstone2_with_java_jar_start=greenstone2jar --readonly-text greenstone2-with-java.jar greenstone2-with-java.jar.o"/>
-        </exec>
+        <!-- java -->
         <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 -->
+        <echo level="info">working out the size of the objects</echo>
+        <!-- jar -->
         <exec executable="ls" dir="${basedir}/wrapped-installer/build" 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>
 
-        <!-- get size of greenstone-with-java.jar -->
-        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2-with-java.jar.ls"><arg line="-l greenstone2-with-java.jar"/></exec>
-        <exec executable="sed" inputstring="${greenstone2-with-java.jar.ls}" outputproperty="greenstone2-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
-
-        <!-- get size of java -->
+        <!-- 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 greenstone2jar[${greenstone2.jar.size}];"/></exec>
 
         <echo level="info">compile the wrapper program</echo>
@@ -68 +59 @@
         </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 greenstone2.jar.o"/>
-        </exec>
-
-        <echo level="info">creating the header file for bundled java version</echo>
+        <echo level="info">creating wrapper header file</echo>
         <delete file="wrapper.h"/>
-        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2-with-java.jar.size}];"/></exec>
+        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.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>
 
-        <echo level="info">recompile the wrapper program</echo>
+        <echo level="info">link the compiled code and bundled files</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">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 greenstone2-with-java.jar.o java.o"/>
+            <arg line="-static -static-libgcc -o ../Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/>
         </exec>