Changeset 19328 for release-kits

Show
Ignore:
Timestamp:
06.05.2009 10:59:33 (11 years ago)
Author:
oranfry
Message:

changed to a date-based naming convention rather than version string based convention, as one might not know a version string but shuold always know the date

Files:
1 modified

Legend:

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

    r19039 r19328  
    2323 
    2424    <!-- figure out where the compiled software is coming from --> 
    25     <property name="software.archive.linux" value="http://greenstone.org/release-snapshots/cdrom-components-${version}-linux.tar.gz"/> 
    26     <property name="software.archive.windows" value="http://greenstone.org/release-snapshots/cdrom-components-${version}-windows.tar.gz"/> 
    27     <property name="software.archive.mac" value="http://greenstone.org/release-snapshots/cdrom-components-${version}-mac.tar.gz"/> 
     25    <property name="software.archive.linux" value="http://greenstone.org/release-snapshots/cdrom-components-2s${date}-linux.tar.gz"/> 
     26    <property name="software.archive.windows" value="http://greenstone.org/release-snapshots/cdrom-components-2s${date}-windows.tar.gz"/> 
     27    <property name="software.archive.mac" value="http://greenstone.org/release-snapshots/cdrom-components-2s${date}-mac.tar.gz"/> 
     28    <property name="software.archive.documented-examples" value="http://greenstone.org/release-snapshots/Greenstone-documented-examples-${date}.tar.gz"/> 
     29 
     30    <target name="cdrk2-init"> 
     31        <echo message="software.archive.linux:                    ${software.archive.linux}"/> 
     32        <echo message="software.archive.windows:                  ${software.archive.windows}"/> 
     33        <echo message="software.archive.mac:                      ${software.archive.mac}"/> 
     34        <echo message="software.archive.documented-examples:      ${software.archive.documented-examples}"/> 
     35    </target> 
    2836 
    2937    <!-- THE MAIN TARGET --> 
    30     <target name="cdrk2" depends="init"> 
     38    <target name="cdrk2" depends="init,cdrk2-init"> 
    3139        <antcall target="checkout-and-compile-documentation"/> 
    3240        <antcall target="build-tutorials"/> 
    3341        <antcall target="build-documentation"/> 
    34         <antcall target="export-documented-example-collections"/> 
     42        <antcall target="get-documented-examples"/> 
    3543        <antcall target="insert-readmes"/> 
    3644        <antcall target="insert-software"/> 
     
    4048    <target name="properties"> 
    4149        <echo>Required Properties:</echo> 
    42         <echo>version             the version string for the release</echo> 
     50        <echo>version                                     the version string for the release</echo> 
    4351        <echo/> 
    44     </target> 
    45  
     52        <echo>Optional Properties:</echo> 
     53        <echo>software.archive.linux                      the URL to the linux archive of components</echo> 
     54        <echo>software.archive.windows                    the URL to the windows archive of components</echo> 
     55        <echo>software.archive.mac                        the URL to the mac archive of components</echo> 
     56        <echo>software.archive.documented-examples        the URL to the archive of documented examples</echo> 
     57        <echo/> 
     58    </target> 
    4659 
    4760    <target name="checkout-and-compile-documentation"> 
     
    111124    </target> 
    112125 
    113     <target name="export-documented-example-collections"> 
    114         <svn> 
    115             <export srcurl="${svn.root}/documented-example-collections/${branch.path}" destPath="cdrom/Documented Example Collections"/> 
    116         </svn> 
     126    <target name="get-documented-examples"> 
     127        <mkdir dir="archives"/> 
     128        <get src="${software.archive.documented-examples}" dest="archives/documented-examples.tar.gz"/> 
     129        <untar src="archives/documented-examples.tar.gz" dest="cdrom" compression="gzip" overwrite="true"/> 
    117130    </target> 
    118131 
     
    150163    <target name="insert-software-linux"> 
    151164        <mkdir dir="cdrom/Software"/> 
    152         <mkdir dir="software"/> 
    153         <get src="${software.archive.linux}" dest="software/linux.tar.gz"/> 
    154         <untar src="software/linux.tar.gz" dest="cdrom/Software" compression="gzip" overwrite="true"/> 
     165        <mkdir dir="archives"/> 
     166        <get src="${software.archive.linux}" dest="archives/linux.tar.gz"/> 
     167        <untar src="archives/linux.tar.gz" dest="cdrom/Software" compression="gzip" overwrite="true"/> 
    155168    </target> 
    156169 
    157170    <target name="insert-software-windows"> 
    158171        <mkdir dir="cdrom/Software"/> 
    159         <mkdir dir="software"/> 
    160         <get src="${software.archive.windows}" dest="software/windows.tar.gz"/> 
    161         <untar src="software/windows.tar.gz" dest="cdrom/Software" compression="gzip" overwrite="true"/> 
     172        <mkdir dir="archives"/> 
     173        <get src="${software.archive.windows}" dest="archives/windows.tar.gz"/> 
     174        <untar src="archives/windows.tar.gz" dest="cdrom/Software" compression="gzip" overwrite="true"/> 
    162175    </target> 
    163176