Changeset 18847

Show
Ignore:
Timestamp:
31.03.2009 15:13:22 (10 years ago)
Author:
oranfry
Message:

deleting traces of links to /home/nzdl, having installer create gsdlsite.cfg, changes to cdrk2

Location:
release-kits
Files:
7 modified

Legend:

Unmodified
Added
Removed
  • release-kits/cdrk2/ant-scripts/build.xml

    r18768 r18847  
    156156 
    157157    <target name="create-image"> 
     158 
    158159        <mkdir dir="products"/> 
    159         <!-- mkisofs -o products/Greenstone-CDROM.iso -J -R -D cdrom --> 
     160 
    160161        <exec executable="mkisofs"> 
    161162            <arg value="-input-charset"/> 
    162163            <arg value="utf-8"/> 
    163164            <arg value="-o"/> 
    164             <arg value="products/Greenstone-CDROM-${version}.iso"/> 
     165            <arg value="products/Greenstone-${version}-cdrom.iso"/> 
    165166            <arg value="-J"/> 
    166167            <arg value="-R"/> 
     
    168169            <arg value="cdrom"/> 
    169170        </exec> 
     171 
     172        <!-- 
     173        <exec executable="/bin/bash" dir="products"> 
     174            <arg value="-c"/> 
     175            <arg value="cat Greenstone-${version}-cdrom.iso | gzip > Greenstone-${version}-cdrom.iso.gz"/> 
     176        </exec> 
     177        --> 
     178 
     179        <exec executable="/bin/bash" dir="products"> 
     180            <arg value="-c"/> 
     181            <arg value="zip Greenstone-${version}-cdrom.zip Greenstone-${version}-cdrom.iso"/> 
     182        </exec> 
     183 
    170184    </target> 
    171185 
  • release-kits/lirk2/installer/build.xml

    r18840 r18847  
    5858 
    5959        <echo>Filling in concrete values in config files</echo> 
     60        <copy file="${installDir}/cgi-bin/gsdlsite.cfg.in" tofile="${installDir}/cgi-bin/gsdlsite.cfg"/> 
    6061        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg"> 
    6162            <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
    62             <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/> 
    63             <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
    6463        </rsr> 
    6564        <echo/> 
  • release-kits/lirk3/ant-scripts/operations-on-gs3home.xml

    r17645 r18847  
    55    <import file="${basedir}/build.xml"/> 
    66 
    7     <property name="documented.collections.home" value="/home/nzdl/for-distributions/collect"/> 
    87    <property name="greenstone3-change-date" value="Tue Feb 20 12:13:42 NZDT 2007"/> 
    98    <property name="gs2build-change-date" value="Wed Dec 13 10:35:57 NZDT 2006"/> 
     
    260259    <delete file="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"/> 
    261260  </target> 
    262  
    263 <!--  <target name="create-changelog"> --> 
    264     <!-- generate greenstone 3 changelog --> 
    265 <!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl" 
    266       dir="${basedir}"> 
    267       <arg value="-P"/> 
    268       <arg value="-F"/> 
    269       <arg value="trunk"/> 
    270       <arg value="-r"/> 
    271       <arg value="-S"/> 
    272       <arg value="-l"/> 
    273       <arg value="-d'${greenstone3-change-date}&lt;tomorrow'"/> 
    274       <arg value="-f"/> 
    275       <arg value="greenstone-${app.version}-ChangeLog.txt"/> 
    276       <arg value="-I"/> 
    277       <arg value="gli/.*|gs2build/.*"/> 
    278     </exec> --> 
    279     <!-- generate coll building change log --> 
    280 <!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl" 
    281       dir="${basedir}"> 
    282       <arg value="-P"/> 
    283       <arg value="-F"/> 
    284       <arg value="trunk"/> 
    285       <arg value="-r"/> 
    286       <arg value="-S"/> 
    287       <arg value="-l"/> 
    288       <arg value="-d'${gs2build-change-date}&lt;tomorrow'"/> 
    289       <arg value="-f"/> 
    290       <arg value="greenstone-${app.version}-ChangeLog-collbuilding.txt"/> 
    291       <arg value="gli"/> 
    292       <arg value="gs2build"/> 
    293     </exec>  
    294   </target> --> 
    295  
    296261 
    297262  <!-- new targets to go in distribution build.xml files --> 
  • release-kits/mark2/installer/build.xml

    r18666 r18847  
    5050 
    5151        <echo message="Filling in concrete values in config files"/> 
     52        <copy file="${installDir}/cgi-bin/gsdlsite.cfg.in" tofile="${installDir}/cgi-bin/gsdlsite.cfg"/> 
    5253        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
    53         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/> 
    54         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
    5554        <echo/> 
    5655 
  • release-kits/mark3/ant-scripts/operations-on-gs3home.xml

    r18501 r18847  
    1414    <import file="${basedir}/build.xml"/> 
    1515 
    16     <property name="documented.collections.home" value="/home/nzdl/for-distributions/collect"/> 
    1716    <property name="greenstone3-change-date" value="Tue Feb 20 12:13:42 NZDT 2007"/> 
    1817    <property name="gs2build-change-date" value="Wed Dec 13 10:35:57 NZDT 2006"/> 
     
    264263    <delete file="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"/> 
    265264  </target> 
    266  
    267 <!--  <target name="create-changelog"> --> 
    268     <!-- generate greenstone 3 changelog --> 
    269 <!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl" 
    270       dir="${basedir}"> 
    271       <arg value="-P"/> 
    272       <arg value="-F"/> 
    273       <arg value="trunk"/> 
    274       <arg value="-r"/> 
    275       <arg value="-S"/> 
    276       <arg value="-l"/> 
    277       <arg value="-d'${greenstone3-change-date}&lt;tomorrow'"/> 
    278       <arg value="-f"/> 
    279       <arg value="greenstone-${app.version}-ChangeLog.txt"/> 
    280       <arg value="-I"/> 
    281       <arg value="gli/.*|gs2build/.*"/> 
    282     </exec> --> 
    283     <!-- generate coll building change log --> 
    284 <!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl" 
    285       dir="${basedir}"> 
    286       <arg value="-P"/> 
    287       <arg value="-F"/> 
    288       <arg value="trunk"/> 
    289       <arg value="-r"/> 
    290       <arg value="-S"/> 
    291       <arg value="-l"/> 
    292       <arg value="-d'${gs2build-change-date}&lt;tomorrow'"/> 
    293       <arg value="-f"/> 
    294       <arg value="greenstone-${app.version}-ChangeLog-collbuilding.txt"/> 
    295       <arg value="gli"/> 
    296       <arg value="gs2build"/> 
    297     </exec>  
    298   </target> --> 
    299  
    300265 
    301266  <!-- new targets to go in distribution build.xml files --> 
  • release-kits/wirk2/ant-scripts/create-components.xml

    r18766 r18847  
    182182        </move> 
    183183 
    184         <tar destfile="products/cdrom.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/> 
     184        <tar destfile="products/cdrom-linux-${version}.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/> 
    185185         
    186186    </target> 
  • release-kits/wirk2/ant-scripts/operations-on-gs3home.xml

    r17472 r18847  
    1414    <import file="${basedir}/build.xml"/> 
    1515 
    16     <property name="documented.collections.home" value="/home/nzdl/for-distributions/collect"/> 
    1716    <property name="greenstone3-change-date" value="Tue Feb 20 12:13:42 NZDT 2007"/> 
    1817    <property name="gs2build-change-date" value="Wed Dec 13 10:35:57 NZDT 2006"/>