Changeset 17338 for release-kits/wirk3

Timestamp:

2008-09-19T09:26:37+12:00 (16 years ago)

Author:

oranfry

Message:

making the java installation the same for win as it is on linux

File:

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

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

@@ -7 +7 @@
         <antcall target="compile-resources"/>
         <antcall target="compile-wrapper"/>
-        <antcall target="link-wrapper-no-java"/>
-        <antcall target="link-wrapper-with-java"/>
+        <antcall target="link-wrapper"/>
     </target>
 
@@ -37 +36 @@
                         <srcfiles dir="${wirk3.home}/windows/wrapper" includes="*.rc"/>
                         <srcfiles dir="${wirk3.home}/greenstone3/wrapper" includes="*.bmp"/>
-                        <srcfiles dir="${basedir}/installer" includes="greenstone3.jar"/>
+                        <srcfiles dir="${basedir}/installer" includes="Greenstone-${version}-win32.jar"/>
                     </uptodate>
                 </not>
@@ -56 +55 @@
             <echo>adding greenstone3.jar to the resource script as chunks</echo>
             <rsplit
-                resource="${basedir}/installer/greenstone-${version}-win32.jar"
+                resource="${basedir}/installer/Greenstone-${version}-win32.jar"
                 outputDir="${basedir}/wrapped-installer/build"
                 resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
@@ -63 +62 @@
                 chunkSize="${resources.chunksize}"
                 />
-        
-            <echo>resource compiling the resource script</echo>
-            <exec executable="rc" dir="${basedir}/wrapped-installer/build">
-                <arg line="wrapper.rc"/>
-            </exec>
-            
-            <echo>making a copy of the resource script</echo>
-            <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/>
             
             <echo>adding ${windows-java.installer} to the copy as chunks</echo>
@@ -76 +67 @@
                 resource="${wirk3.home}/windows/wrapper/${windows-java.installer}"
                 outputDir="${basedir}/wrapped-installer/build"                  
-                resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
+                resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
                 resourceName="JAVA"
                 resourceType="EXE"
@@ -82 +73 @@
                 />
 
-            <echo>resource compiling the generated resource script again</echo>
+            <echo>resource compiling the generated resource script</echo>
             <exec executable="rc" dir="${basedir}/wrapped-installer/build">
-                <arg line="wrapper-with-jre.rc"/>
+                <arg line="wrapper.rc"/>
             </exec>
             
@@ -97 +88 @@
             <arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
         </exec>
-
         <exec executable="cl" dir="${basedir}/wrapped-installer/build">
             <arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
         </exec>
     </target>
-    
-    <target name="link-wrapper-no-java">
+
+    <target name="link-wrapper">
         <exec executable="link" dir="${basedir}/wrapped-installer/build">
-            <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
-        </exec>
-    </target>
-
-    <target name="link-wrapper-with-java">
-        <exec executable="link" dir="${basedir}/wrapped-installer/build">
-            <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper-with-jre.res"/>
+            <arg line="/OUT:..\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
         </exec>
     </target>