Changeset 32310

Show
Ignore:
Timestamp:
30.07.2018 12:51:37 (13 months ago)
Author:
kjdon
Message:

updating build.xml for the new .svn files, which get turned into .in files in resources. names better reflect their purposes

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32153 r32310  
    8484  <if> 
    8585    <bool><not><available file="build.properties"/></not></bool> 
    86     <copy file="build.properties.in" tofile="build.properties"/> 
     86    <copy file="build.properties.svn" tofile="build.properties"/> 
    8787  </if> 
    8888 
     
    715715  <!-- ==================== Primary and Global Targets ============================= --> 
    716716 
    717   <target name="prepare" depends="accept-properties,init,copy-dot-in-files,prepare-core,prepare-packages,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax" 
     717  <target name="prepare" depends="accept-properties,init,copy-dot-svn-files,prepare-core,prepare-packages,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax" 
    718718    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this."> 
    719719 
     
    954954 
    955955    <!--Now write out the url with oaiserver suffix as the baseURL property in OAIConfig.xml--> 
    956     <available file="${basedir}/resources/oai/OAIConfig.xml" property="oaiconfig.present"/> 
     956    <available file="${basedir}/resources/oai/OAIConfig.xml.in" property="oaiconfig.present"/> 
    957957    <antcall target="init-oaiconfig"> 
    958958      <param name="url" value="${url}"/> 
     
    962962  <target name="init-oaiconfig" if="oaiconfig.present"> 
    963963    <echo>Writing out baseURL ${url}oaiserver to ${web.writableclasses}/OAIConfig.xml</echo> 
    964     <copy file="${basedir}/resources/oai/OAIConfig.xml" tofile="${web.writableclasses}/OAIConfig.xml"/> 
     964    <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${web.writableclasses}/OAIConfig.xml"/> 
    965965    <rsr verbosity="1" file="${web.writableclasses}/OAIConfig.xml" pattern="&lt;baseURL&gt;.*&lt;/baseURL&gt;" replacement="&lt;baseURL&gt;${url}oaiserver&lt;/baseURL&gt;" />    
    966966  </target> 
     
    10831083    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/> 
    10841084  </target> 
    1085    
    1086   <target name="copy-dot-in-files" depends="init"  
    1087       description="Copies all resources .in files to version without the .in suffix" > 
    1088     <if><bool><available file="${basedir}/resources/tomcat/greenstone3.xml"/></bool> 
    1089       <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${basedir}/resources/tomcat/greenstone3.xml.backup"  overwrite="true"/> 
     1085 
     1086  <target name="copy-dot-svn-files" depends="init"  
     1087      description="Copies all resources .svn files to .in versions - which are used during cionfigure to generate the runtime versions." > 
     1088    <if><bool><available file="${basedir}/resources/tomcat/greenstone3.xml.in"/></bool> 
     1089      <copy file="${basedir}/resources/tomcat/greenstone3.xml.in" tofile="${basedir}/resources/tomcat/greenstone3.xml.in.backup"  overwrite="true"/> 
    10901090    </if> 
    10911091    
    1092     <copy file="${basedir}/resources/tomcat/greenstone3.xml.in" tofile="${basedir}/resources/tomcat/greenstone3.xml"  overwrite="true"/> 
    1093     <if><bool><available file="${basedir}/resources/tomcat/server_tomcat5.xml"/></bool> 
    1094       <copy file="${basedir}/resources/tomcat/server_tomcat5.xml" tofile="${basedir}/resources/tomcat/server_tomcat5.xml.backup"  overwrite="true"/> 
    1095     </if> 
    1096     <copy file="${basedir}/resources/tomcat/server_tomcat5.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat5.xml"  overwrite="true"/> 
    1097     <if><bool><available file="${basedir}/resources/tomcat/server_tomcat7.xml"/></bool> 
    1098       <copy file="${basedir}/resources/tomcat/server_tomcat7.xml" tofile="${basedir}/resources/tomcat/server_tomcat7.xml.backup"  overwrite="true"/> 
    1099     </if> 
    1100     <copy file="${basedir}/resources/tomcat/server_tomcat7.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat7.xml" overwrite="true"/> 
    1101     <if><bool><available file="${basedir}/resources/tomcat/web.xml"/></bool> 
    1102       <copy file="${basedir}/resources/tomcat/web.xml" tofile="${basedir}/resources/tomcat/web.xml.backup"  overwrite="true"/> 
    1103     </if> 
    1104     <copy file="${basedir}/resources/tomcat/web.xml.in" tofile="${basedir}/resources/tomcat/web.xml"  overwrite="true"/> 
    1105     <if><bool><available file="${basedir}/resources/oai/OAIConfig.xml"/></bool> 
    1106     <copy file="${basedir}/resources/oai/OAIConfig.xml" tofile="${basedir}/resources/oai/OAIConfig.xml.backup"  overwrite="true"/> 
    1107     </if> 
    1108     <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${basedir}/resources/oai/OAIConfig.xml"  overwrite="true"/> 
    1109     <if><bool><available file="${basedir}/resources/cgi/gsdl3site.cfg"/></bool> 
    1110       <copy file="${basedir}/resources/cgi/gsdl3site.cfg" tofile="${basedir}/resources/cgi/gsdl3site.cfg.backup" overwrite="true"/> 
    1111     </if> 
    1112     <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${basedir}/resources/cgi/gsdl3site.cfg" overwrite="true"/> 
    1113     <if><bool><available file="${basedir}/resources/web/global.properties"/></bool> 
    1114     <copy file="${basedir}/resources/web/global.properties" tofile="${basedir}/resources/web/global.properties.backup" overwrite="true"/> 
    1115     </if> 
    1116     <copy file="${basedir}/resources/web/global.properties.in" tofile="${basedir}/resources/web/global.properties" overwrite="true"/> 
    1117     <if><bool><available file="${basedir}/resources/web/log4j.properties"/></bool> 
    1118     <copy file="${basedir}/resources/web/log4j.properties" tofile="${basedir}/resources/web/log4j.properties.backup" overwrite="true"/> 
    1119     </if> 
    1120     <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${basedir}/resources/web/log4j.properties" overwrite="true"/> 
    1121   </target> 
     1092    <copy file="${basedir}/resources/tomcat/greenstone3.xml.svn" tofile="${basedir}/resources/tomcat/greenstone3.xml.in"  overwrite="true"/> 
     1093    <if><bool><available file="${basedir}/resources/tomcat/server_tomcat5.xml.in"/></bool> 
     1094      <copy file="${basedir}/resources/tomcat/server_tomcat5.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat5.xml.in.backup"  overwrite="true"/> 
     1095    </if> 
     1096    <copy file="${basedir}/resources/tomcat/server_tomcat5.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat5.xml.in"  overwrite="true"/> 
     1097    <if><bool><available file="${basedir}/resources/tomcat/server_tomcat7.xml.in"/></bool> 
     1098      <copy file="${basedir}/resources/tomcat/server_tomcat7.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat7.xml.in.backup"  overwrite="true"/> 
     1099    </if> 
     1100    <copy file="${basedir}/resources/tomcat/server_tomcat7.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat7.xml.in" overwrite="true"/> 
     1101    <if><bool><available file="${basedir}/resources/tomcat/web.xml.in"/></bool> 
     1102      <copy file="${basedir}/resources/tomcat/web.xml.in" tofile="${basedir}/resources/tomcat/web.xml.in.backup"  overwrite="true"/> 
     1103    </if> 
     1104    <copy file="${basedir}/resources/tomcat/web.xml.svn" tofile="${basedir}/resources/tomcat/web.xml.in"  overwrite="true"/> 
     1105    <if><bool><available file="${basedir}/resources/oai/OAIConfig.xml.in"/></bool> 
     1106    <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${basedir}/resources/oai/OAIConfig.xml.in.backup"  overwrite="true"/> 
     1107    </if> 
     1108    <copy file="${basedir}/resources/oai/OAIConfig.xml.svn" tofile="${basedir}/resources/oai/OAIConfig.xml.in"  overwrite="true"/> 
     1109    <if><bool><available file="${basedir}/resources/cgi/gsdl3site.cfg.in"/></bool> 
     1110      <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${basedir}/resources/cgi/gsdl3site.cfg.in.backup" overwrite="true"/> 
     1111    </if> 
     1112    <copy file="${basedir}/resources/cgi/gsdl3site.cfg.svn" tofile="${basedir}/resources/cgi/gsdl3site.cfg.in" overwrite="true"/> 
     1113    <if><bool><available file="${basedir}/resources/web/global.properties.in"/></bool> 
     1114    <copy file="${basedir}/resources/web/global.properties.in" tofile="${basedir}/resources/web/global.properties.in.backup" overwrite="true"/> 
     1115    </if> 
     1116    <copy file="${basedir}/resources/web/global.properties.svn" tofile="${basedir}/resources/web/global.properties.in" overwrite="true"/> 
     1117    <if><bool><available file="${basedir}/resources/web/log4j.properties.in"/></bool> 
     1118    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${basedir}/resources/web/log4j.properties.in.backup" overwrite="true"/> 
     1119    </if> 
     1120    <copy file="${basedir}/resources/web/log4j.properties.svn" tofile="${basedir}/resources/web/log4j.properties.in" overwrite="true"/> 
     1121  </target> 
     1122     
    11221123  <!-- ========== Web app Targets ================================ --> 
    11231124   
     
    13531354    <filter token="perlpath" value="${escaped.perl.path}"/> 
    13541355    <filter token="disable.collection.building" value="${disable.collection.building}"/> 
    1355     <copy file="${basedir}/resources/cgi/gsdl3site.cfg" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/> 
    1356     <copy file="${basedir}/resources/web/global.properties" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/> 
    1357     <copy file="${basedir}/resources/web/log4j.properties" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/> 
     1356    <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/> 
     1357    <copy file="${basedir}/resources/web/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/> 
     1358    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/> 
    13581359    <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool> 
    13591360      <!-- uncomment the writablehome properties --> 
     
    14951496  <target name="configure-tomcat-local" depends="init,perl-for-building" if="tomcat.islocal"> 
    14961497    <!-- re-setup the server.xml file --> 
    1497     <copy file="${basedir}/resources/tomcat/server_tomcat${tomcat.version.major}.xml" 
     1498    <copy file="${basedir}/resources/tomcat/server_tomcat${tomcat.version.major}.xml.in" 
    14981499        tofile="${packages.home}/tomcat/conf/server.xml" overwrite="true"> 
    14991500      <filterset> 
     
    15231524    <!-- set up the greenstone3 context, it may have a custom name specified in build.properties --> 
    15241525    <if><bool><not><equals arg1="greenstone3" arg2="${greenstone.context}"></equals></not></bool> 
    1525         <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${basedir}/resources/tomcat/${greenstone.context}.xml" overwrite="true"/> 
     1526        <copy file="${basedir}/resources/tomcat/greenstone3.xml.in" tofile="${basedir}/resources/tomcat/${greenstone.context}.xml.in" overwrite="true"/> 
    15261527    </if> 
    1527     <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true"> 
     1528    <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true"> 
    15281529      <filterset> 
    15291530        <filter token="gsdl3webhome" value="${web.home}"/> 
     
    15461547     
    15471548    <!-- set up the greenstone3 web.xml file --> 
    1548     <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true"> 
     1549    <copy file="${basedir}/resources/tomcat/web.xml.in" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true"> 
    15491550      <filterset> 
    15501551    <filter token="perlpath" value="${perl.path}"/>