Changeset 20060 for release-kits

Timestamp:

2009-07-22T09:55:54+12:00 (15 years ago)

Author:

oranfry

Message:

removed ant component from greenstone3 installers

Location:

release-kits

Files:

• lirk3/ant-scripts/create-components.xml (modified) (2 diffs)
• shared/core/ant-scripts/init.xml (modified) (4 diffs)
• shared/greenstone3/installer/antinstall-config.xml (modified) (1 diff)
• shared/greenstone3/installer/build.xml (modified) (1 diff)
• wirk3/ant-scripts/create-components.xml (modified) (2 diffs)

release-kits/lirk3/ant-scripts/create-components.xml

@@ -14 +14 @@
     <target name="prepare-components">
         <antcall target="prepare-component"><param name="component" value="core"/></antcall>
-        <antcall target="prepare-component"><param name="component" value="ant"/></antcall>
         <antcall target="prepare-component"><param name="component" value="tomcat"/></antcall>
         <antcall target="prepare-component"><param name="component" value="imagemagick"/></antcall>
@@ -21 +20 @@
     <target name="compress-components">
                 <antcall target="compress-component"><param name="component" value="core"/></antcall>
-                <antcall target="compress-component"><param name="component" value="ant"/></antcall>
                 <antcall target="compress-component"><param name="component" value="tomcat"/></antcall>
                 <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall>

release-kits/shared/core/ant-scripts/init.xml

@@ -47 +47 @@
     <property name="bundled.version.ghostscript" value="8.63"/>
     <property name="bundled.version.tomcat" value="5.5.25"/>
-    <property name="bundled.version.ant" value="1.6.5"/>
     
     <!-- CLASSPATH -->
@@ -250 +249 @@
         <property name="component.size.tomcat" value="${component.megabytesize.tomcat} MB"/>
 
-        <!-- ant -->
-        <length property="component.bytesize.ant" mode="all"><fileset file="${basedir}/components/ant.comp"/></length>
-        <math result="component.megabytesize.ant" operand1="${component.bytesize.ant}" operation="/" operand2="1048576" datatype="int"/>
-        <property name="component.size.ant" value="${component.megabytesize.ant} MB"/>
-
         <!-- make the installer descriptors relevant to the current os -->
         <dcff file="installer/antinstall-config.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" />
@@ -265 +259 @@
             <job pattern="@component.size.core@" replacement="${component.size.core}"/>
             <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/>
-            <job pattern="@component.size.ant@" replacement="${component.size.ant}"/>
             <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/>
             <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/>
@@ -282 +275 @@
             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-            <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>

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

@@ -102 +102 @@
             displayText=""/>
 
-        <target
-            target="Installing Ant"
-            diskRequirement="@component.size.ant@"
-            defaultValue="true"
-            displayText=""/>
-
         <!-- if windows -->
         <target

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

@@ -178 +178 @@
     </target>
 
-    <target name="Installing Ant">
-
-        <echo>Installing Ant (packages/ant)</echo>
-        <mkdir dir="packages"/>
-        <ant target="extract-component"><property name="component.name" value="ant"/></ant>
-
-        <echo>Set binaries to executable</echo>
-        <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
-
-    </target>
-
-
     <target name="Installing Start Menu Shortcuts">
 

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

@@ -14 +14 @@
     <target name="prepare-components">
         <antcall target="prepare-component"><param name="component" value="core"/></antcall>
-        <antcall target="prepare-component"><param name="component" value="ant"/></antcall>
         <antcall target="prepare-component"><param name="component" value="tomcat"/></antcall>
         <antcall target="prepare-component"><param name="component" value="imagemagick"/></antcall>
@@ -22 +21 @@
     <target name="compress-components">
                 <antcall target="compress-component"><param name="component" value="core"/></antcall>
-                <antcall target="compress-component"><param name="component" value="ant"/></antcall>
                 <antcall target="compress-component"><param name="component" value="tomcat"/></antcall>
                 <antcall target="compress-component"><param name="component" value="imagemagick"/></antcall>