Changeset 20190 for release-kits/shared/greenstone3/installer/build.xml

Timestamp:

2009-08-10T12:12:07+12:00 (15 years ago)

Author:

oranfry

Message:

copy correct uninstaller script on windows, and prevent erroneous progress output at install

File:

• release-kits/shared/greenstone3/installer/build.xml (modified) (5 diffs)

release-kits/shared/greenstone3/installer/build.xml

@@ -71 +71 @@
 
         <echo>Extracting core component</echo>
-        <ant target="extract-component"><property name="component.name" value="core"/></ant>
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
+        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec><!-- /if -->
+        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/><!-- /if -->
+        <delete file="core.lzma"/>
+        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
+        <delete file="core.comp"/>
 
         <echo>Setting binaries to executable</echo>
@@ -130 +135 @@
 
         <echo>Installing ImageMagick</echo>
-        <ant target="extract-component"><property name="component.name" value="imagemagick"/></ant>
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
+        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec><!-- /if -->
+        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/><!-- /if -->
+        <delete file="imagemagick.lzma"/>
+        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}"/>
+        <delete file="imagemagick.comp"/>
 
         <echo>Setting binaries to executable</echo>
@@ -145 +155 @@
 
         <echo>Installing Ghostscript</echo>
-        <ant target="extract-component"><property name="component.name" value="ghostscript"/></ant>
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
+        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec><!-- /if -->
+        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/><!-- /if -->
+        <delete file="ghostscript.lzma"/>
+        <unzip src="${basedir}/ghostscript.comp" dest="${installDir}"/>
+        <delete file="ghostscript.comp"/>
 
         <echo>Setting binaries to executable</echo>
@@ -161 +176 @@
         <echo>Installing Tomcat (packages/tomcat)</echo>
         <mkdir dir="packages"/>
-        <ant target="extract-component"><property name="component.name" value="tomcat"/></ant>
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="tomcat.lzma"/></patternset></unzip>
+        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x tomcat.lzma"/></exec><!-- /if -->
+        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/tomcat.lzma" output="${basedir}/tomcat.comp"/><!-- /if -->
+        <delete file="tomcat.lzma"/>
+        <unzip src="${basedir}/tomcat.comp" dest="${installDir}"/>
+        <delete file="tomcat.comp"/>
+
 
         <echo>Changing tomcat ports tomcat's server.xml</echo>
@@ -237 +258 @@
     <!-- util target to extract the given component -->
     <!-- pass in ${component.name} as a param -->
+    <!-- unused at this time as causes display errors in installer gui!
     <target name="extract-component">
-        <!-- extract the component into place -->
+        <!- - extract the component into place - ->
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="${component.name}.lzma"/></patternset></unzip>
-        <!-- if windows -->
+        <!- - if windows - ->
         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ${component.name}.lzma"/></exec>
-        <!-- /if -->
-        <!-- if linux|mac -->
+        <!- - /if - ->
+        <!- - if linux|mac - ->
         <sevenzip task="decode" input="${basedir}/${component.name}.lzma" output="${basedir}/${component.name}.comp"/>
-        <!-- /if -->
+        <!- - /if - ->
         <delete file="${component.name}.lzma"/>
         <unzip src="${basedir}/${component.name}.comp" dest="${installDir}"/>
         <delete file="${component.name}.comp"/>
     </target>
+    -->
 
 </project>