greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17123

Show
Ignore:
Timestamp:
2008-09-03 08:52:58 (4 months ago)
Author:
oranfry
Message:

improvement to output of the lirk3 installer build.xml

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r17107 r17123  
    2727 
    2828                <!-- install files --> 
    29                 <echo message="Installing Files"/> 
     29                <echo>Installing Files</echo> 
    3030                <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    3131                        <patternset> 
    32  
    3332                                <include name="bin/**/*"/> 
    3433                                <include name="docs/**/*"/> 
    …… 
    4948                                <include name="README.txt"/> 
    5049                                <include name="server.jar"/> 
    51  
    5250                        </patternset> 
    5351                </unzip> 
    5452                <echo/> 
    5553 
    56                 <!-- rename greenstone3-build.xml back to build.xml --> 
     54                <echo>Renaming greenstone3-build.xml back to build.xml</echo> 
    5755                <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/> 
    5856 
    59  
    60                 <echo message="Setting Binaries to Executable"/> 
     57                <echo>Setting Binaries to Executable</echo> 
    6158                <chmod dir="${installDir}" includes="*.sh" perm="775"/> 
    6259                <chmod dir="${installDir}/bin/script" includes="*" perm="775"/> 
    …… 
    6764                <echo/> 
    6865 
    69                 <!-- change the tomcat ports in build.properties --> 
    70                 <echo message="Changing tomcat ports in build.properties"/> 
     66                <echo>Changing tomcat ports in build.properties</echo> 
    7167                <rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" /> 
    7268                <rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" /> 
    7369 
    74                 <!-- set up global properties --> 
    75                 <echo message="Setting up global properties"/> 
     70                <echo>Setting up global properties</echo> 
    7671                <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/> 
    7772                <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" /> 
    …… 
    7974                <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" /> 
    8075 
    81                 <!-- set up log4j properties--> 
    82                 <echo message="Setting up log4j properties"/> 
     76                <echo>Setting up log4j properties</echo> 
    8377                <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/> 
    8478                <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" /> 
    8579 
    86  
    87                 <!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH (no need anymore)--> 
    88                 <!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo> 
    89                 <exec executable="echo" output="${installDir}/gs3-setup.sh" append="true"> 
    90                         <arg line="export ANT_HOME=${installDir}/packages/ant; export PATH=$ANT_HOME/bin:$PATH;"/> 
    91                 </exec>--> 
    92  
    93                 <!-- delete unneeded files -->       
    94                 <echo message="Deleting some extraneous files"/> 
     80                <echo>Deleting some unneeded files</echo> 
    9581                <delete dir="${installDir}/resources/icons"/> 
    9682                <delete file="${installDir}/resources/*.png"/> 
    9783 
    98                 <echo message="Finished"/> 
     84                <echo>Finished</echo> 
    9985 
    10086        </target> 
    …… 
    10288        <!-- Source --> 
    10389        <target name="install-source-code" depends=""> 
    104                 <echo message="Installing Source Code (src)"/> 
     90 
     91                <echo>Installing Source Code<echo> 
    10592                <mkdir dir="${installDir}/src"/> 
    10693                <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    …… 
    115102 
    116103        <target name="install-java"> 
    117  
    118                 <echo message="Installing bundled java"/> 
    119  
     104                <echo>Installing bundled java</echo> 
    120105                <copy todir="${installDir}/packages/jre"> 
    121106                        <fileset dir="../@java.extracted@"/> 
    122107                </copy> 
    123108                <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>            
    124  
    125109                <echo/> 
    126  
    127110        </target> 
    128111 
    129112        <target name="install-tomcat"> 
    130                 <echo message="Installing Tomcat (packages/tomcat)"/> 
    131                 <!-- extract the files --> 
     113                <echo>Installing Tomcat (packages/tomcat)</echo> 
    132114                <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    133115                        <patternset> 
    …… 
    135117                        </patternset> 
    136118                </unzip> 
    137  
    138                 <!-- change the tomcat ports in tomcats server.xml --> 
    139                 <echo message="Changing tomcat ports tomcat's server.xml"/> 
     119                <echo>Changing tomcat ports tomcat's server.xml</echo> 
    140120                <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/> 
    141121                <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" /> 
    142122                <rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" /> 
    143123                 
    144                 <!-- copy the greenstone3.xml file to tomcat --> 
    145                 <echo message="Copying greenstone3.xml to tomcat directory"/> 
     124                <echo>Copying greenstone3.xml to tomcat directory</echo> 
    146125                <copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/> 
    147126                <rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" /> 
    148127 
    149                 <!-- set binaries to executable --> 
     128                <echo>Setting tomcat binaries to executable</echo> 
    150129                <chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/> 
    151130                <echo/> 
    152  
    153131        </target> 
    154132 
    155133        <target name="install-ant"> 
    156  
    157                 <!-- extract the files --> 
    158                 <echo message="Installing Ant (packages/ant)"/> 
     134                <echo>Installing Ant (packages/ant)</echo> 
    159135                <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    160136                        <patternset> 
    …… 
    162138                        </patternset> 
    163139                </unzip> 
    164  
    165                 <!-- set binaries to executable --> 
     140                <echo>Setting ant binaries to executable</echo> 
    166141                <chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/> 
    167142                <echo/> 
    168143        </target> 
    169144 
    170  
    171  
    172         <target name="cleanuptarget"> 
    173         </target> 
     145        <target name="cleanuptarget"></target> 
    174146         
    175  
    176147</project>