Changeset 16243
- Timestamp:
- 2008-06-27 17:20:22 (3 months ago)
- Files:
-
- release-kits/lirk3/ant-scripts/build.xml (modified) (1 diff)
- release-kits/lirk3/ant-scripts/create-distribution.xml (modified) (2 diffs)
- release-kits/lirk3/ant-scripts/wrap.xml (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/lirk3/ant-scripts/build.xml
r16187 r16243 16 16 <property name="bundled.version.tomcat" value="5.5.25"/> 17 17 <property name="bundled.version.ant" value="1.6.5"/> 18 19 <!-- set current month and year--> 20 <exec executable="date" outputproperty="current.month"><arg value="+%b"/></exec> 21 <exec executable="date" outputproperty="current.year"><arg value="+%Y"/></exec> 18 22 19 23 <!-- for the benefit of the shared scripts, set release-kit home --> release-kits/lirk3/ant-scripts/create-distribution.xml
r16172 r16243 7 7 <addressedcall target="export-greenstone3" /> 8 8 <addressedcall target="dist-set-version-number-property" /> 9 <addressedcall target="dist-set-gli-version" /> 9 10 <addressedcall target="create-distributions-1" /> 10 11 <addressedcall target="create-distributions-2" /> … … 30 31 </if> 31 32 </target> 33 34 <target name="dist-set-gli-version"> 35 <if><bool><istrue value="${execute}"/></bool> 36 <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/> 37 </if> 38 </target> 39 32 40 33 41 <target name="create-distributions-1"> release-kits/lirk3/ant-scripts/wrap.xml
r16187 r16243 13 13 <mkdir dir="${basedir}/wrapped-installer/build"/> 14 14 <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/wrapper.cpp" overwrite="true" /> 15 <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.cpp" overwrite="true" /> 16 <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.h" overwrite="true" /> 15 17 16 18 <!-- copy bundled files --> 17 <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/search4j" />18 19 <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/> 19 20 <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/> … … 40 41 </exec> 41 42 <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 42 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_search4j_start=search4j --readonly-text search4j search4j.o"/>43 </exec>44 <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">45 43 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 46 44 </exec> … … 55 53 <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 56 54 57 <!-- get size of search4j -->58 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="search4j.ls"><arg line="-l search4j"/></exec>59 <exec executable="sed" inputstring="${search4j.ls}" outputproperty="search4j.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>60 61 55 <!-- get size of java --> 62 56 <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> … … 67 61 <delete file="wrapper.h"/> 68 62 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec> 69 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>70 63 71 64 <echo level="info">compile the wrapper program</echo> … … 74 67 </exec> 75 68 69 <echo level="info">compile libsearch4j</echo> 70 <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 71 <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/> 72 </exec> 73 76 74 <echo level="info">link, bundling the files to be bundled</echo> 77 75 <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 78 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux.bin wrapper.o greenstone3.jar.o search4j.o"/>76 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/> 79 77 </exec> 80 78 … … 83 81 <delete file="wrapper.h"/> 84 82 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec> 85 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>86 83 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 87 84 <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> … … 94 91 <echo level="info">relink, bundling the files to be bundled</echo> 95 92 <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 96 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux-with-java.bin wrapper.o greenstone3-with-java.jar.o search4j.o java.o"/>93 <arg line="-static -static-libgcc -o ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/> 97 94 </exec> 98 95
