Ignore:
Timestamp:
2008-03-28T12:43:46+13:00 (14 years ago)
Author:
oranfry
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk3/installer/build.xml

    r14982 r15142  
    44-->
    55
    6 <project name="Installation" default="" basedir="${basedir}">
     6<project name="Installation" default="">
    77
    88    <!-- this is required to pick up the properties generated during the install pages -->
     
    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
    1722
    1823    <target name="default" depends="">
     
    7681        <chmod dir="${installDir}" includes="*.sh" perm="775"/>
    7782        <chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
     83        <chmod dir="${installDir}/bin" includes="*" perm="775"/>
    7884        <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
     85        <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
    7986        <chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/>
    8087        <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
     
    110117        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    111118
    112         <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH -->
    113         <echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
     119
     120        <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH (no need anymore)-->
     121        <!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
    114122        <exec executable="echo" output="${installDir}/gs3-setup.sh" append="true">
    115123            <arg line="export ANT_HOME=${installDir}/packages/ant; export PATH=$ANT_HOME/bin:$PATH;"/>
    116         </exec>
     124        </exec>-->
    117125
    118126        <!-- delete unneeded files -->     
     127        <echo message="Deleting some extraneous files"/>
    119128        <delete dir="${installDir}/resources/icons"/>
    120129        <delete file="${installDir}/resources/*.png"/>
     130
     131        <echo message="Finished"/>
    121132
    122133    </target>
     
    133144    </target>
    134145
    135     <target name="cleanuptarget">
     146    <target name="install-bundled-java" depends="" if="bundled.java.exists">
     147        <echo message="Installing bundled java"/>
     148        <copy todir="${installDir}/packages/jre">
     149            <fileset dir="../@java.extracted@"/>
     150        </copy>
     151        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     152    </target>
     153
     154    <target name="cleanuptarget" depends="install-bundled-java">
    136155    </target>
    137156   
Note: See TracChangeset for help on using the changeset viewer.