Changeset 18497 for release-kits

Timestamp:

2009-02-11T14:53:14+13:00 (15 years ago)

Author:

oranfry

Message:

changing release kits to put all products into a products directory

Location:

release-kits/wirk2/ant-scripts

Files:

• compile.xml (modified) (1 diff)
• wrap.xml (modified) (5 diffs)

release-kits/wirk2/ant-scripts/compile.xml

@@ -26 +26 @@
         <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/>
         <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
-        <untar src="${basedir}/compiled/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/compiled/common-src/packages/sqlite"/>
+        <untar src="${basedir}/compiled/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/compiled/common-src/packages/sqlite" compression="gzip"/>
     </target>
 

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

@@ -32 +32 @@
 
     <target name="compile-resources">
+        <!--
         <if>
             <bool>
@@ -42 +43 @@
                         <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/>
                         <srcfiles dir="${wirk2.home}/language-strings" includes="*.properties"/>
-                        <srcfiles dir="${basedir}/installer" includes="greenstone-${version}-win32.jar"/>
+                        <srcfiles dir="${basedir}/installer" includes="Greenstone-${version}-win32.jar"/>
                     </uptodate>
                 </not>
             </bool>
+        -->
             
             <echo>Compiling resources</echo>
@@ -61 +63 @@
             <echo>adding greenstone2.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"
@@ -83 +85 @@
             </exec>
             
+        <!--
             <else>
                 <echo>Resourses are up-to-date, will not compile</echo>
             </else>
         </if>
+        -->
     </target>
 
@@ -101 +105 @@
     <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"/>
+            <arg line="/OUT:..\..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
         </exec>
     </target>