Changeset 17898 for release-kits/wirk2


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

Legend:

Unmodified
Added
Removed

  • release-kits/wirk2/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="wirk2"/>
    1819    <property name="rk.home" value="${wirk2.home}" />
    1920    <property name="rk.os" value="windows" />

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

    r17583 r17898  
    44    <target name="compile">
    55        <antcall target="checkout-gsdl-gli" />
    6         <antcall target="set-version-numbers" />
     6        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
    77        <antcall target="unzip-packages" />
    88        <antcall target="get-winbin" />
    … …  
    1515    <target name="checkout-gsdl-gli">
    1616        <svn>
    17             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
    18             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
     17            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
     18            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
    1919        </svn>
    2020    </target>
    2121
    22     <target name="set-version-numbers">
    23         <rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
    24         <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
    25         <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    26     </target>
    27 
    2822    <target name="unzip-packages">
    29         <unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>
    30         <unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>
    31         <unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>
    32         <unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>
    33         <unzip src="${basedir}/gsdl/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/gsdl/common-src/indexers/packages/windows/iconv"/>
     23        <unzip src="${basedir}/compiled/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/compiled/common-src/packages/windows/crypt"/>
     24        <unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/>
     25        <unzip src="${basedir}/compiled/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/compiled/common-src/packages/windows/gdbm"/>
     26        <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/>
     27        <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
    3428    </target>
    3529
    3630    <target name="get-winbin">
    3731        <if>
    38             <bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool>
    39             <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn>
     32            <bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool>
     33            <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/compiled/bin/windows" revision="${branch.revision}"/></svn>
    4034        </if>
    4135    </target>
    4236
    4337    <target name="insert-perl">
    44         <mkdir dir="${basedir}/gsdl/bin/windows"/>
    45         <delete dir="${basedir}/gsdl/bin/windows/perl"/>
    46         <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/>
     38        <mkdir dir="${basedir}/compiled/bin/windows"/>
     39        <delete dir="${basedir}/compiled/bin/windows/perl"/>
     40        <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/compiled/bin/windows"/>
    4741    </target>
    4842   
    4943    <target name="compile-c-code">
    50         <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
    51         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat" />
    52         <move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
    53         <move todir="${basedir}/gsdl/bin/windows">
    54             <fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>
     44        <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/>
     45        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/compile.bat" />
     46        <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/>
     47        <move todir="${basedir}/compiled/bin/windows">
     48            <fileset dir="${basedir}/compiled/cgi-bin" includes="library.exe,oaiserver.exe"/>
    5549        </move>
    5650    </target>
    … …  
    5852    <target name="build-demo-collection">
    5953        <!-- the envs on these execs simulate the environment when you run setup.bat -->
    60         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
     54        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
    6155            <arg line="bin\script\import.pl --removeold demo"/>
    62             <env key="GSDLHOME" value="${basedir}/gsdl"/>
    63             <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
     56            <env key="GSDLHOME" value="${basedir}/compiled"/>
     57            <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
    6458            <env key="GSDLOS" value="windows"/>
    65             <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
     59            <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
    6660        </exec>
    67         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
     61        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
    6862            <arg line="bin\script\buildcol.pl --removeold demo"/>
    69             <env key="GSDLHOME" value="${basedir}/gsdl"/>
    70             <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
     63            <env key="GSDLHOME" value="${basedir}/compiled"/>
     64            <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
    7165            <env key="GSDLOS" value="windows"/>
    72             <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
     66            <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
    7367        </exec>
    7468       
    75         <delete dir="${basedir}/gsdl/collect/demo/index"/>
    76         <move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>
     69        <delete dir="${basedir}/compiled/collect/demo/index"/>
     70        <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
    7771    </target>
    7872   

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

    r17882 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" />
    … …  
    3232    </target>
    3333
    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         <echo level="info">Setting version in etc/VERSION</echo>
    38         <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    39     </target>
    40    
    4134    <target name="drop-in-binaries">
    4235        <echo level="info">Dropping compiled binaries into distribution</echo>
    4336        <delete dir="${basedir}/distributions/web/bin/windows" />
    4437        <copy todir="${basedir}/distributions/web/bin/windows">
    45             <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
     38            <fileset dir="${basedir}/compiled/bin/windows" includes="**/*"/>
    4639        </copy>
    47         <copy todir="${basedir}/distributions/web" file="${basedir}/gsdl/bin/windows/server.exe"/>
     40        <copy todir="${basedir}/distributions/web" file="${basedir}/compiled/bin/windows/server.exe"/>
    4841       
    4942        <echo level="info">Dropping LuceneWrapper.jar in place</echo>
    … …  
    5548        <delete dir="${basedir}/distributions/web/collect/demo" />
    5649        <copy todir="${basedir}/distributions/web/collect/demo">
    57             <fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/>
     50            <fileset dir="${basedir}/compiled/collect/demo" includes="**/*"/>
    5851        </copy>
    5952    </target>
Note: See TracChangeset for help on using the changeset viewer.