Changeset 17898 for release-kits/lirk2


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/lirk2/ant-scripts
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r17597 r17898  
    1313
    1414    <!-- for the benefit of the shared scripts, set release-kit home -->
     15    <property name="rk.name" value="lirk2"/>
    1516    <property name="rk.home" value="${lirk2.home}" />
    1617    <property name="rk.os" value="linux" />

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

    r17519 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 -->
    … …  
    2930    <target name="checkout-gsdl-gli">
    3031        <svn>
    31             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
    32             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
     32            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
     33            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
    3334        </svn>
    3435    </target>
    … …  
    3637    <target name="add-static-to-configure-in">
    3738        <rsr
    38             file="${basedir}/gsdl/configure.in"
     39            file="${basedir}/compiled/configure.in"
    3940            pattern="^LDFLAGS=.*$"
    4041            replacement="LDFLAGS=-static" />
    41         <exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec>
     42        <exec dir="${basedir}/compiled" executable="autoconf" output="${basedir}/compiled/configure"><arg value="configure.in"/></exec>
    4243    </target>
    4344
    4445    <target name="set-environment-in-packages-configure">
    4546        <rsr
    46             file="${basedir}/gsdl/common-src/packages/configure"
     47            file="${basedir}/compiled/common-src/packages/configure"
    4748            pattern="^ENVIRONMENT=.*$"
    4849            replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    4950        <rsr
    50             file="${basedir}/gsdl/build-src/packages/configure"
     51            file="${basedir}/compiled/build-src/packages/configure"
    5152            pattern="^ENVIRONMENT=.*$"
    5253            replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    … …  
    5455
    5556    <target name="run-configure">
    56         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
     57        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure">
    5758            <env key="LDFLAGS" value="-static"/>
    5859        </exec>
    … …  
    6162    <target name="makefiles-add-static">
    6263        <rsr
    63             file="${basedir}/gsdl/build-src/packages/wv/wv-gs/Makefile"
     64            file="${basedir}/compiled/build-src/packages/wv/wv-gs/Makefile"
    6465            pattern="^LDFLAGS =.*$"
    6566            replacement="LDFLAGS = -static" />
    6667        <rsr
    67             file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile"
     68            file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile"
    6869            pattern="^LDFLAGS =.*$"
    6970            replacement="LDFLAGS = -static" />
    7071        <rsr
    71             file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile"
     72            file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile"
    7273            pattern="^LDFLAGS =.*$"
    7374            replacement="LDFLAGS = -static" />
    7475        <rsr
    75             file="${basedir}/gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile"
     76            file="${basedir}/compiled/build-src/packages/rtftohtml/rtftohtml_src/Makefile"
    7677            pattern="(-o rtftohtml.{2}EXEEXT.{1})"
    7778            replacement="$1 -static" />
    … …  
    7980
    8081    <target name="run-make">
    81         <exec dir="${basedir}/gsdl" executable="make"/>
     82        <exec dir="${basedir}/compiled" executable="make"/>
    8283    </target>
    8384
    8485
    8586    <target name="run-make-install">
    86         <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
     87        <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec>
    8788    </target>
    8889
    8990    <target name="copy-library-oai">
    90         <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec>
    91         <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec>
     91        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/linux/library"/></exec>
     92        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/linux/oaiserver"/></exec>
    9293    </target>
    9394
    9495    <target name="strip-execs">
    95         <exec dir="${basedir}/gsdl/bin/linux" executable="find">
     96        <exec dir="${basedir}/compiled/bin/linux" executable="find">
    9697            <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
    9798        </exec>
    … …  
    99100
    100101    <target name="build-demo-collection">
    101         <exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/>
     102        <exec dir="${basedir}/compiled" executable="${lirk2.home}/resources/build-demo.sh"/>
    102103    </target>
    103104

  • release-kits/lirk2/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" />
    … …  
    3030            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
    3131        </svn>
    32     </target>
    33    
    34     <target name="dist-set-version">
    35         <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
    36         <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
    37 
    38         <echo level="info">Setting version in Install.sh</echo>
    39         <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
    40 
    41         <echo level="info">Setting version in etc/VERSION</echo>
    42         <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    4332    </target>
    4433
    … …  
    8877        <echo level="info">Dropping compiled binaries into distribution</echo>
    8978        <delete dir="distributions/web/bin/linux" />
    90         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec>
    91         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
    92         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
     79        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/linux distributions/web/bin"/></exec>
     80        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec>
     81        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
    9382    </target>
    9483
    … …  
    9685        <echo level="info">Dropping rebuilt demo collection into distribution</echo>
    9786        <delete dir="distributions/web/collect/demo" />
    98         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
     87        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec>
    9988    </target>
    10089
Note: See TracChangeset for help on using the changeset viewer.