Changeset 21206 for main/trunk/release-kits/wirk2/ant-scripts/wrap.xml

Timestamp:

2009-12-02T14:16:30+13:00 (14 years ago)

Author:

oranfry

Message:

changes for 2.83 release

File:

• main/trunk/release-kits/wirk2/ant-scripts/wrap.xml (modified) (3 diffs)

main/trunk/release-kits/wirk2/ant-scripts/wrap.xml

@@ -26 +26 @@
             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
             <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
-            <job pattern="@java.extracted@" replacement="${windows-java.extracted}"/>
+            <job pattern="@java.extracted@" replacement="${java.extracted}"/>
         </rsr>
     </target>
@@ -50 +50 @@
             <echo>adding greenstone2.jar to the resource script as chunks</echo>
             <rsplit
-                resource="${basedir}/installer/Greenstone-${version}-win32.jar"
+                resource="${basedir}/installer/Greenstone-${version}-${os.suffix}.jar"
                 outputDir="${basedir}/wrapped-installer"
                 resourceScript="${basedir}/wrapped-installer/wrapper.rc"
@@ -78 +78 @@
         <mkdir dir="products"/>
         <exec executable="link" dir="${basedir}/wrapped-installer">
-            <arg line="/OUT:..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
+            <arg line="/OUT:..\products\Greenstone-${version}-${os.suffix}.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
         </exec>
     </target>