Changeset 15973 for release-kits/lirk3/installer

Timestamp:

2008-06-12T16:54:24+12:00 (16 years ago)

Author:

oranfry

Message:

made the install-ant and install-tomcat options work

Location:

release-kits/lirk3/installer

Files:

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

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

@@ -35 +35 @@
         <comment name="choose-components"/>
 
-        <target target="install-core-components"    defaultValue="true" force="true" displayText="" />
-        <target target="install-java"               defaultValue="true" displayText="" /> <!-- bundled java only -->
-        <target target="install-tomcat"             defaultValue="true" displayText="" />
-        <target target="install-ant"                    defaultValue="true" displayText="" />
-        <target target="install-source-code"        defaultValue="false" displayText="" />
+        <target target="install-core-components"    diskRequirement="50Mb"                          defaultValue="true" displayText="" force="true" />
+        <target target="install-java"               diskRequirement="@component.size.java@" defaultValue="true" displayText="" /> <!-- bundled java only -->
+        <target target="install-tomcat"             diskRequirement="@component.size.tomcat@"   defaultValue="true" displayText="" />
+        <target target="install-ant"                    diskRequirement="@component.size.ant@"      defaultValue="true" displayText="" />
+        <target target="install-source-code"        diskRequirement="10Mb"                          defaultValue="false"    displayText="" />
 
     </page>

release-kits/lirk3/installer/build.xml

@@ -15 +15 @@
     <!-- custom tasks -->
     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
-
-    <condition property="bundled.java.exists">
-        <available file="../@java.extracted@/bin/java"/>
-    </condition>
-
 
     <target name="install-core-components" depends="">
@@ -56 +51 @@
         <echo/>
 
-        <echo message="Installing Packages (packages)"/>
-        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip>
-        <echo/>
-
         <echo message="Installing Resources (resources)"/>
         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="resources/**/*"/></patternset></unzip>
@@ -82 +73 @@
         <chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
         <chmod dir="${installDir}/bin" includes="*" perm="775"/>
-        <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
-        <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
         <chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/>
         <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
@@ -93 +82 @@
         <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
         <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
-
-        <!-- change the tomcat ports in tomcats server.xml -->
-        <echo message="Changing tomcat ports tomcat's server.xml"/>
-        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
-        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
-        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
-        
-        <!-- copy the greenstone3.xml file to tomcat -->
-        <echo message="Copying greenstone3.xml to tomcat directory"/>
-        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
-        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
 
         <!-- set up global properties -->
@@ -145 +123 @@
 
     <target name="install-java">
+
         <echo message="Installing bundled java"/>
+
         <copy todir="${installDir}/packages/jre">
             <fileset dir="../@java.extracted@"/>
         </copy>
         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
+
+        <echo/>
+
     </target>
 
     <target name="install-tomcat">
-        <echo message="Installing Tomcat"/>
+        <echo message="Installing Tomcat (packages/tomcat)"/>
+        <!-- extract the files -->
+        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/tomcat/**/*"/></patternset></unzip>
+
+        <!-- change the tomcat ports in tomcats server.xml -->
+        <echo message="Changing tomcat ports tomcat's server.xml"/>
+        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
+        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
+        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
+        
+        <!-- copy the greenstone3.xml file to tomcat -->
+        <echo message="Copying greenstone3.xml to tomcat directory"/>
+        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
+        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
+
+        <!-- set binaries to executable -->
+        <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
+        <echo/>
+
     </target>
 
     <target name="install-ant">
-        <echo message="Installing Ant"/>
+
+        <!-- extract the files -->
+        <echo message="Installing Ant (packages/ant)"/>
+        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/ant/**/*"/></patternset></unzip>
+
+        <!-- set binaries to executable -->
+        <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
+        <echo/>
     </target>