Changeset 17352
- Timestamp:
- 2008-09-19 16:13:24 (4 months ago)
- Files:
-
- release-kits/lirk2/ant-scripts/create-installer.xml (modified) (1 diff)
- release-kits/lirk2/ant-scripts/wrap.xml (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/lirk2/ant-scripts/create-installer.xml
r17279 r17352 23 23 24 24 <target name="compile-installer"> 25 25 26 <!-- create the installer with java --> 26 <installer file="${basedir}/installer/greenstone-${version}-linux-with-java.jar" 27 compress="true" 28 extractType="NonExtractor" 29 installConfig="${basedir}/installer/antinstall-config.xml" 30 buildFile="${basedir}/installer/build.xml" 31 antInstallLib="${lirk2.home}/packages/ant-installer/lib" 32 antLib="${lirk2.home}/packages/ant/lib" 33 validateConfig="true" 34 failOnError="false" 35 icons="bluecurve"> 36 37 <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 38 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> 39 40 </installer> 41 42 <!-- delete the bundled java lines from the installer config --> 43 <dcff 44 file="${basedir}/installer/antinstall-config.xml" 45 startTag=".*<!-- start bundled java only -->" 46 endTag=".*<!-- end bundled java only -->"/> 47 48 <!-- create the installer without java --> 49 <installer file="${basedir}/installer/greenstone-${version}-linux.jar" 27 <installer file="${basedir}/installer/Greenstone-${version}-linux.jar" 50 28 compress="true" 51 29 extractType="NonExtractor" release-kits/lirk2/ant-scripts/wrap.xml
r16739 r17352 18 18 <!-- copy bundled files --> 19 19 <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/> 20 <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/greenstone-${version}-linux.jar"/> 21 <copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"/> 20 <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/Greenstone-${version}-linux.jar"/> 22 21 23 22 <!-- substitute in real values --> … … 32 31 33 32 <echo level="info">create an object file (extension .o) for each file to bundle</echo> 33 <!-- jar --> 34 34 <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 35 35 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/> 36 36 </exec> 37 <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 38 <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"/> 39 </exec> 37 <!-- java --> 40 38 <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 41 39 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 42 40 </exec> 43 41 44 <!-- get size of greenstone.jar --> 42 <echo level="info">working out the size of the objects</echo> 43 <!-- jar --> 45 44 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec> 46 45 <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 47 46 48 <!-- get size of greenstone-with-java.jar --> 49 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2-with-java.jar.ls"><arg line="-l greenstone2-with-java.jar"/></exec> 50 <exec executable="sed" inputstring="${greenstone2-with-java.jar.ls}" outputproperty="greenstone2-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 51 52 <!-- get size of java --> 47 <!-- java --> 53 48 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> 54 49 <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 55 56 <echo level="info">creating the header file for no java version</echo>57 <delete file="wrapper.h"/>58 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec>59 50 60 51 <echo level="info">compile the wrapper program</echo> … … 68 59 </exec> 69 60 70 <echo level="info">link, bundling the files to be bundled</echo> 71 <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 72 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o"/> 73 </exec> 74 75 <echo level="info">creating the header file for bundled java version</echo> 61 <echo level="info">creating wrapper header file</echo> 76 62 <delete file="wrapper.h"/> 77 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2 -with-java.jar.size}];"/></exec>63 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec> 78 64 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 79 65 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> 80 66 81 <echo level="info"> recompile the wrapper program</echo>67 <echo level="info">link the compiled code and bundled files</echo> 82 68 <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 83 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 84 </exec> 85 86 <echo level="info">relink, bundling the files to be bundled</echo> 87 <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 88 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone2-with-java.jar.o java.o"/> 69 <arg line="-static -static-libgcc -o ../Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/> 89 70 </exec> 90 71
