Changeset 17786 for release-kits/lirk2/installer

Timestamp:

2008-11-07T14:36:58+13:00 (15 years ago)

Author:

oranfry

Message:

shifted the responsibility for the source release to the linux release kit. Made the source release contain a single component with the core and sourcecode mixed together

Location:

release-kits/lirk2/installer

Files:

• antinstall-config.xml (modified) (5 diffs)
• build.xml (modified) (2 diffs)

release-kits/lirk2/installer/antinstall-config.xml

@@ -25 +25 @@
 
     <!--  simple intro page -->
-    <page type="input" name="intro" displayText="">
+    <page
+        type="input"
+        name="intro"
+        displayText=""
+        <!-- start source release -->
+        target="Source Release"
+        <!-- end source release -->
+        >
+
         <comment name="welcome-message"/>
     </page>
@@ -42 +50 @@
     </page>
 
+    <!-- start binary release -->
     <page type="input" name="selector" displayText="">
         <comment name="choose-components"/>
@@ -53 +62 @@
             hidden="true"/>
 
-        <!-- start binary release core -->
         <target
             target="Installing Core System"
@@ -60 +68 @@
             defaultValue="true"
             force="true"/>
-        <!-- end binary release core -->
-
-        <!-- start source release core -->
-        <target
-            target="Installing Source Code Core"
-            diskRequirement="@component.size.sourcecode-core@"
-            displayText=""
-            defaultValue="true"
-            />
-        <!-- end source release core -->
 
         <!-- start bundled components -->
@@ -79 +77 @@
         <!-- end bundled components -->
 
-        <!-- start sourcecode -->
-        <target
-            target="Installing Source Code"
-            diskRequirement="@component.size.sourcecode@"
-            defaultValue="true"
-            displayText=""/>
-        <!-- end sourcecode -->
-
     </page>
 
-    <!-- start binary release core -->
     <page type="input" name="admin-password" displayText="">
         <comment name="admin-password-expl"/>
         <text property="admin.password" defaultValue="" displayText=""/>
     </page>
-    <!-- end binary release core -->
+    <!-- end binary release -->
 
     <page type="progress" name="progress" showTargets="true" displayText=""/>

release-kits/lirk2/installer/build.xml

@@ -98 +98 @@
     </target>
 
-    <!-- sourcecode core system -->
-    <target name="Installing Source Code Core">
+    <!-- imagemagick -->
+    <target name="Installing ImageMagick">
+        <echo>Installing ImageMagick</echo>
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
+        <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
+        <delete file="imagemagick.lzma"/>
+        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
+        <delete file="imagemagick.comp"/>
+        
+        <echo>Setting ImageMagick Binaries to Executable</echo>
+        <chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
+        
+    </target>
 
-        <echo>Installing Source Code Core</echo>
-        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
-        <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
-        <delete file="sourcecode-core.lzma"/>
-        <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
-        <delete file="sourcecode-core.comp"/>
+    <!-- source release -->
+    <target name="Source Release">
+
+        <echo>Installing Source Release</echo>
+        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
+        <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
+        <delete file="source-release.lzma"/>
+        <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
+        <delete file="source-release.comp"/>
 
         <echo>Set the installation locale in config files</echo>
@@ -129 +143 @@
 
 
-    <!-- source code -->
-    <target name="Installing Source Code">
-        <echo>Installing Source Code</echo>
-        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
-        <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
-        <delete file="sourcecode.lzma"/>
-        <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
-        <delete file="sourcecode.comp"/>
-    </target>
-
-    <!-- imagemagick -->
-    <target name="Installing ImageMagick">
-        <echo>Installing ImageMagick</echo>
-        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
-        <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
-        <delete file="imagemagick.lzma"/>
-        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
-        <delete file="imagemagick.comp"/>
-        
-        <echo>Setting ImageMagick Binaries to Executable</echo>
-        <chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
-        
-    </target>
-
 </project>