Changeset 17898 for release-kits/mark2


Ignore:
Timestamp:
2008-11-20T16:33:21+13:00 (15 years ago)
Author:
oranfry
Message:

Standardised names of directories used in release kits

  • gsdl and greenstone3 -> compiled
  • distribution and distributions -> distributions
  • greenstone3 and web -> web

And, expect more specifically named properties files, e.g., lirk3-build.properties, wirk2-build.properties

Location:
release-kits/mark2/ant-scripts
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • release-kits/mark2/ant-scripts/build.xml

    r17597 r17898  
    1616
    1717    <!-- for the benefit of the shared scripts, set release-kit home -->
     18    <property name="rk.name" value="mark2"/>
    1819    <property name="rk.home" value="${mark2.home}" />
    1920    <property name="rk.os" value="linux" />
     21    <!-- os.suffix set dynamically below -->
    2022
    2123    <!-- IMPORT OTHER ANT SCRIPTS -->

  • release-kits/mark2/ant-scripts/compile.xml

    r17523 r17898  
    66        <!-- checkout -->
    77        <antcall target="checkout-gsdl-gli" />
     8        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
    89       
    910        <!-- configure -->
    … …  
    2728    <target name="checkout-gsdl-gli">
    2829        <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"/>
    3132        </svn>
    3233    </target>
    3334
    3435    <target name="run-configure">
    35         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
     36        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure">
    3637            <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
    3738        </exec>
    … …  
    3940
    4041    <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" />
    4748    </target>
    4849
    4950    <target name="run-make">
    50         <exec dir="${basedir}/gsdl" executable="make"/>
     51        <exec dir="${basedir}/compiled" executable="make"/>
    5152    </target>
    5253
    5354    <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>
    5556    </target>
    5657
    5758    <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>
    6061    </target>
    6162
    6263    <target name="strip-execs">
    63         <exec dir="${basedir}/gsdl/bin/darwin" executable="find">
     64        <exec dir="${basedir}/compiled/bin/darwin" executable="find">
    6465            <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
    6566        </exec>
    … …  
    6768
    6869    <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"/>
    7071    </target>
    7172

  • release-kits/mark2/ant-scripts/create-distribution.xml

    r17835 r17898  
    55
    66        <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>
    88        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
    99        <antcall target="drop-in-docs" />
    … …  
    4747    </target>
    4848
    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) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
    52 
    53         <echo level="info">Setting version in Install.sh</echo>
    54         <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" 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 
    6449    <target name="drop-in-binaries">
    6550        <echo level="info">Dropping compiled binaries into distribution</echo>
    6651        <delete dir="distributions/web/bin/linux" />
    6752        <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>
    7156    </target>
    7257
    … …  
    7459        <echo level="info">Dropping rebuilt demo collection into distribution</echo>
    7560        <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>
    7762    </target>
    7863
Note: See TracChangeset for help on using the changeset viewer.