Changeset 18065


Ignore:
Timestamp:
12/04/08 13:20:22 (12 years ago)
Author:
oranfry
Message:

drop in docs before doing the version number replacements and dont complain if they are not there

Location:
release-kits
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r18054 r18065  
    55
    66        <antcall target="export-gsdl-gli"><param name="dest" value="distributions/web"/></antcall>
     7        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    78        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
    89        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
    9         <antcall target="drop-in-docs" />
    1010        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    1111        <antcall target="drop-in-demo-collection" />
     
    1515        <antcall target="compile-gli" />
    1616        <antcall target="remove-unneeded-files" />
    17         <antcall target="create-needed-empty-files"><parem name="gsdl.basedir" value="distributions/web"/></antcall>
     17        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    1818
    1919        <antcall target="create-binary-zip-linux"/>
    2020
    21     </target>
    22 
    23     <target name="drop-in-docs">
    24         <echo level="info">Dropping gsdl docs  into distribution</echo>
    25         <copy todir="${basedir}/distributions/web" overwrite="true">
    26             <fileset dir="${lirk2.home}/greenstone2/docs"/>
    27         </copy>
    2821    </target>
    2922
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r18054 r18065  
    55
    66        <antcall target="export-gsdl-gli"><param name="dest" value="distributions/web"/></antcall>
     7        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    78        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
    89        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
    9         <antcall target="drop-in-docs" />
    1010        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    1111        <antcall target="drop-in-binaries" />
     
    1616        <antcall target="compile-gli" />
    1717        <antcall target="remove-unneeded-files" />
    18         <antcall target="create-needed-empty-files"><parem name="gsdl.basedir" value="distributions/web"/></antcall>
     18        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    1919
    2020        <antcall target="create-binary-zip-linux"/>
     
    5252    </target>
    5353
    54     <target name="drop-in-docs">
    55         <echo level="info">Dropping gsdl docs  into distribution</echo>
    56         <copy todir="${basedir}/distributions/web" overwrite="true">
    57             <fileset dir="${mark2.home}/greenstone2/docs"/>
    58         </copy>
    59     </target>
    60 
    6154    <target name="compile-gli">
    6255        <echo>Compiling gli...</echo>
  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r18052 r18065  
    2020    </target>
    2121
     22    <target name="drop-in-docs">
     23        <echo level="info">Dropping gsdl docs into distribution</echo>
     24        <copy todir="${gsdl.basedir}" overwrite="true">
     25            <fileset dir="${rk.home}/greenstone2/docs"/>
     26        </copy>
     27    </target>
     28
    2229    <target name="gsdl-set-version-numbers">
    2330
     
    3340        <echo level="info">Changing date and version in the docs</echo>
    3441        <!-- en -->
    35         <rsr file="${basedir}/distributions/web/READMEen.txt">
    36             <job pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" />
    37             <job pattern="^(Version\s*)(.*)" replacement="$1${version}" />
    38         </rsr>
     42        <if>
     43            <bool><available file="${bsdl.basedir}/distributions/web/READMEen.txt"/></bool>
    3944
    40         <!--
    41         commented out until these files are updated
    42         <!- - ar - ->
    43         <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(التاريخ : \s*)(.*)" replacement="$1${month.ar} ${current.year}" />
    44         <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(النسخه : \s*)(.*)" replacement="$1${version}" />
    45         <!- - es - ->
    46         <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}" />
    47         <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}" />
    48         <!- - fr - ->
    49         <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}" />
    50         <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" />
    51         <!- - ru - ->
    52         <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(Дата\s*)(.*)" replacement="$1${month.ru} ${current.year}" />
    53         <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(ВерсОя\s*)(.*)" replacement="$1${version}" />
    54         -->
     45            <rsr file="${bsdl.basedir}/distributions/web/READMEen.txt">
     46                <job pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" />
     47                <job pattern="^(Version\s*)(.*)" replacement="$1${version}" />
     48            </rsr>
     49
     50            <!--
     51            commented out until these files are updated
     52            <!- - ar - ->
     53            <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(التاريخ : \s*)(.*)" replacement="$1${month.ar} ${current.year}" />
     54            <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(النسخه : \s*)(.*)" replacement="$1${version}" />
     55            <!- - es - ->
     56            <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}" />
     57            <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}" />
     58            <!- - fr - ->
     59            <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}" />
     60            <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" />
     61            <!- - ru - ->
     62            <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(Дата\s*)(.*)" replacement="$1${month.ru} ${current.year}" />
     63            <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(ВерсОя\s*)(.*)" replacement="$1${version}" />
     64            -->
     65        </if>
    5566    </target>
    5667
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r18054 r18065  
    77        <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>
    9         <antcall target="drop-in-docs" />
     9        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    1010        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk2-targets -->
    1111        <antcall target="dist-unzip-packages"/>
     
    1515        <antcall target="compile-gli" />
    1616        <antcall target="remove-unneeded-files" />
    17         <antcall target="create-needed-empty-files"><parem name="gsdl.basedir" value="distributions/web"/></antcall>
     17        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall>
    1818
    1919        <antcall target="create-binary-zip-windows"/>
     
    3838        <copy todir="${basedir}/distributions/web/collect/demo">
    3939            <fileset dir="${basedir}/compiled/collect/demo" includes="**/*"/>
    40         </copy>
    41     </target>
    42 
    43     <target name="drop-in-docs">
    44         <echo level="info">Dropping gsdl docs  into distribution</echo>
    45         <copy todir="${basedir}/distributions/web" overwrite="true">
    46             <fileset dir="${wirk2.home}/greenstone2/docs" includes="*.txt"/>
    4740        </copy>
    4841    </target>
Note: See TracChangeset for help on using the changeset viewer.