Changeset 19878

Show
Ignore:
Timestamp:
22.06.2009 15:09:56 (10 years ago)
Author:
kjdon
Message:

deleted all the commented out targets. I have finished my revision of this file (apart from finding bugs...)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r19873 r19878  
    6161  <property name="gs2build.home" value="${basedir}/gs2build"/> 
    6262  <property name="src.packages.home" value="${basedir}/src/packages"/> 
    63   <!-- get rid of one of these --> 
    64  <!-- <property name="gdbm.home" value="${gs2build.home}/common-src/packages/gdbm"/> 
    65   <property name="gdbm.installed.path" value="${gs2build.home}/common-src/packages/gdbm"/>  --> 
    6663  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 
     64 
    6765  <property file="build.properties"/> 
    6866  <if><bool><available file="${user.home}/build.properties"/></bool> 
     
    7876  <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/> 
    7977  <property name="axis.dir.version" value="axis-1_2_1"/> 
    80 <!--  <property name="gdbm.version" value="gdbm-1.8.3"/>--> 
    8178  <property name="sqlite.targz.version" value="sqlite-amalgamation-3.5.9.tar.gz"/> 
    8279 
     
    9895  <!-- jni libraries and java wrappers go here --> 
    9996  <property name="lib.jni" value="${basedir}/lib/jni"/> 
     97 
     98  <!-- other jar files needed for installation (but not runtime) go here --> 
    10099  <property name="lib.java" value="${basedir}/lib/java"/> 
    101100   
     
    115114  <property name="svn.root" value="http://svn.greenstone.org"/> 
    116115 
    117   <!--  <property name="cvs.root" value=":pserver:cvs_anon@cvs.scms.waikato.ac.nz:2402/usr/local/global-cvs/gsdl-src"/> --> 
    118   <!-- catalina home is set to tomcat basedir is already installed, otherwise 
     116  <!-- catalina home is set to tomcat basedir if already installed, otherwise 
    119117  use greenstone's tomcat --> 
    120118  <condition property="catalina.home" value="${tomcat.installed.path}">  
     
    126124    </and> 
    127125  </condition> 
     126   
    128127  <property name="catalina.home" value="${packages.home}/tomcat"/> 
    129128 
     
    143142      <os family="unix"/> 
    144143      <not> 
    145   <os family="mac"/> 
     144    <os family="mac"/> 
    146145      </not> 
    147146    </and> 
    148147  </condition> 
     148   
    149149  <condition property="current.os.ismac"> 
    150150    <os family="mac"/> 
     
    153153  <condition property="current.os.iswindows"> 
    154154    <os family="windows"/> 
     155  </condition> 
     156 
     157  <condition property="collection.building.disabled"> 
     158    <isset property="disable.collection.building"/> 
    155159  </condition> 
    156160 
     
    160164    </not> 
    161165  </condition> 
    162   <condition property="collection.building.disabled"> 
    163     <isset property="disable.collection.building"/> 
    164   </condition> 
    165  
     166   
    166167  <condition property="collection.building.enabled.windows"> 
    167168    <and> 
     
    178179  </condition> 
    179180   
    180 <!--  <condition property="independent-indexers"> 
    181     <isset property="disable.collection.building"/> 
    182   </condition>--> 
    183  
    184181  <!-- where is search4j tool --> 
    185182  <condition property="search4j.exec" value="bin/search4j.exe">  
     
    190187   
    191188  <!-- ============= Base dirs for each package and component ============ --> 
    192 <!--  <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>--> 
    193189  <property name="src.gsdl3.home" value="${src.home}/org/greenstone/gsdl3"/> 
    194190  <property name="anttasks.home" value="${src.home}/org/greenstone/anttasks"/> 
     
    196192  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/> 
    197193   
    198 <!--  <condition property="indexers.home" value="${basedir}/src/packages/indexers"> 
    199     <isset property="disable.collection.building"/> 
    200   </condition>--> 
    201    
    202 <!--  <condition property="indexers.home" value="${gs2build.home}/common-src/indexers"> 
    203     <not> 
    204       <isset property="disable.collection.building"/> 
    205     </not> 
    206   </condition>--> 
    207  
    208194  <condition property="common.src.home" value="${gs2build.home}/common-src"> 
    209195    <not> 
     
    267253      <include name="*.jar"/> 
    268254    </fileset> 
    269     <!-- Include the axis jar files --> 
    270     <!--<fileset dir="${basedir}/comms/soap/axis/lib"> 
    271       <include name="*.jar"/> 
    272     </fileset>--> 
    273255     
    274256    <!-- include the jar files from the source packages --> 
     
    317299    <echo>os.unix: ${os.unix}</echo> 
    318300  </target> 
     301 
     302 
    319303  <!-- ==================== Primary and Global Targets ============================= --> 
    320  
    321   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? --> 
    322304 
    323305  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax" 
     
    332314 
    333315  <!-- install-common-src and install-collection-building are mutually exclusive and either one or the other will be done depending on whether collection building is enabled or not --> 
    334   <target name="new-install" depends="init,install-common-src,install-collection-building,install-runtime" 
     316  <target name="install" depends="init,install-common-src,install-collection-building,install-runtime" 
    335317    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/> 
    336318 
    337   <target name="install-common-src" depends="init,configure-common-src,compile-common-src,install-auxiliary-jar-files,install-jni-files"/> 
    338   <target name="install-collection-building" depends="init,configure-collection-building,compile-collection-building,install-auxiliary-jar-files,install-jni-files"/> 
    339   <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core"/> 
    340    
    341     
    342 <!--  <target name="install" depends="init,install-indexer-files,configure,configure-c++,compile" --> 
    343   <target name="install" depends="init,configure,configure-c++,compile"  
    344     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/> 
    345    
    346   <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-collection-building,svnupdate-web" 
     319  <target name="install-common-src" depends="init,configure-common-src,compile-common-src,install-auxiliary-jar-files,install-jni-files" 
     320    description="Install (configure, compile, install) only the common-src package (shared code from Greenstone 2. This is only needed when not installing the collection building package." /> 
     321 
     322  <target name="install-collection-building" depends="init,configure-collection-building,compile-collection-building,install-auxiliary-jar-files,install-jni-files" 
     323    description="Install (configure, compile, install) the Greenstone 2 collection building package." /> 
     324 
     325  <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core" 
     326    description="Install (configure, compile, install) the runtime system. Needs either common-src or collection-building to have been installed first." /> 
     327     
     328  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-common-src,svnupdate-collection-building,svnupdate-web" 
    347329    description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/> 
    348  
    349   <target name="configure-c++" depends="init,configure-packages,configure-core,configure-collection-building" 
    350     description="Configure any C/C+/+ package code and collection-building code if necessary"/> 
    351330   
    352331  <target name="configure" depends="init,configure-tomcat,configure-web" 
    353     description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/> 
    354  
    355   <target name="clean" depends="init,clean-packages,clean-core,clean-collection-building" 
    356     description="Remove all old compiled code. Includes core, packages and collection-building if necessary"/> 
    357    
    358   <target name="distclean" depends="init,distclean-packages,clean-core,distclean-collection-building" 
    359     description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes core, packages, collection-building as necessary"/> 
    360    
    361   <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-collection-building" 
    362     description="Compile all the source code, includes core, packages and collection-building if necessary. Copy jar files and executables to their correct places."/> 
    363    
    364   <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile"  
    365     description="Update (thru Subversion) all the source (including core, packages and collection-building), then clean, configure and recompile. To do this without any SVN updates, run it like 'ant -Dnosvn.mode=yes update'"/> 
     332    description="Configure the installation (not the C++ code). Includes setting up config files. Should be re-run if you change the build.properties file."/> 
     333 
     334  <target name="clean" depends="init,clean-packages,clean-core,clean-common-src,clean-collection-building" 
     335    description="Remove all old compiled code. Includes runtime and collection-building if necessary"/> 
     336   
     337  <target name="distclean" depends="init,distclean-packages,clean-core,distclean-common-src,distclean-collection-building" 
     338    description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes runtime and collection-building as necessary"/> 
     339   
     340  <target name="update" depends="init,svnupdate,clean,install" 
     341    description="Update (thru Subversion) all the source (including common-src or collection-building, and runtime), then clean, and re-install. To do this without any SVN updates, run it like 'ant -Dnosvn.mode=yes update'"/> 
    366342 
    367343  <target name="start" depends="init,start-tomcat" 
     
    409385      proxy.host=${proxy.host} 
    410386      proxy.port=${proxy.port} 
     387      disable.collection.building=${disable.collection.building} 
    411388      If these are not acceptable, please change them and rerun this target. Continue [y/n]? /> 
    412389    </input> 
     
    430407    <fail if="java.too.old" message="You need Java 1.4 or greater to run Greenstone 3"/> 
    431408     
    432     <available file="${indexers.home}" property="indexers.present"/> 
    433409    <available file="${basedir}/gli" property="gli.present"/> 
     410    <available file="${basedir}/common-src" property="common.src.present"/> 
    434411    <available file="${basedir}/gs2build" property="gs2build.present"/> 
    435412 
     
    442419     
    443420    <echo>tomcat.port = ${tomcat.port}</echo> 
    444     <echo>gli.present = ${gli.present}</echo>  
    445     <echo>gs2build.present = ${gs2build.present}</echo> 
    446     <!-- gsdl2.installed.path appears not to be set, so wrap in if block --> 
    447     <if> 
    448         <bool><isset property="gsdl2.installed.path"/></bool> 
    449         <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo> 
    450     </if> 
    451421 
    452422    <condition property="proxy.present"> 
     
    457427    </condition> 
    458428 
    459     <condition property="need.macos.extra"> 
    460       <and> 
    461         <isset property="current.os.ismac"/> 
    462         <not><isset property="disable.collection.building"/></not> 
    463       </and> 
    464     </condition> 
    465429  </target> 
    466430 
     
    472436      </or> 
    473437    </condition> 
     438     
    474439    <getuserandpassword message="Using proxy: ${proxy.host}:${proxy.port}" if="ask.user" username="${proxy.user}" userproperty="proxy.username" pwordproperty="proxy.password"/> 
    475440    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/> 
     
    550515  <target name="gs2mgdemo-prepare" if="collect.dir"> 
    551516    <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/> 
    552     <fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}"> 
    553       <include name="${import.zip}"/> 
    554       <include name="${metadata.zip}"/> 
    555       <include name="${index.zip}"/> 
    556     </fileset> 
    557517 
    558518    <condition property="gs2mgdemo.present"> 
     
    570530    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${metadata.zip}" /> 
    571531    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${index.zip}" /> 
    572     <!--Don't delete the zips, else doing an svn update will get them all over again.--> 
    573     <!--<delete><fileset refid="gs2mgdemofiles"/></delete>--> 
    574532    <echo>collection gs2mgdemo installed</echo> 
    575533  </target> 
     
    578536    <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/> 
    579537  
    580     <fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}"> 
    581       <include name="${import.zip}"/> 
    582       <include name="${metadata.zip}"/> 
    583       <include name="${index.zip}"/> 
    584     </fileset> 
    585  
    586538    <condition property="gs2mgppdemo.present"> 
    587539      <and> 
     
    597549    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${metadata.zip}" /> 
    598550    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${index.zip}" /> 
    599     <!--<delete><fileset refid="gs2mgppdemofiles"/></delete>--> 
    600551    <echo>collection gs2mgppdemo installed</echo> 
    601552  </target>     
     
    603554  <target name="gberg-prepare" if="collect.dir"> 
    604555    <property name="gberg.dir" value="${collect.dir}/gberg"/> 
    605     <fileset id="gbergfiles" dir="${gberg.dir}"> 
    606       <include name="index/${index.zip}"/> 
    607     </fileset> 
    608556    <available file="${gberg.dir}/index/${index.zip}" property="gberg.present"/> 
    609557  </target> 
    610558 
    611559  <target name="gberg-install" if="gberg.present" depends="gberg-prepare"> 
    612     <unzip dest="${gberg.dir}/index"> 
    613       <fileset refid="gbergfiles"/> 
    614     </unzip> 
    615     <!--<delete><fileset refid="gbergfiles"/></delete>--> 
     560    <unzip dest="${gberg.dir}/index" src="${gberg.dir}/index/${index.zip}"/> 
    616561    <echo>collection gberg installed</echo> 
    617562  </target> 
    618  
    619   <!-- 
    620   <target name="prepare-collections" depends="init"> 
    621     <property name="collect.dir" value="${web.home}/sites/localsite/collect"/> 
    622     <unzip src="${collect.dir}/gs2mgdemo/import.zip"  
    623       dest="${collect.dir}/gs2mgdemo"/> 
    624     <unzip src="${collect.dir}/gs2mgdemo/metadata.zip"  
    625       dest="${collect.dir}/gs2mgdemo"/> 
    626     <unzip src="${collect.dir}/gs2mgdemo/index/index.zip"  
    627       dest="${collect.dir}/gs2mgdemo/index"/> 
    628     <delete file="${collect.dir}/gs2mgdemo/import.zip"/> 
    629     <delete file="${collect.dir}/gs2mgdemo/metadata.zip"/> 
    630     <delete file="${collect.dir}/gs2mgdemo/index/index.zip"/> 
    631     
    632     <unzip src="${collect.dir}/gs2mgppdemo/import.zip"  
    633       dest="${collect.dir}/gs2mgppdemo"/> 
    634     <unzip src="${collect.dir}/gs2mgppdemo/metadata.zip"  
    635       dest="${collect.dir}/gs2mgppdemo"/> 
    636     <unzip src="${collect.dir}/gs2mgppdemo/index/index.zip"  
    637       dest="${collect.dir}/gs2mgppdemo/index"/> 
    638     <delete file="${collect.dir}/gs2mgppdemo/import.zip"/> 
    639     <delete file="${collect.dir}/gs2mgppdemo/metadata.zip"/> 
    640     <delete file="${collect.dir}/gs2mgppdemo/index/index.zip"/> 
    641    
    642     <unzip src="${collect.dir}/gberg/index/index.zip"  
    643       dest="${collect.dir}/gberg/index"/> 
    644     <delete file="${collect.dir}/gberg/index/index.zip"/> 
    645   </target> 
    646   --> 
    647563 
    648564  <target name="configure-web" depends="init" 
     
    1017933  <!-- core targets refer to the core gsdl3 java src --> 
    1018934   
    1019   <target name="prepare-core" unless="nosvn.mode"> 
    1020     <!-- just get rid of empty directories--> 
    1021     <svn> 
    1022       <update dir="."  revision="${branch.revision}"/> 
    1023     </svn> 
    1024   </target> 
     935  <target name="prepare-core"/> 
    1025936   
    1026937  <target name="configure-core"/> 
     
    1030941   
    1031942  <target name="svnupdate-core" unless="nosvn.mode"> 
    1032  
    1033943    <svn> 
    1034       <update dir="." recurse="false" revision="${branch.revision}"/> 
     944      <update dir="." revision="${branch.revision}"/> 
    1035945    </svn> 
    1036  
    1037     <svn> 
    1038       <update dir="bin" revision="${branch.revision}"/> 
    1039       <update dir="comms" revision="${branch.revision}"/> 
    1040       <update dir="dist-resources" revision="${branch.revision}"/> 
    1041       <update dir="docs" revision="${branch.revision}"/> 
    1042       <update dir="lib" revision="${branch.revision}"/> 
    1043       <update dir="resources" revision="${branch.revision}"/> 
    1044       <update dir="src" revision="${branch.revision}"/> 
    1045       <update dir="winutil" revision="${branch.revision}"/> 
    1046     </svn> 
    1047  
    1048946  </target> 
    1049947 
    1050948  <target name="clean-core" 
    1051949    description="Clean only the Greenstone core"> 
     950    <!-- should this delete the gsdl3.jar from web/WEB-INF?? --> 
    1052951    <delete dir="${build.home}"/> 
    1053952  </target> 
     
    11441043  <target name="prepare-packages" depends="init"/> 
    11451044   
    1146 <!--  <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nosvn.mode"> 
    1147     <svn> 
    1148       <checkout url="${svn.root}/indexers/${branch.path}" destPath="${src.packages.home}/indexers" revision="${branch.revision}"/> 
    1149     </svn> 
    1150   </target> 
    1151    
    1152   <target name="prepare-indexers" depends="init" if="independent-indexers" unless="indexers.present"> 
    1153     <antcall target="checkout-indexers"/> 
    1154   </target> --> 
    1155  
    11561045  <target name="update-packages" depends="init,svnupdate-packages,configure-packages,clean-packages,compile-packages" 
    11571046    description="Update only the source packages"/> 
     
    11631052  </target> 
    11641053   
    1165 <!--  <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers" add common-src here instead.--> 
    11661054  <target name="configure-packages" depends="init,configure-javagdbm"  
    11671055    description="Configure only the packages."/> 
    11681056   
    1169  <!-- <target name="configure-javagdbm" depends="configure-gdbm,compile-gdbm">--> 
    11701057  <target name="configure-javagdbm"> 
    11711058    <echo> 
     
    11801067  </target> 
    11811068 
    1182   <!-- Message from oran. I removed the condition from this line becuase it meant 
    1183   the indexers would only be configured if collection building was DISabled. 
    1184   Shouldn't they be configured when collection building is ENabled? --> 
    1185  
    1186 <!--  <target name="configure-indexers" depends="init" if="independent-indexers"> 
    1187   <target name="configure-indexers" depends="init"> 
    1188     <echo>Configuring Indexers</echo> 
    1189     <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}"> 
    1190       <arg value="- -prefix=${basedir}"/> 
    1191       <arg value="- -libdir=${lib.jni}"/> 
    1192     </exec>           
    1193   </target> --> 
    1194  
    11951069  <target name="clean-packages" depends="init,clean-javagdbm" description="Clean only the packages"/> 
    11961070 
     
    12021076  </target> 
    12031077   
    1204 <!--  <target name="clean-indexers" depends="init" if="independent-indexers"> 
    1205     <exec executable="make" os="${os.unix}" 
    1206       dir="${indexers.home}"> 
    1207       <arg value="clean"/> 
    1208     </exec> 
    1209     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" 
    1210       dir="${indexers.home}"> 
    1211       <arg value="clean"/> 
    1212     </exec> 
    1213   </target> --> 
    1214  
    12151078  <target name="distclean-packages" depends="init,distclean-javagdbm" description="Distclean only the packages"/> 
    12161079 
     
    12221085  </target> 
    12231086   
    1224 <!--  <target name="distclean-indexers" depends="init" if="independent-indexers"> 
    1225     <exec executable="make" os="${os.unix}" 
    1226       dir="${indexers.home}"> 
    1227       <arg value="distclean"/> 
    1228     </exec> 
    1229     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" 
    1230       dir="${indexers.home}"> 
    1231       <arg value="clean"/> 
    1232     </exec> 
    1233   </target>--> 
    1234    
    12351087  <target name="compile-packages" description="Compile only the source packages"> 
    12361088     
    1237     <!-- javagdbm --> 
     1089    <!-- unix: --> 
    12381090    <echo>compile javagdbm</echo> 
    12391091    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/> 
     
    12561108    <!-- Search4j --> 
    12571109    <antcall target="compile-search4j"/> 
    1258  
    1259     <!-- Indexers --> 
    1260  
    1261     <!-- this may be in gs2build - we will be recompiling, but never mind --> 
    1262 <!--    <echo>Indexers: make (from ${indexers.home})</echo> 
    1263     <exec executable="make" os="${os.unix}" dir="${indexers.home}"/> 
    1264     <echo>Indexers: make install</echo> 
    1265     <exec executable="make" os="${os.unix}" dir="${indexers.home}"> 
    1266       <arg value="install"/> 
    1267     </exec> 
    1268  
    1269     <echo>Indexers: make</echo> 
    1270     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 
    1271       <arg value="all"/> 
    1272     </exec> 
    1273     <echo>Indexers: make install</echo> 
    1274     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 
    1275       <arg value="install"/> 
    1276     </exec> 
    1277 --> 
    1278     <!-- install the jar and jni files --> 
    1279   <!--  <echo>Install the indexers' jar and jni files</echo> 
    1280     <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 
    1281     <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 
    1282     <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 
    1283     <antcall target="install-jni-files"/>--> 
    12841110  </target> 
    12851111 
     
    13421168  <target name="svnupdate-common-src" depends="init" if="collection.building.disabled" unless="nosvn.mode"> 
    13431169    <svn> 
    1344       <update dir="{common.src.home}" revision="${branch.revision}"/> 
     1170      <update dir="${common.src.home}" revision="${branch.revision}"/> 
    13451171    </svn>     
    13461172  </target> 
    13471173 
    1348   <target name="prepare-common-src" depends="init" if="collection.building.disabled"> 
     1174  <target name="prepare-common-src" depends="init" if="collection.building.disabled" unless="common.src.present"> 
    13491175    <antcall target="checkout-common-src"/> 
    13501176    <antcall target="unzip-windows-packages"/> 
     
    13611187    <exec executable="${common.src.home}/configure" os="${os.unix}" 
    13621188      dir="${common.src.home}"> 
    1363       <arg value="--prefix=${common.src.home}"/> <!-- ??? --> 
     1189      <arg value="--prefix=${common.src.home}"/> <!-- what value to use?? --> 
    13641190    </exec> 
    13651191  </target> 
     
    13861212    <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 
    13871213    </exec> 
    1388     <exec executable="make" os="${os.unix}" dir="${common.src.home}"> 
    1389       <arg value="install"/> 
    1390     </exec> 
    13911214    <!-- windows: --> 
    13921215    <exec executable="nmake" dir="${common.src.home}" os="${os.windows}"> 
    13931216      <arg value="/f"/> 
    13941217      <arg value="win32.mak"/> 
    1395     </exec> 
    1396     <exec executable="nmake" dir="${common.src.home}" os="${os.windows}"> 
    1397       <arg value="/f"/> 
    1398       <arg value="win32.mak"/> 
    1399       <arg value="install"/> 
    14001218    </exec> 
    14011219  </target> 
     
    15151333    <antcall target="get-windows-binaries"/> 
    15161334    <antcall target="delete-winbin"/> 
    1517     <!--<antcall target="get-macos-extra"/>--> 
    15181335  </target> 
    15191336 
     
    15591376      dest="${common.src.home}/indexers/packages/windows/iconv"/> 
    15601377  </target> 
    1561    
    1562  
    1563 <!--  <target name="install-indexer-files" depends="init" unless="indexers.present"> 
    1564     <copy todir="${indexers.home}"> 
    1565       <fileset dir="${gs2build.home}/common-src/indexers" /> 
    1566     </copy> 
    1567     <chmod file="${indexers.home}/configure" perm="a+x"/> 
    1568   </target> --> 
    1569  
    1570 <!--  <target name="rename-gs2build-files" depends="gs2build-edit-setup-bat" if="collection.building.enabled"/>--> 
    1571    
     1378     
    15721379  <target name="gs2build-edit-setup-bat" if="collection.building.enabled.windows"> 
    15731380    <!-- we want a windows path in the setup.bat file --> 
     
    16281435    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${gs2build.home}/bin/java"/> 
    16291436    <antcall target="install-gs2build-indexers-windows"/> 
    1630     <!--<antcall target="install-macos-extra"/>--> 
    16311437  </target> 
    16321438