Changeset 22325 for main/trunk/release-kits/kits/rk2/installer/build.xml

Timestamp:

2010-06-30T10:24:48+12:00 (14 years ago)

Author:

sjm84

Message:

Several upgrades to the release kits have been made including: optional Apache and the ability to create installers with extensions

File:

• main/trunk/release-kits/kits/rk2/installer/build.xml (modified) (3 diffs)

main/trunk/release-kits/kits/rk2/installer/build.xml

@@ -120 +120 @@
         <!-- if linux|mac -->
         <chmod dir="${installDir}/bin/${shell.name}" includes="**/*" perm="775"/>
-        <chmod dir="${installDir}/apache-httpd/${shell.name}/bin" includes="*" perm="775"/>
-        <chmod dir="${installDir}/apache-httpd/${shell.name}" includes="*.sh" perm="775"/>
         <!-- /if -->
 
@@ -155 +153 @@
             >cgiarg          shortname=l argdefault=${language}</echo>
 
-        <!-- if linux|mac -->
-        <echo>Setting up apache web server</echo>
-        <exec dir="${installDir}" executable="${installDir}/apache-httpd/${shell.name}/install-bindist.sh">
-            <arg value="${installDir}/apache-httpd/${shell.name}"/>
-        </exec>
-        <!-- /if -->
-
         <echo message="Creating installation properties file"/>
         <!-- if linux|mac -->
@@ -170 +161 @@
         <!-- /if -->
         
+    </target>
+
+    <!-- Apache HTTPD  -->
+    <target name="Installing Apache Web Server">
+      <echo>Installing the Apache Web Server</echo>
+      
+      <!-- start web -->
+      <unzip src="${antinstaller.jar}" dest="${basedir}">
+        <patternset>
+          <include name="apachehttpd.lzma"/>
+        </patternset>
+      </unzip>
+
+      <!-- if linux|mac -->
+      <sevenzip task="decode" input="${basedir}/apachehttpd.lzma" output="${basedir}/imagemagick.comp"/>
+      <!-- /if -->
+      <!-- if windows -->
+      <exec dir="${basedir}" executable="${basedir}/7za.exe">
+        <arg line="x apachehttpd.lzma"/>
+      </exec>
+      <!-- /if -->
+      <!-- end web -->
+
+      <!-- start cdrom -->
+      <copy todir="${installDir}">
+        <fileset dir="${orig.dir}/Software/apache-httpd"/>
+      </copy>
+      <!-- end cdrom -->
+
+      <!-- if linux|mac -->
+      <chmod dir="${installDir}/apache-httpd/${shell.name}/bin" includes="*" perm="775"/>
+      <chmod dir="${installDir}/apache-httpd/${shell.name}" includes="*.sh" perm="775"/>
+      <echo>Setting up apache web server</echo>
+      <exec dir="${installDir}" executable="${installDir}/apache-httpd/${shell.name}/install-bindist.sh">
+        <arg value="${installDir}/apache-httpd/${shell.name}"/>
+      </exec>
+      <!-- /if -->
     </target>