Changeset 17898 for release-kits/mark2
- Timestamp:
- 2008-11-20 16:33:21 (2 months ago)
- Files:
-
- release-kits/mark2/ant-scripts/build.xml (modified) (1 diff)
- release-kits/mark2/ant-scripts/compile.xml (modified) (4 diffs)
- release-kits/mark2/ant-scripts/create-distribution.xml (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/mark2/ant-scripts/build.xml
r17597 r17898 16 16 17 17 <!-- for the benefit of the shared scripts, set release-kit home --> 18 <property name="rk.name" value="mark2"/> 18 19 <property name="rk.home" value="${mark2.home}" /> 19 20 <property name="rk.os" value="linux" /> 21 <!-- os.suffix set dynamically below --> 20 22 21 23 <!-- IMPORT OTHER ANT SCRIPTS --> release-kits/mark2/ant-scripts/compile.xml
r17523 r17898 6 6 <!-- checkout --> 7 7 <antcall target="checkout-gsdl-gli" /> 8 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 8 9 9 10 <!-- configure --> … … 27 28 <target name="checkout-gsdl-gli"> 28 29 <svn javahl="false"> 29 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/ gsdl"/>30 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/ gsdl/gli"/>30 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 31 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 31 32 </svn> 32 33 </target> 33 34 34 35 <target name="run-configure"> 35 <exec dir="${basedir}/ gsdl" executable="${basedir}/gsdl/configure">36 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure"> 36 37 <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/> 37 38 </exec> … … 39 40 40 41 <target name="tweak-makefiles"> 41 <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" />42 <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" />43 <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" />44 <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" />45 <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" />46 <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" />42 <rsr file="${basedir}/compiled/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" /> 43 <rsr file="${basedir}/compiled/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" /> 44 <rsr file="${basedir}/compiled/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" /> 45 <rsr file="${basedir}/compiled/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" /> 46 <rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 47 <rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 47 48 </target> 48 49 49 50 <target name="run-make"> 50 <exec dir="${basedir}/ gsdl" executable="make"/>51 <exec dir="${basedir}/compiled" executable="make"/> 51 52 </target> 52 53 53 54 <target name="run-make-install"> 54 <exec dir="${basedir}/ gsdl" executable="make"><arg value="install"/></exec>55 <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec> 55 56 </target> 56 57 57 58 <target name="copy-library-oai"> 58 <exec executable="mv"><arg line="${basedir}/ gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>59 <exec executable="mv"><arg line="${basedir}/ gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>59 <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec> 60 <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/darwin/oaiserver"/></exec> 60 61 </target> 61 62 62 63 <target name="strip-execs"> 63 <exec dir="${basedir}/ gsdl/bin/darwin" executable="find">64 <exec dir="${basedir}/compiled/bin/darwin" executable="find"> 64 65 <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} ;"/> 65 66 </exec> … … 67 68 68 69 <target name="build-demo-collection"> 69 <exec dir="${basedir}/ gsdl" executable="${mark2.home}/resources/build-demo.sh"/>70 <exec dir="${basedir}/compiled" executable="${mark2.home}/resources/build-demo.sh"/> 70 71 </target> 71 72 release-kits/mark2/ant-scripts/create-distribution.xml
r17835 r17898 5 5 6 6 <antcall target="export-gsdl-gli" /> 7 <antcall target=" dist-set-version" />7 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 8 8 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 9 9 <antcall target="drop-in-docs" /> … … 47 47 </target> 48 48 49 <target name="dist-set-version">50 <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo>51 <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" />52 53 <echo level="info">Setting version in Install.sh</echo>54 <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo "Version: ).*(" .*)" replacement="$1${version}$2" />55 56 <echo level="info">Setting version in etc/VERSION</echo>57 <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />58 </target>59 60 <target name="dist-set-gli-version">61 62 </target>63 64 49 <target name="drop-in-binaries"> 65 50 <echo level="info">Dropping compiled binaries into distribution</echo> 66 51 <delete dir="distributions/web/bin/linux" /> 67 52 <delete dir="distributions/web/bin/darwin" /> 68 <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>69 <exec dir="${basedir}" executable="cp"><arg line=" gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>70 <exec dir="${basedir}" executable="cp"><arg line=" gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>53 <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec> 54 <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec> 55 <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 71 56 </target> 72 57 … … 74 59 <echo level="info">Dropping rebuilt demo collection into distribution</echo> 75 60 <delete dir="distributions/web/collect/demo" /> 76 <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>61 <exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec> 77 62 </target> 78 63
