Changeset 20056

Timestamp:

2009-07-21T16:59:28+12:00 (14 years ago)

Author:

oranfry

Message:

the unified isntaller descriptors for all oses

Location:

release-kits/shared/greenstone2/installer

Files:

• antinstall-config.xml (modified) (1 diff)
• build.xml (modified) (4 diffs)

release-kits/shared/greenstone2/installer/antinstall-config.xml

@@ -126 +126 @@
     </page>
 
-    <!-- if they said yes above, set a password -->
+    <!-- only if they said yes above, set a password -->
     <page type="input" name="admin-password" displayText="" ifProperty="(${enable.admin.pages}==true)" target="Configuring Administration Pages">
         <comment name="admin-password-expl"/>

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

@@ -35 +35 @@
     <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/> 
     <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
-    <taskdef name="sevenzip" classname="org.greenstone.anttasks.WindowsSevenZipWrapper" classpathref="project.classpath"/>
     <!-- /if -->
     <!-- if linux|mac -->
@@ -90 +89 @@
         <!-- start web -->
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
-        <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>
+        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/><!-- /if -->
+        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec><!-- /if -->
         <delete file="core.lzma"/>
         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
@@ -173 +173 @@
         <!-- start web -->
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
-        <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
+        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/><!-- /if -->
+        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec><!-- /if -->
         <delete file="imagemagick.lzma"/>
         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/${shell.name}"/>
@@ -194 +195 @@
         <!-- start web -->
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
-        <sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/>
+        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/><!-- /if -->
+        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec><!-- /if -->
         <delete file="ghostscript.lzma"/>
         <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/${shell.name}" />