Changeset 17255 for release-kits/wirk3

Timestamp:

2008-09-11T16:05:10+12:00 (16 years ago)

Author:

oranfry

Message:

wirk3 to include uninstaller and a little fix for gems link

Location:

release-kits/wirk3

Files:

• ant-scripts/build.xml (modified) (1 diff)
• ant-scripts/compile.xml (modified) (1 diff)
• ant-scripts/create-distribution.xml (modified) (1 diff)
• ant-scripts/create-installer.xml (modified) (3 diffs)
• ant-scripts/operations-on-gs3home.xml (modified) (1 diff)
• installer/build.xml (modified) (1 diff)

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

@@ -26 +26 @@
     <import file="shared-ant-scripts/init.xml"/>
     <import file="shared-ant-scripts/operations-on-gli.xml"/>
+    <import file="shared-ant-scripts/global-targets.xml"/>
     <import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
+
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>

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

@@ -15 +15 @@
             <property name="branch.revision" value="${branch.revision}"/>
         </ant>
+        <antcall target="compile-uninstaller"/>
         <antcall target="prepare-documentation" />
     </target>

release-kits/wirk3/ant-scripts/create-distribution.xml

@@ -24 +24 @@
         <antcall target="insert-user-manual"/>
         <antcall target="insert-compiled-binaries"/>
+        <antcall target="insert-uninstaller"/>
         <antcall target="rename-build-xml-for-transit"/>
     </target>

release-kits/wirk3/ant-scripts/create-installer.xml

@@ -11 +11 @@
         <echo>Getting things ready to compile the installer</echo>
         <mkdir dir="${basedir}/installer/resources"/>
-        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/>
-        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/>
-        <copy todir="${basedir}/installer/classes">
+        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml" overwrite="true" />
+        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml" overwrite="true" />
+        <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${wirk3.home}/windows/installer-classes"/>
             <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
@@ -22 +22 @@
 
     <target name="compile-installer">
+
+        <installer file="${basedir}/installer/Greenstone-${version}-win32-with-java.jar"
+                compress="true"
+                extractType="NonExtractor"
+                installConfig="${basedir}/installer/antinstall-config.xml"
+                buildFile="${basedir}/installer/build.xml"
+                antInstallLib="${wirk3.home}/packages/ant-installer/lib"
+                antLib="${wirk3.home}/packages/ant/lib"
+                validateConfig="true"
+                icons="bluecurve">
+
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
+            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*" />
+            
+        </installer>
+
+        <!-- delete the 'bundled java only' lines from the installer config -->
+        <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
+
         <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
                 compress="true"
@@ -36 +55 @@
             
         </installer>
+
     </target>
     

release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

@@ -43 +43 @@
         <antcall target="checkout-gs2build"/>
         <antcall target="checkout-gli"/>
-        <!--<delete file="${gli.home}/gli.bat"/>-->
         <delete file="${gli.home}/gli.sh"/>
-        <delete file="${gli.home}/gems.bat"/>
         <delete file="${gli.home}/gems.sh"/>
         

release-kits/wirk3/installer/build.xml

@@ -170 +170 @@
         <shortcut
             file="${startmenu.path}\Greenstone Editor for Metadata Sets (GEMS).lnk"
-            execute="${installDir}\gli\gems4gs3.bat"
+            execute="${installDir}\gli\gems.bat"
             workingDirectory="${installDir}\gli"
             iconFile="${installDir}\resources\images\gs3.ico"