Changeset 14604

Show
Ignore:
Timestamp:
05.10.2007 11:12:11 (12 years ago)
Author:
oranfry
Message:

brought important changes across from 3.03 branch, mostly version number stuff. namely r14565:14566, r14569:14570, r14573:14576, r14579:14580

Location:
greenstone3/trunk
Files:
2 modified
1 copied

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r14597 r14604  
    2222    <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpath="${basedir}/lib/java/anttasks.jar"/> 
    2323    <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 
     24    <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpath="${basedir}/lib/java/anttasks.jar"/> 
    2425 
    2526 
     
    7576  <property name="app.name"      value="greenstone3"/> 
    7677  <property name="app.path"      value="/${app.name}"/> 
    77   <property name="app.version"   value="3.03"/> 
     78 
     79 
     80  <!-- version number stuff --> 
     81 
     82  <!-- app.version defaults to trunk --> 
     83  <condition property="app.version" value="trunk"> 
     84    <not><isset property="app.version"/></not> 
     85  </condition> 
     86 
     87    <!-- determine the 'branch path' --> 
     88  <condition property="branch.path" value="trunk"> 
     89    <equals arg1="${app.version}" arg2="trunk" /> 
     90  </condition> 
     91  <condition property="branch.path" value="branches/${app.version}"> 
     92    <not><equals arg1="${app.version}" arg2="trunk" /></not> 
     93  </condition> 
     94 
    7895 
    7996  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 
     
    475492    <filter token="tomcat.server" value="${tomcat.server}"/> 
    476493    <filter token="tomcat.port" value="${tomcat.port}"/> 
    477     <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.classes}/global.properties" filtering="true" overwrite="true"/>  
    478     <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.classes}/log4j.properties" filtering="true" overwrite="true"/>  
     494    <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.classes}/global.properties" filtering="true" overwrite="true"/> 
     495    <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.classes}/log4j.properties" filtering="true" overwrite="true"/> 
    479496    <chmod file="${web.classes}/global.properties" perm="600"/> 
    480497    <chmod file="${web.classes}/log4j.properties" perm="600"/> 
     
    872889<!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> --> 
    873890    <svn> 
    874         <checkout url="${svn.root}/indexers/trunk" dest="${src.packages.home}/indexers"/> 
     891        <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers"/> 
    875892    </svn> 
    876893  </target> 
     
    10421059 
    10431060  <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 
    1044 <!--  <target name="checkout-gs2build" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> --> 
    10451061    <echo>checking out gs2build</echo> 
    10461062        <!-- svn checkouts --> 
    10471063        <svn> 
    10481064            <!-- perllib --> 
    1049             <checkout url="${svn.root}/gsdl/trunk/perllib" destPath="gs2build/perllib"/> 
     1065            <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib"/> 
    10501066 
    10511067            <!-- selected packages --> 
    1052             <checkout url="${svn.root}/gsdl/trunk/packages/cpan" destPath="gs2build/packages/cpan"/> 
    1053             <checkout url="${svn.root}/gsdl/trunk/packages/expat" destPath="gs2build/packages/expat"/> 
    1054             <checkout url="${svn.root}/gsdl/trunk/packages/html-tidy" destPath="gs2build/packages/html-tidy"/> 
    1055             <checkout url="${svn.root}/gsdl/trunk/packages/isis-gdl" destPath="gs2build/packages/isis-gdl"/> 
    1056             <checkout url="${svn.root}/gsdl/trunk/packages/kea" destPath="gs2build/packages/kea"/> 
    1057             <checkout url="${svn.root}/gsdl/trunk/packages/pdftohtml" destPath="gs2build/packages/pdftohtml"/> 
    1058             <checkout url="${svn.root}/gsdl/trunk/packages/rtftohtml" destPath="gs2build/packages/rtftohtml"/> 
    1059             <checkout url="${svn.root}/gsdl/trunk/packages/w3mir" destPath="gs2build/packages/w3mir"/> 
    1060             <checkout url="${svn.root}/gsdl/trunk/packages/wget" destPath="gs2build/packages/wget"/> 
    1061             <checkout url="${svn.root}/gsdl/trunk/packages/windows" destPath="gs2build/packages/windows"/> 
    1062             <checkout url="${svn.root}/gsdl/trunk/packages/wv" destPath="gs2build/packages/wv"/> 
    1063             <checkout url="${svn.root}/gsdl/trunk/packages/xlhtml" destPath="gs2build/packages/xlhtml"/> 
    1064             <checkout url="${svn.root}/gsdl/trunk/packages/yaz" destPath="gs2build/packages/yaz"/> 
     1068            <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan"/> 
     1069            <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat"/> 
     1070            <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy"/> 
     1071            <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl"/> 
     1072            <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea"/> 
     1073            <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml"/> 
     1074            <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml"/> 
     1075            <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir"/> 
     1076            <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget"/> 
     1077            <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows"/> 
     1078            <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv"/> 
     1079            <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml"/> 
     1080            <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz"/> 
    10651081             
    10661082            <!-- some of src (db2txt hashfile phind txt2db) --> 
    1067             <checkout url="${svn.root}/gsdl/trunk/src/db2txt" destPath="gs2build/src/db2txt"/> 
    1068             <checkout url="${svn.root}/gsdl/trunk/src/hashfile" destPath="gs2build/src/hashfile"/> 
    1069             <checkout url="${svn.root}/gsdl/trunk/src/phind" destPath="gs2build/src/phind"/> 
    1070             <checkout url="${svn.root}/gsdl/trunk/src/txt2db" destPath="gs2build/src/txt2db"/> 
     1083            <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt"/> 
     1084            <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile"/> 
     1085            <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind"/> 
     1086            <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db"/> 
    10711087 
    10721088            <!-- bin --> 
    1073             <checkout url="${svn.root}/gsdl/trunk/bin/script" destPath="gs2build/bin/script"/> 
     1089            <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script"/> 
    10741090 
    10751091            <!-- mappings --> 
    1076             <checkout url="${svn.root}/gsdl/trunk/mappings" destPath="gs2build/mappings"/> 
     1092            <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings"/> 
    10771093 
    10781094            <!-- etc/packages --> 
    1079             <checkout url="${svn.root}/gsdl/trunk/etc/packages" destPath="gs2build/etc/packages"/> 
     1095            <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages"/> 
    10801096     
    10811097            <!-- collect --> 
    1082             <checkout url="${svn.root}/gsdl/trunk/collect/modelcol" destPath="gs2build/collect/modelcol"/> 
     1098            <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol"/> 
    10831099 
    10841100            <!-- gs2build-extra --> 
     
    10861102 
    10871103            <!-- indexers --> 
    1088             <checkout url="${svn.root}/indexers/trunk" destPath="gs2build/indexers"/> 
     1104            <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers"/> 
    10891105 
    10901106 
     
    10941110        <!-- some files from lib --> 
    10951111        <mkdir dir="gs2build/lib"/> 
    1096         <get src="${svn.root}/gsdl/trunk/lib/text_t.h" dest="gs2build/lib/text_t.h"/> 
    1097         <get src="${svn.root}/gsdl/trunk/lib/text_t.cpp" dest="gs2build/lib/text_t.cpp"/> 
    1098         <get src="${svn.root}/gsdl/trunk/lib/gsdlconf.h" dest="gs2build/lib/gsdlconf.h"/> 
     1112        <get src="${svn.root}/gsdl/${branch.path}/lib/text_t.h" dest="gs2build/lib/text_t.h"/> 
     1113        <get src="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" dest="gs2build/lib/text_t.cpp"/> 
     1114        <get src="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" dest="gs2build/lib/gsdlconf.h"/> 
    10991115 
    11001116        <!-- some files from etc --> 
    1101         <get src="${svn.root}/gsdl/trunk/etc/marctodc.txt" dest="gs2build/etc/marctodc.txt"/> 
    1102         <get src="${svn.root}/gsdl/trunk/etc/dc2marc-mapping.xml" dest="gs2build/etc/dc2marc-mapping.xml"/> 
    1103         <get src="${svn.root}/gsdl/trunk/etc/dc2marc.xsl" dest="gs2build/etc/dc2marc.xsl"/> 
    1104         <get src="${svn.root}/gsdl/trunk/etc/qdc2marc-mapping.xml" dest="gs2build/etc/qdc2marc-mapping.xml"/> 
     1117        <get src="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" dest="gs2build/etc/marctodc.txt"/> 
     1118        <get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" dest="gs2build/etc/dc2marc-mapping.xml"/> 
     1119        <get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" dest="gs2build/etc/dc2marc.xsl"/> 
     1120        <get src="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" dest="gs2build/etc/qdc2marc-mapping.xml"/> 
    11051121 
    11061122        <!-- some files from the gsdl root directory --> 
    1107         <get src="${svn.root}/gsdl/trunk/setup.bash" dest="gs2build/setup.bash"/> 
    1108         <get src="${svn.root}/gsdl/trunk/config.sub" dest="gs2build/config.sub"/> 
    1109         <get src="${svn.root}/gsdl/trunk/config.guess" dest="gs2build/config.guess"/> 
    1110         <get src="${svn.root}/gsdl/trunk/config.h.in" dest="gs2build/config.h.in"/> 
    1111         <get src="${svn.root}/gsdl/trunk/configtest.pl" dest="gs2build/configtest.pl"/> 
    1112         <get src="${svn.root}/gsdl/trunk/install-sh" dest="gs2build/install-sh"/> 
    1113         <get src="${svn.root}/gsdl/trunk/acconfig.h" dest="gs2build/acconfig.h"/> 
    1114         <get src="${svn.root}/gsdl/trunk/aclocal.m4" dest="gs2build/aclocal.m4"/> 
    1115         <get src="${svn.root}/gsdl/trunk/WIN32cfg.h" dest="gs2build/WIN32cfg.h"/> 
     1123        <get src="${svn.root}/gsdl/${branch.path}/setup.bash" dest="gs2build/setup.bash"/> 
     1124        <get src="${svn.root}/gsdl/${branch.path}/config.sub" dest="gs2build/config.sub"/> 
     1125        <get src="${svn.root}/gsdl/${branch.path}/config.guess" dest="gs2build/config.guess"/> 
     1126        <get src="${svn.root}/gsdl/${branch.path}/config.h.in" dest="gs2build/config.h.in"/> 
     1127        <get src="${svn.root}/gsdl/${branch.path}/configtest.pl" dest="gs2build/configtest.pl"/> 
     1128        <get src="${svn.root}/gsdl/${branch.path}/install-sh" dest="gs2build/install-sh"/> 
     1129        <get src="${svn.root}/gsdl/${branch.path}/acconfig.h" dest="gs2build/acconfig.h"/> 
     1130        <get src="${svn.root}/gsdl/${branch.path}/aclocal.m4" dest="gs2build/aclocal.m4"/> 
     1131        <get src="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" dest="gs2build/WIN32cfg.h"/> 
    11161132 
    11171133    </target> 
     
    12271243    <echo>checking out gli</echo> 
    12281244    <svn> 
    1229         <checkout url="${svn.root}/gli/trunk" destPath="gli"/> 
     1245        <checkout url="${svn.root}/gli/${branch.path}" destPath="gli"/> 
    12301246    </svn> 
    12311247  </target> 
     
    12911307    <!-- gli --> 
    12921308    <property name="gli.home" value="${basedir}/gli"/> 
     1309 
     1310        <!-- change the version number --> 
     1311        <rsr file="${gli.home}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${app.version}&quot;"/> 
    12931312    <!-- linux --> 
    1294     <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" 
    1295       resolveExecutable="true"/> 
     1313    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/> 
    12961314     <!--remote gli--> 
    12971315     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 
    12981316      resolveExecutable="true"/> 
    12991317    <!-- windows --> 
    1300     <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" 
    1301       resolveExecutable="true"/> 
     1318    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/> 
    13021319    <!--remote gli--> 
    13031320     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 
  • greenstone3/trunk/src/java/org/greenstone/anttasks/RegexSearchReplace.java

    r14575 r14604  
    7070                line = line.replaceAll( pattern, replacement); 
    7171                out.write(line); 
     72                out.newLine(); 
    7273            } 
    7374            //close them both up