Changeset 21521

Timestamp:

2010-01-19T12:01:16+13:00 (13 years ago)

Author:

oranfry

Message:

getting rk2 working properly under windows

Location:

main/trunk/release-kits

Files:

• bin/rk.bat (added)
• bin/rk2.bat (added)
• bin/rk3.bat (added)
• kits/rk2/ant-scripts/compile.xml (modified) (1 diff)
• kits/rk2/ant-scripts/create-cdrom-components.xml (modified) (7 diffs)
• kits/rk2/ant-scripts/create-distribution.xml (modified) (1 diff)
• shared/core/ant-scripts/init.xml (modified) (4 diffs)

main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

@@ -194 +194 @@
 
     <target name="compile-c-code">
-        <copy file="${rk.home}/kits/rk2/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/>
         <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="clean"/></exec>
         <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="APACHE_HTTPD=1"/></exec>

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

@@ -8 +8 @@
     -->
 
-    <target name="create-cdrom-components">
+    <target name="create-cdrom-components" depends="init,gs2-init">
         <antcall target="compile-cdrom-installer"/> <!-- from init -->
         <antcall target="prepare-cdrom-components"/>
@@ -32 +32 @@
         <!-- core linux -->
         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
-            <copy todir="cdrom/dist/Software/core/all" overwrite="true">
-                <fileset dir="components/tmp/core"/>
-            </copy>
+            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/all" overwrite="true"/>
             <move todir="cdrom/dist/Software/core/linux" overwrite="true">
                 <fileset dir="cdrom/dist/Software/core/all">
@@ -54 +52 @@
         <!-- core windows -->
         <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <copy todir="cdrom/dist/Software/core/windows" overwrite="true">
-                <fileset dir="components/tmp/core">
+            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/windows" overwrite="true">
+                <patternset>
                     <include name="bin/windows"/>
                     <include name="server.exe"/>
@@ -63 +61 @@
                     <include name="*.bat"/>
                     <include name="gli/*.bat"/>
-                </fileset>
-            </copy>
+                </patternset>
+            </unzip>
 
         <!-- core mac -->
         <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
-            <copy todir="cdrom/dist/Software/core/mac" overwrite="true">
-                <fileset dir="components/tmp/core">
+            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/mac" overwrite="true">
+                <patternset>
                     <include name="bin/darwin"/>
                     <include name="bin/darwin/**/*"/>
@@ -81 +79 @@
                     <include name="*.csh"/>
                     <include name="*.bash"/>
-                </fileset>
-            </copy>
+                </patternset>
+            </unzip>
             <!-- delete the httpd manual to save space -->
             <delete dir="cdrom/dist/Software/core/mac/apache-httpd/darwin/manual"/>
@@ -90 +88 @@
         <!-- imagemagick -->
         <mkdir dir="cdrom/dist/Software/imagemagick/${rk.os}"/>
-        <copy todir="cdrom/dist/Software/imagemagick/${rk.os}" overwrite="true">
-            <fileset dir="components/tmp/imagemagick"/>
-        </copy>
+        <unzip src="components/imagemagick.comp" dest="cdrom/dist/Software/imagemagick/${rk.os}" overwrite="true"/>
 
         <!-- ghostscript: windows and mac only -->
         <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
             <mkdir dir="cdrom/dist/Software/ghostscript/${rk.os}"/>
-            <copy todir="cdrom/dist/Software/ghostscript/${rk.os}" overwrite="true">
-                <fileset dir="components/tmp/ghostscript"/>
-            </copy>
+            <unzip src="components/ghostscript.comp" dest="cdrom/dist/Software/ghostscript/${rk.os}" overwrite="true"/>
         </if>
 
@@ -133 +127 @@
         <!-- windows -->
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <antcall target="get-copy-of-wrapper-source"><param name="todir" value="cdrom/build"/></antcall>
+            <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/greenstone2/icon" includes="icon.ico"/>
+                <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
+            </copy>
             <exec executable="rc" dir="cdrom/build">
                 <arg line="wrapper.rc"/>

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

@@ -59 +59 @@
 
     </target>
+    
+    <target name="copy-server">
+        <copy file="distributions/web/bin/windows/server.exe" tofile="distributions/web/server.exe"/>
+    </target>
 
     <target name="export-imagemagick-linux-binaries">

main/trunk/release-kits/shared/core/ant-scripts/init.xml

@@ -24 +24 @@
         <property name="basedir.local" refid="basedir.path"/>
 
+        <!-- size of resource chunks (wrapper) -->
+        <property name="resources.chunksize" value="8388608"/>
+        
         <!-- current date and time -->
         <tstamp>
@@ -232 +235 @@
             installConfig="installer/antinstall-config-cdrom.xml"
             buildFile="installer/build-cdrom.xml"
-            antInstallLib="${rk.home}/core/ant-installer/lib"
+            antInstallLib="${rk.home}/shared/core/ant-installer/lib"
             antLib="${ant.home}/lib"
             validateConfig="true"
@@ -373 +376 @@
         <mkdir dir="${todir}"/>
         <delete dir="${todir}/perl"/>
-        <unzip src="${rk.home}/windows/perl.zip" dest="${todir}"/>
+        <unzip src="${rk.home}/shared/windows/perl.zip" dest="${todir}"/>
     </target>
 
@@ -497 +500 @@
         <!-- windows -->
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <exec executable="${rk.home}/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 ${component}.lzma ${component}.comp"/></exec>
+            <exec executable="${rk.home}/shared/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 ${component}.lzma ${component}.comp"/></exec>
         
         <!-- linux, mac -->