Ignore:
Timestamp:
2008-06-13T12:38:22+12:00 (16 years ago)
Author:
oranfry
Message:

have lirk2 get the linux general stuff

Location:
release-kits/lirk2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2

    • Property svn:externals
      •  

        old new  
        11lib http://svn.greenstone.org/release-kits/shared/lib
        22search4j http://svn.greenstone.org/release-kits/shared/search4j
         3linux http://svn.greenstone.org/release-kits/shared/linux
        34
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r15957 r15980  
    1515        <addressedcall target="export-gsdl-gli-indexers" />
    1616        <addressedcall target="dist-set-version" />
     17        <addressedcall target="drop-in-binaries" />
     18        <addressedcall target="drop-in-demo-collection" />
    1719        <addressedcall target="compile-gli" />
    1820        <addressedcall target="create-gli-client-zip" />
     
    2325        <if><bool><istrue value="${execute}"/></bool>
    2426
    25             <mkdir dir="distribution"/>
    26             <delete dir="distribution/gsdl"/>
     27            <mkdir dir="distributions"/>
     28            <delete dir="distributions/web"/>
    2729            <svn>
    28                 <export srcurl="${svn.root}/gsdl/${branch.path}"        destPath="distribution/gsdl"/>
     30                <export srcurl="${svn.root}/gsdl/${branch.path}"        destPath="distributions/web"/>
    2931            </svn>
    3032
    3133            <svn>
    32                 <export srcurl="${svn.root}/gli/${branch.path}"         destPath="distribution/gsdl/gli"/>
     34                <export srcurl="${svn.root}/gli/${branch.path}"         destPath="distributions/web/gli"/>
    3335            </svn>
    3436
    3537            <svn>
    36                 <export srcurl="${svn.root}/indexers/${branch.path}"    destPath="distribution/gsdl/indexers"/>
     38                <export srcurl="${svn.root}/indexers/${branch.path}"    destPath="distributions/web/indexers"/>
    3739            </svn>
    3840
     
    4446
    4547            <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
    46             <rsr file="${basedir}/gsdl/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
     48            <rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
    4749
    4850            <echo level="info">Setting version in Install.sh</echo>
    49             <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
     51            <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
    5052
    5153            <echo level="info">Setting version in etc/VERSION</echo>
    52             <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
     54            <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    5355
    5456        </if>
    5557    </target>
     58
     59    <target name="drop-in-binaries">
     60        <if><bool><istrue value="${execute}"/></bool>
     61            <echo level="info">Dropping compiled binaries into distribution</echo>
     62            <delete dir="distributions/web/bin/linux" />
     63            <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec>
     64            <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
     65            <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiservr distributions/web/cgi-bin"/></exec>
     66        </if>
     67    </target>
     68
     69    <target name="drop-in-demo-collection">
     70        <if><bool><istrue value="${execute}"/></bool>
     71            <echo level="info">Dropping compiled binaries into distribution</echo>
     72            <delete dir="distributions/web/collect/demo" />
     73            <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
     74        </if>
     75    </target>
     76
    5677
    5778    <target name="compile-gli">
     
    5980
    6081            <echo>Compiling gli...</echo>
    61             <exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makegli.sh"/>
     82            <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/>
    6283
    6384            <echo>Creating jar...</echo>
    64             <exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makejar.sh"/>
     85            <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/>
    6586
    6687            <echo>Cleaning up intermediate files...</echo>
    67             <delete dir="${basedir}/distribution/gsdl/gli/jar"/>
    68             <delete dir="${basedir}/distribution/gsdl/gli/classes/org"/>
     88            <delete dir="${basedir}/distributions/web/gli/jar"/>
     89            <delete dir="${basedir}/distributions/web/gli/classes/org"/>
    6990
    7091            <echo>Putting gli server jar in a better place</echo>
    71             <exec dir="${basedir}/distribution/gsdl" executable="mv" failonerror="true">
     92            <exec dir="${basedir}/distributions/web" executable="mv" failonerror="true">
    7293                <arg line="gli/GLIServer.jar bin/java" />
    7394            </exec>
     
    104125
    105126            <echo level="info">Changing Install.sh to web release</echo>
    106             <rsr file="${basedir}/distribution/gsdl/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
     127            <rsr file="${basedir}/distributions/web/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
     128
     129            <echo level="info">Putting the COPYING file into distribution</echo>
     130            <copy file="${lirk2.home}/resources/COPYING" tofile="${basedir}/distributions/web/COPYING" />
     131
     132            <echo level="info">Removing signed gatherer</echo>
     133            <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
     134
     135            <echo level="info">Removing some unneeded stuff</echo>
     136            <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
     137            <delete file="${basedir}/distributions/web/gli/gli4gs3.sh" />
     138            <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
     139            <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
    107140
    108141        </if>
    109142    </target>
    110143
    111    
    112 
    113 
    114 
    115144</project>
Note: See TracChangeset for help on using the changeset viewer.