Ignore:
Timestamp:
2008-08-13T11:45:21+12:00 (16 years ago)
Author:
oranfry
Message:

changes to wirk2 after ant cleaned up

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r16633 r16745  
    33
    44    <target name="create-distribution">
    5         <!-- create distribution -->
    6         <addressedcall target="export-gsdl-gli" />
    7         <addressedcall target="dist-set-version" />
    8         <addressedcall target="drop-in-binaries" />
    9         <addressedcall target="drop-in-demo-collection" />
    10         <addressedcall target="compile-gli" />
    11         <!--<addressedcall target="create-gli-client-zip" />-->
    12         <addressedcall target="tweak-files" />
     5        <antcall target="export-gsdl-gli" />
     6        <antcall target="dist-set-version" />
     7        <antcall target="drop-in-binaries" />
     8        <antcall target="drop-in-demo-collection" />
     9        <antcall target="drop-in-docs" />
     10        <antcall target="copy-server-to-root"/>
     11        <antcall target="compile-gli" />
     12        <antcall target="tweak-files" />
    1313    </target>
    1414
    1515    <target name="export-gsdl-gli">
    16         <if><bool><istrue value="${execute}"/></bool>
    17            
    18             <mkdir dir="distributions"/>
    19             <delete dir="distributions/web"/>
    20             <svn>
    21                 <export srcurl="${svn.root}/gsdl/${branch.path}"        destPath="distributions/web"/>
    22                 <export srcurl="${svn.root}/gli/${branch.path}"         destPath="distributions/web/gli"/>
    23             </svn>
    24            
    25         </if>
     16        <mkdir dir="distributions"/>
     17        <delete dir="distributions/web"/>
     18        <svn>
     19            <export srcurl="${svn.root}/gsdl/${branch.path}"        destPath="distributions/web"/>
     20            <export srcurl="${svn.root}/gli/${branch.path}"         destPath="distributions/web/gli"/>
     21        </svn>
    2622    </target>
    2723
    2824    <target name="dist-set-version">
    29         <if><bool><istrue value="${execute}"/></bool>
    30            
    31             <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
    32             <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
    33            
    34             <echo level="info">Setting version in etc/VERSION</echo>
    35             <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    36            
    37         </if>
     25        <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
     26        <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
     27        <echo level="info">Setting version in etc/VERSION</echo>
     28        <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    3829    </target>
    3930   
    4031    <target name="drop-in-binaries">
    41         <if><bool><istrue value="${execute}"/></bool>
    42             <echo level="info">Dropping compiled binaries into distribution</echo>
    43             <delete dir="${basedir}/distributions/web/bin/windows" />
    44             <copy todir="${basedir}/distributions/web/bin/windows">
    45                 <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
    46             </copy>
    47         </if>
     32        <echo level="info">Dropping compiled binaries into distribution</echo>
     33        <delete dir="${basedir}/distributions/web/bin/windows" />
     34        <copy todir="${basedir}/distributions/web/bin/windows">
     35            <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
     36        </copy>
    4837    </target>
    4938
    5039    <target name="drop-in-demo-collection">
    51         <if><bool><istrue value="${execute}"/></bool>
    52             <echo level="info">Dropping rebuilt demo collection into distribution</echo>
    53             <delete dir="${basedir}/distributions/web/collect/demo" />
    54             <copy todir="${basedir}/distributions/web/collect/demo">
    55                 <fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/>
    56             </copy>
    57         </if>
     40        <echo level="info">Dropping rebuilt demo collection into distribution</echo>
     41        <delete dir="${basedir}/distributions/web/collect/demo" />
     42        <copy todir="${basedir}/distributions/web/collect/demo">
     43            <fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/>
     44        </copy>
     45    </target>
     46
     47    <target name="drop-in-docs">
     48        <echo level="info">Dropping gsdl docs  into distribution</echo>
     49        <copy todir="${basedir}/distributions/web" overwrite="true">
     50            <fileset dir="${wirk2.home}/greenstone2/docs"/>
     51        </copy>
     52    </target>
     53
     54    <target name="copy-server-to-root">
     55        <copy todir="${basedir}/distributions/web" overwrite="true">
     56            <fileset dir="${basedir}/bin/windows/server.exe"/>
     57        </copy>
     58
    5859    </target>
    5960   
    6061    <target name="compile-gli">
    61         <if><bool><istrue value="${execute}"/></bool>
    62            
    63             <echo>Compiling gli...</echo>
    64             <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.bat"/>
    65            
    66             <echo>Creating jar...</echo>
    67             <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.bat"/>
    68            
    69             <echo>Cleaning up intermediate files...</echo>
    70             <delete dir="${basedir}/distributions/web/gli/jar"/>
    71             <delete dir="${basedir}/distributions/web/gli/classes/org"/>
    72            
    73             <echo>Putting gli server jar in a better place</echo>
    74             <move file="${basedir}/distributions/web/gli/GLIServer.jar" todir="${basedir}/distributions/web/bin/java" />
    75            
    76         </if>
     62        <echo>Compiling gli...</echo>
     63        <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.bat"/>
     64       
     65        <echo>Creating jar...</echo>
     66        <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.bat"/>
     67       
     68        <echo>Cleaning up intermediate files...</echo>
     69        <delete dir="${basedir}/distributions/web/gli/jar"/>
     70        <delete dir="${basedir}/distributions/web/gli/classes/org"/>
     71       
     72        <echo>Putting gli server jar in a better place</echo>
     73        <move file="${basedir}/distributions/web/gli/GLIServer.jar" todir="${basedir}/distributions/web/bin/java" />
    7774    </target>
    7875
    7976    <target name="tweak-files">
    80         <if><bool><istrue value="${execute}"/></bool>
     77        <echo level="info">Changing date and version in the docs</echo>
     78        <!-- ar -->
     79        <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(التاريخ : \s*)(.*)" replacement="$1${month.ar} ${current.year}" />
     80        <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(النسخه : \s*)(.*)" replacement="$1${version}" />
     81        <!-- es -->
     82        <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}" />
     83        <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}" />
     84        <!-- fr -->
     85        <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}" />
     86        <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" />
     87        <!-- ru -->
     88        <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(Дата\s*)(.*)" replacement="$1${month.ru} ${current.year}" />
     89        <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(ВерсОя\s*)(.*)" replacement="$1${version}" />
     90        <!-- en -->
     91        <rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" />
     92        <rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" />
    8193
    82             <echo level="info">Putting the docs into distribution</echo>
    83             <copy todir="${basedir}/distributions/web" overwrite="true">
    84                 <fileset dir="${wirk2.home}/greenstone2/docs"/>
    85             </copy>
     94        <!-- Support.htm -->
     95        <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*Greenstone Digital Library version: ).*(&lt;br&gt;.*)" replacement="$1${version}$2"/>
     96        <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/>
    8697
    87             <echo level="info">Removing signed gatherer</echo>
    88             <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
    8998
    90             <echo level="info">Removing some unneeded stuff</echo>
    91             <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    92             <delete file="${basedir}/distributions/web/gli/gli4gs3.sh" />
    93             <delete dir="${basedir}/distributions/web/bin/linux" />
    94             <delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp,win32.mak,WIN32cfg.h,Install.txt"/></delete>
    95             <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.sh,*4gs3.bat"/></delete>
    96            
    97         </if>
     99        <echo level="info">Removing signed gatherer</echo>
     100        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
     101
     102        <echo level="info">Removing some unneeded stuff</echo>
     103        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
     104        <delete dir="${basedir}/distributions/web/bin/linux" />
     105        <delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp,win32.mak,WIN32cfg.h,Install.txt"/></delete>
     106        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.sh,*4gs3.bat"/></delete>
    98107    </target>
    99108
Note: See TracChangeset for help on using the changeset viewer.