Changeset 16198 for release-kits/wirk3/ant-scripts/wrap.xml

Timestamp:

2008-06-26T11:54:45+12:00 (16 years ago)

Author:

oranfry

Message:

made wirk3 work with the new shared code scheme

File:

• release-kits/wirk3/ant-scripts/wrap.xml (modified) (6 diffs)

release-kits/wirk3/ant-scripts/wrap.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-        .......................................................... 
-        September 2007
-        Greenstone3 'release maker' script
-        Oran Fry
-        ..........................................................
--->
-
 <project name="wirk3-wrap" default="wrap">
 
@@ -27 +18 @@
 
             <!-- copy source files -->
-            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.cpp"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.cpp"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/search4j/libsearch4j.h"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/packages/search4j/libsearch4j.cpp"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/packages/search4j/libsearch4j.h"/>
         
         </if>
@@ -39 +30 @@
             <!-- substitute the real java installer filename and min version into various files -->
             <echo>Substitute concrete values of things into source files</echo>
-            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
+            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
+            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
             
         </if>
@@ -53 +44 @@
                     <not>
                         <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
-                            <srcfiles dir="${wirk3.home}/icon" includes="gs3.ico"/>
-                            <srcfiles dir="${wirk3.home}/wrapper" includes="${java.installer}"/>
-                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.bmp"/>
-                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.rc"/>
+                            <srcfiles dir="${wirk3.home}/greenstone3/icon" includes="gs3.ico"/>
+                            <srcfiles dir="${wirk3.home}/windows/wrapper" includes="${windows-java.installer}"/>
+                            <srcfiles dir="${wirk3.home}/windows/wrapper" includes="*.bmp"/>
+                            <srcfiles dir="${wirk3.home}/windows/wrapper" includes="*.rc"/>
+                            <srcfiles dir="${wirk3.home}/greenstone3/wrapper" includes="*.bmp"/>
                             <srcfiles dir="${basedir}/installer" includes="greenstone3.jar"/>
                         </uptodate>
@@ -65 +57 @@
                 
                 <echo>getting the template resource script</echo>
-                <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/wrapper/wrapper.rc" overwrite="true"/>
+                <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
                 
                 <echo>copying the small resource files into place</echo>
                 <copy todir="${basedir}/wrapped-installer/build">
-                    <fileset dir="${wirk3.home}/wrapper" includes="*.bmp"/>
-                    <fileset dir="${wirk3.home}/icon" includes="gs3.ico"/>
+                    <fileset dir="${wirk3.home}/windows/wrapper" includes="*.bmp"/>
+                    <fileset dir="${wirk3.home}/greenstone3/wrapper" includes="*.bmp"/>
+                    <fileset dir="${wirk3.home}/greenstone3/icon" includes="gs3.ico"/>
                 </copy>
                 
@@ -91 +84 @@
                 <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/>
                 
-                <echo>adding ${java.installer} to the copy as chunks</echo>
+                <echo>adding ${windows-java.installer} to the copy as chunks</echo>
                 <rsplit
-                    resource="${wirk3.home}/wrapper/${java.installer}"
+                    resource="${wirk3.home}/windows/wrapper/${windows-java.installer}"
                     outputDir="${basedir}/wrapped-installer/build"                  
                     resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"