Changeset 15142 for release-kits/lirk3/installer

Timestamp:

2008-03-28T12:43:46+13:00 (16 years ago)

Author:

oranfry

Message:

changes to the wrapper and installer logic, and a few changes to init and compile stuff

Location:

release-kits/lirk3/installer

Files:

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

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

@@ -15 +15 @@
             type="input"
             name="intro"
-            displayText="绿宝石蜯件">
+            displayText="Welcome to the Greenstone3 installer">
     </page>
 
@@ -34 +34 @@
         <directory
                 property="installDir"
-                defaultValue="/research/oranfry/sandbox/Greenstone3.03a"
-                defaultValueWin="${env.ProgramFiles}\Greenstone3"
+                defaultValue="/usr/local/Greenstone-@version@"
+                defaultValueWin="${env.ProgramFiles}\Greenstone-@version@"
                 displayText="Select an installation directory"
                 create="true"/>
@@ -45 +45 @@
         <comment name="tomcatportsdescription" displayText="Please select the ports which the web server (Apache Tomcat) will use  will use. It is usually safe to accept the defaults by just clicking Next. The exception is when you are running other services on these ports - if this is the case, select some free ports and click Next."/>
 
+        <text property="tomcat.server" defaultValue="localhost" displayText="Tomcat Server"/>
         <text property="tomcat.port" defaultValue="8080" displayText="Tomcat Port"/>
         <text property="tomcat.shutdown.port" defaultValue="8005" displayText="Tomcat Shutdown Port"/>
+
     </page>
 
@@ -54 +56 @@
             name="selector"
             displayText="Components to install">
-        <comment
-                name="choosecomponents"
-                displayText="Choose the components you want to install"
-                bold="true"/>
-        <target
-            displayText="Core components"
-            target="default"
-            defaultValue="true"
-            force="true"/>
-        
-        <target
-            displayText="Source code"
-            target="tgsrc"
-            defaultValue="false"/>
-        
+
+        <comment name="choosecomponents" displayText="Choose the components you want to install" bold="true"/>
+        <target displayText="Core components" target="default" defaultValue="true" force="true"/>
+        <target displayText="Source code" target="tgsrc" defaultValue="false"/>
+
     </page>
 

release-kits/lirk3/installer/build.xml

@@ -4 +4 @@
 -->
 
-<project name="Installation" default="" basedir="${basedir}">
+<project name="Installation" default="">
 
     <!-- this is required to pick up the properties generated during the install pages -->
@@ -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="default" depends="">
@@ -76 +81 @@
         <chmod dir="${installDir}" includes="*.sh" perm="775"/>
         <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"/>
@@ -110 +117 @@
         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
 
-        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH -->
-        <echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
+
+        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH (no need anymore)-->
+        <!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
         <exec executable="echo" output="${installDir}/gs3-setup.sh" append="true">
             <arg line="export ANT_HOME=${installDir}/packages/ant; export PATH=$ANT_HOME/bin:$PATH;"/>
-        </exec>
+        </exec>-->
 
         <!-- delete unneeded files -->      
+        <echo message="Deleting some extraneous files"/>
         <delete dir="${installDir}/resources/icons"/>
         <delete file="${installDir}/resources/*.png"/>
+
+        <echo message="Finished"/>
 
     </target>
@@ -133 +144 @@
     </target>
 
-    <target name="cleanuptarget">
+    <target name="install-bundled-java" depends="" if="bundled.java.exists">
+        <echo message="Installing bundled java"/>
+        <copy todir="${installDir}/packages/jre">
+            <fileset dir="../@java.extracted@"/>
+        </copy>
+        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
+    </target>
+
+    <target name="cleanuptarget" depends="install-bundled-java">
     </target>