Changeset 24130

Timestamp:

2011-06-09T13:22:58+12:00 (12 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:

• cdrk2/ant-scripts/build.xml (modified) (3 diffs)
• rk2/installer/build.xml (modified) (4 diffs)

main/trunk/release-kits/kits/cdrk2/ant-scripts/build.xml

@@ -156 +156 @@
 
         <!-- create tutorial sample files zips in place on the cdrom -->
-        <zip destfile="cdrom/Tutorial Exercises/sample_files/beatles.zip" basedir="documentation/tutorial_sample_files/beatles"/>
+        <copy todir="cdrom/Tutorial Exercises/sample_files">
+            <fileset dir="documentation/tutorial_sample_files"/>
+        </copy>
+        
+        <!--<zip destfile="cdrom/Tutorial Exercises/sample_files/beatles.zip" basedir="documentation/tutorial_sample_files/beatles"/>
         <zip destfile="cdrom/Tutorial Exercises/sample_files/custom.zip" basedir="documentation/tutorial_sample_files/custom"/>
         <zip destfile="cdrom/Tutorial Exercises/sample_files/demo_NewFiles.zip" basedir="documentation/tutorial_sample_files/demo_NewFiles"/>
@@ -167 +171 @@
         <zip destfile="cdrom/Tutorial Exercises/sample_files/simple_html.zip" basedir="documentation/tutorial_sample_files/simple_html"/>
         <zip destfile="cdrom/Tutorial Exercises/sample_files/tudor.zip" basedir="documentation/tutorial_sample_files/tudor"/>
-        <zip destfile="cdrom/Tutorial Exercises/sample_files/Word_and_PDF.zip" basedir="documentation/tutorial_sample_files/Word_and_PDF"/>
-
-        <!-- checkout manuals ad build them -->
+        <zip destfile="cdrom/Tutorial Exercises/sample_files/Word_and_PDF.zip" basedir="documentation/tutorial_sample_files/Word_and_PDF"/>-->
+
+        <!-- checkout manuals and build them -->
         <if><bool><or><equals arg1="${branch.path}" arg2="trunk"/><isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/></or></bool>
             <exec executable="svn">
@@ -273 +277 @@
             <delete dir="cdrom/Documented Examples"/>
             <copy toDir="cdrom">
-                <fileset dir="${rk.home}/kits/${rk.name}/resources">
-                    <include name="Documented Examples/**/*"/>
-                    <include name="Documented Examples"/>
+                <fileset dir="../../archives">
+                    <include name="documented-examples.tar.gz"/>
                 </fileset>
             </copy>
-            <exec executable="tar" dir="cdrom/Documented Examples"><arg value="-xzf"/><arg value="../../archives/documented-examples.tar.gz"/></exec>
+            <!--<exec executable="tar" dir="cdrom/Documented Examples"><arg value="-xzf"/><arg value="../../archives/documented-examples.tar.gz"/></exec>-->
         </if>
 

main/trunk/release-kits/kits/rk2/installer/build.xml

@@ -103 +103 @@
         <copy todir="${installDir}">
             <fileset dir="${orig.dir}/Software/core/all"/>
-            <fileset dir="${orig.dir}/Software/core/${rk.os}"/>
+            <fileset dir="${orig.dir}/Software/core/${rk.os}"/><!-- /if -->
         </copy>
         <!-- if windows -->
@@ -196 +196 @@
 
         <!-- start cdrom -->
-        <mkdir dir="${installDir}/apache-httpd" />
-        <copy todir="${installDir}/apache-httpd">
-            <fileset dir="${orig.dir}/Software/apache-httpd/${rk.os}"/>
+        <mkdir dir="${installDir}/apache-httpd"/>
+        <mkdir dir="${installDir}/apache-httpd/${shell.name}"/>
+        
+        <copy todir="${installDir}/apache-httpd/${shell.name}">
+            <fileset dir="${orig.dir}/Software/apache-httpd"/>
         </copy>
         <!-- end cdrom -->
@@ -226 +228 @@
         <!-- start cdrom -->
         <copy todir="${installDir}">
-            <fileset dir="${orig.dir}/Software/imagemagick/${rk.os}"/>
+            <fileset dir="${orig.dir}/Software/imagemagick/${rk.os}/**/*"/>
         </copy>
         <!-- end cdrom -->
@@ -253 +255 @@
         <!-- start cdrom -->
         <copy todir="${installDir}">
-            <fileset dir="${orig.dir}/Software/ghostscript/${rk.os}"/>
+            <fileset dir="${orig.dir}/Software/ghostscript/${rk.os}/**/*"/>
         </copy>
         <!-- end cdrom -->