Show
Ignore:
Timestamp:
09.06.2011 13:22:58 (9 years ago)
Author:
sjm84
Message:

A few modifications to the CD version of Greenstone so that the sample files are unzipped and the documented examples remain zipped up

Location:
main/trunk/release-kits/kits
Files:
2 modified

Legend:

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

    r22878 r24130  
    156156 
    157157        <!-- create tutorial sample files zips in place on the cdrom --> 
    158         <zip destfile="cdrom/Tutorial Exercises/sample_files/beatles.zip" basedir="documentation/tutorial_sample_files/beatles"/> 
     158        <copy todir="cdrom/Tutorial Exercises/sample_files"> 
     159            <fileset dir="documentation/tutorial_sample_files"/> 
     160        </copy> 
     161         
     162        <!--<zip destfile="cdrom/Tutorial Exercises/sample_files/beatles.zip" basedir="documentation/tutorial_sample_files/beatles"/> 
    159163        <zip destfile="cdrom/Tutorial Exercises/sample_files/custom.zip" basedir="documentation/tutorial_sample_files/custom"/> 
    160164        <zip destfile="cdrom/Tutorial Exercises/sample_files/demo_NewFiles.zip" basedir="documentation/tutorial_sample_files/demo_NewFiles"/> 
     
    167171        <zip destfile="cdrom/Tutorial Exercises/sample_files/simple_html.zip" basedir="documentation/tutorial_sample_files/simple_html"/> 
    168172        <zip destfile="cdrom/Tutorial Exercises/sample_files/tudor.zip" basedir="documentation/tutorial_sample_files/tudor"/> 
    169         <zip destfile="cdrom/Tutorial Exercises/sample_files/Word_and_PDF.zip" basedir="documentation/tutorial_sample_files/Word_and_PDF"/> 
    170  
    171         <!-- checkout manuals ad build them --> 
     173        <zip destfile="cdrom/Tutorial Exercises/sample_files/Word_and_PDF.zip" basedir="documentation/tutorial_sample_files/Word_and_PDF"/>--> 
     174 
     175        <!-- checkout manuals and build them --> 
    172176        <if><bool><or><equals arg1="${branch.path}" arg2="trunk"/><isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/></or></bool> 
    173177            <exec executable="svn"> 
     
    273277            <delete dir="cdrom/Documented Examples"/> 
    274278            <copy toDir="cdrom"> 
    275                 <fileset dir="${rk.home}/kits/${rk.name}/resources"> 
    276                     <include name="Documented Examples/**/*"/> 
    277                     <include name="Documented Examples"/> 
     279                <fileset dir="../../archives"> 
     280                    <include name="documented-examples.tar.gz"/> 
    278281                </fileset> 
    279282            </copy> 
    280             <exec executable="tar" dir="cdrom/Documented Examples"><arg value="-xzf"/><arg value="../../archives/documented-examples.tar.gz"/></exec> 
     283            <!--<exec executable="tar" dir="cdrom/Documented Examples"><arg value="-xzf"/><arg value="../../archives/documented-examples.tar.gz"/></exec>--> 
    281284        </if> 
    282285 
  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r24113 r24130  
    103103        <copy todir="${installDir}"> 
    104104            <fileset dir="${orig.dir}/Software/core/all"/> 
    105             <fileset dir="${orig.dir}/Software/core/${rk.os}"/> 
     105            <fileset dir="${orig.dir}/Software/core/${rk.os}"/><!-- /if --> 
    106106        </copy> 
    107107        <!-- if windows --> 
     
    196196 
    197197        <!-- start cdrom --> 
    198         <mkdir dir="${installDir}/apache-httpd" /> 
    199         <copy todir="${installDir}/apache-httpd"> 
    200             <fileset dir="${orig.dir}/Software/apache-httpd/${rk.os}"/> 
     198        <mkdir dir="${installDir}/apache-httpd"/> 
     199        <mkdir dir="${installDir}/apache-httpd/${shell.name}"/> 
     200         
     201        <copy todir="${installDir}/apache-httpd/${shell.name}"> 
     202            <fileset dir="${orig.dir}/Software/apache-httpd"/> 
    201203        </copy> 
    202204        <!-- end cdrom --> 
     
    226228        <!-- start cdrom --> 
    227229        <copy todir="${installDir}"> 
    228             <fileset dir="${orig.dir}/Software/imagemagick/${rk.os}"/> 
     230            <fileset dir="${orig.dir}/Software/imagemagick/${rk.os}/**/*"/> 
    229231        </copy> 
    230232        <!-- end cdrom --> 
     
    253255        <!-- start cdrom --> 
    254256        <copy todir="${installDir}"> 
    255             <fileset dir="${orig.dir}/Software/ghostscript/${rk.os}"/> 
     257            <fileset dir="${orig.dir}/Software/ghostscript/${rk.os}/**/*"/> 
    256258        </copy> 
    257259        <!-- end cdrom -->