Ignore:
Timestamp:
2008-06-12T16:54:24+12:00 (16 years ago)
Author:
oranfry
Message:

made the install-ant and install-tomcat options work

File:
1 edited

Legend:

Unmodified
Added
Removed

  • release-kits/lirk3/installer/build.xml

    r15205 r15973  
    1515    <!-- custom tasks -->
    1616    <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
    17 
    18     <condition property="bundled.java.exists">
    19         <available file="../@java.extracted@/bin/java"/>
    20     </condition>
    21 
    2217
    2318    <target name="install-core-components" depends="">
    … …  
    5651        <echo/>
    5752
    58         <echo message="Installing Packages (packages)"/>
    59         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip>
    60         <echo/>
    61 
    6253        <echo message="Installing Resources (resources)"/>
    6354        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="resources/**/*"/></patternset></unzip>
    … …  
    8273        <chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
    8374        <chmod dir="${installDir}/bin" includes="*" perm="775"/>
    84         <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
    85         <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
    8675        <chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/>
    8776        <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
    … …  
    9382        <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
    9483        <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
    95 
    96         <!-- change the tomcat ports in tomcats server.xml -->
    97         <echo message="Changing tomcat ports tomcat's server.xml"/>
    98         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
    99         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
    100         <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
    101        
    102         <!-- copy the greenstone3.xml file to tomcat -->
    103         <echo message="Copying greenstone3.xml to tomcat directory"/>
    104         <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
    105         <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
    10684
    10785        <!-- set up global properties -->
    … …  
    145123
    146124    <target name="install-java">
     125
    147126        <echo message="Installing bundled java"/>
     127
    148128        <copy todir="${installDir}/packages/jre">
    149129            <fileset dir="../@java.extracted@"/>
    150130        </copy>
    151131        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     132
     133        <echo/>
     134
    152135    </target>
    153136
    154137    <target name="install-tomcat">
    155         <echo message="Installing Tomcat"/>
     138        <echo message="Installing Tomcat (packages/tomcat)"/>
     139        <!-- extract the files -->
     140        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/tomcat/**/*"/></patternset></unzip>
     141
     142        <!-- change the tomcat ports in tomcats server.xml -->
     143        <echo message="Changing tomcat ports tomcat's server.xml"/>
     144        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
     145        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
     146        <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
     147       
     148        <!-- copy the greenstone3.xml file to tomcat -->
     149        <echo message="Copying greenstone3.xml to tomcat directory"/>
     150        <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
     151        <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
     152
     153        <!-- set binaries to executable -->
     154        <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
     155        <echo/>
     156
    156157    </target>
    157158
    158159    <target name="install-ant">
    159         <echo message="Installing Ant"/>
     160
     161        <!-- extract the files -->
     162        <echo message="Installing Ant (packages/ant)"/>
     163        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/ant/**/*"/></patternset></unzip>
     164
     165        <!-- set binaries to executable -->
     166        <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
     167        <echo/>
    160168    </target>
    161169
Note: See TracChangeset for help on using the changeset viewer.