Changeset 22093

Timestamp:

2010-05-17T13:48:32+12:00 (14 years ago)

Author:

sjm84

Message:

When run on Windows this now creates a cdrom-components--full-windows.tar.gz as well as the standard windows cdrom-components

File:

• main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml (modified) (5 diffs)

main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

@@ -22 +22 @@
         <mkdir dir="cdrom/dist/Software/core/all"/>
         <mkdir dir="cdrom/dist/Software/core/${rk.os}"/>
+
+        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+          <mkdir dir="cdrom/dist/Software/core/full-windows"/>
+        </if>
 
         <!-- core linux -->
@@ -48 +52 @@
                 <patternset>
                     <include name="bin/windows"/>
+                    <include name="bin/windows/**/*"/>
                     <include name="server.exe"/>
-                    <include name="bin/windows/**/*"/>
                     <include name="cgi-bin/library.cgi"/>
                     <include name="cgi-bin/oaiserver.cgi"/>
@@ -56 +60 @@
                 </patternset>
             </unzip>
+
+            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/full-windows" overwrite="true"/>
 
         <!-- core mac -->
@@ -120 +126 @@
             <copy todir="cdrom/build" overwrite="true">
                 <fileset dir="${rk.home}/shared/windows/wrapper"/>
-                <fileset dir="${rk.home}/shared/greenstone2/wrapper" includes="*.bmp"/>
                 <fileset dir="${rk.home}/shared/core/icon" includes="icon.ico"/>
                 <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
@@ -172 +177 @@
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
             <tar destfile="products/cdrom-components-${version}-windows.tar.gz" compression="gzip">
-                <tarfileset dir="cdrom/dist"><include name="**/*"/></tarfileset>
+                <tarfileset dir="cdrom/dist">
+                  <include name="**/*"/>
+                  <exclude name="**/full-windows/*"/>
+                </tarfileset>
+            </tar>
+            <tar destfile="products/cdrom-components-${version}-full-windows.tar.gz" compression="gzip">
+                <tarfileset dir="cdrom/dist">
+                  <include name="**/*"/>
+                  <exclude name="**/windows/*"/>
+                </tarfileset>
             </tar>