Changeset 16808
- Timestamp:
- 2008-08-15 13:27:45 (5 months ago)
- Files:
-
- release-kits/mark2/ant-scripts/build.xml (modified) (1 diff)
- release-kits/mark2/ant-scripts/compile.xml (modified) (1 diff)
- release-kits/mark2/ant-scripts/create-distribution.xml (modified) (2 diffs)
- release-kits/mark2/ant-scripts/wrap.xml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/mark2/ant-scripts/build.xml
r16741 r16808 12 12 13 13 <!-- CONSTANTS --> 14 15 <!-- the extra space for the dmg image (KB) --> 16 <property name="dmg.overhead" value="2048"/> 14 17 15 18 <!-- for the benefit of the shared scripts, set release-kit home --> release-kits/mark2/ant-scripts/compile.xml
r16741 r16808 36 36 37 37 <target name="tweak-makefiles"> 38 <rsr file="${basedir}/gsdl/ src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />39 <rsr file="${basedir}/gsdl/ src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />40 <rsr file="${basedir}/gsdl/ src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />41 <rsr file="${basedir}/gsdl/ src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />42 <rsr file="${basedir}/gsdl/ src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />43 <rsr file="${basedir}/gsdl/ src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />38 <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 39 <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 40 <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 41 <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 42 <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 43 <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 44 44 </target> 45 45 release-kits/mark2/ant-scripts/create-distribution.xml
r16741 r16808 6 6 <antcall target="dist-set-version" /> 7 7 <antcall target="gli-set-version-numbers"> 8 <param name="glibasedir" value="${basedir}/distribution /greenstone3/gli"/>8 <param name="glibasedir" value="${basedir}/distributions/web/gli"/> 9 9 </antcall> 10 10 <antcall target="drop-in-binaries" /> … … 25 25 26 26 <target name="dist-set-version"> 27 <echo level="info">Setting version in src/lib/gsdlconf.h</echo>28 <rsr file="${basedir}/distributions/web/ src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" />27 <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo> 28 <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" /> 29 29 30 30 <echo level="info">Setting version in Install.sh</echo> release-kits/mark2/ant-scripts/wrap.xml
r16741 r16808 7 7 <mkdir dir="${basedir}/wrapped-installer"/> 8 8 <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy> 9 <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" ><fileset dir="${mark2.home}/greenstone2/icon/icon.icns"/></copy>9 <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/> 10 10 <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/> 11 11 … … 22 22 <exec executable="sed" inputstring="${app.du}" outputproperty="app.size"><arg line="-e 's/^\([0-9]*\).*$/\1/g'"/></exec> 23 23 <echo>app.size: ${app.size}</echo> 24 <math result="dmg.size" operand1="${app.size}" operation="+" operand2=" 2048" datatype="int"/>24 <math result="dmg.size" operand1="${app.size}" operation="+" operand2="${dmg.overhead}" datatype="int"/> 25 25 <echo>dmg.size: ${dmg.size}</echo> 26 26 27 27 <!-- create disk image --> 28 <exec dir="${basedir}/wrapped-installer" executable="hdiutil"><arg line="create -size ${dmg.size}k -fs HFS+ -volname Greenstone${version} Greenstone${version}.dmg"/></exec> 28 <property name="dmg.name" value="Greenstone-${version}-MacOS-${processor}"/> 29 <exec dir="${basedir}/wrapped-installer" executable="hdiutil"><arg line="create -size ${dmg.size}k -fs HFS+ -volname ${dmg.name} ${dmg.name}.dmg"/></exec> 29 30 <!-- mount it --> 30 <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="attach Greenstone${version}.dmg"/></exec>31 <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="attach ${dmg.name}.dmg"/></exec> 31 32 <!-- copy file into it --> 32 <exec executable="cp" dir="${basedir}/wrapped-installer"><arg line="-r Greenstone${version}.app /Volumes/ Greenstone${version}"/></exec>33 <exec executable="cp" dir="${basedir}/wrapped-installer"><arg line="-r Greenstone${version}.app /Volumes/${dmg.name}"/></exec> 33 34 <!-- unmount it--> 34 <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="detach /Volumes/ Greenstone${version}"/></exec>35 <exec executable="hdiutil" dir="${basedir}/wrapped-installer"><arg line="detach /Volumes/${dmg.name}"/></exec> 35 36 </target> 36 37
