Changeset 28044 for main/trunk/greenstone3/build.xml
- Timestamp:
- 2013-08-14T18:49:59+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r28043 r28044 737 737 </exec> 738 738 739 <exec executable="${gs2build.home}/bin/windows/which" os ="${os.windows}" spawn="false" outputproperty="full.perl.path">739 <exec executable="${gs2build.home}/bin/windows/which" osfamily="windows" spawn="false" outputproperty="full.perl.path"> 740 740 <arg value="perl" /> 741 741 </exec> … … 1068 1068 1069 1069 <target name="prepare-solr-ext" depends="init" > 1070 <exec executable="ant.bat" os ="${os.windows}" dir="${solr-ext.home}" spawn="false">1070 <exec executable="ant.bat" osfamily="windows" dir="${solr-ext.home}" spawn="false"> 1071 1071 <arg value="add-service"/> 1072 1072 </exec> … … 1351 1351 <env key="FEDORA_HOME" path="${fedora.home}"/> 1352 1352 </exec> 1353 <exec executable="${catalina.home}/bin/catalina.bat" os ="${os.windows}" dir="${catalina.home}/bin" spawn="true">1353 <exec executable="${catalina.home}/bin/catalina.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="true"> 1354 1354 <arg value="jpda" /> 1355 1355 <arg value="start" /> … … 1392 1392 1393 1393 <!-- using osfamily instead of testing os against os.windows list of recognised windows versions 1394 so that future windows versions are included. See http://simonharrer.wordpress.com/tag/osfamily/ --> 1394 so that future windows versions are included. See http://simonharrer.wordpress.com/tag/osfamily/ 1395 Can't use the osfamily test for linux-type machines as a group since osfamily=unix is separate from osfamily=mac, 1396 see http://ant-contrib.sourceforge.net/tasks/tasks/osfamily.html --> 1395 1397 1396 1398 <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> … … 1553 1555 </exec> 1554 1556 1555 <exec executable="cmd" os ="${os.windows}" dir="${catalina.home}/logs" spawn="false">1557 <exec executable="cmd" osfamily="windows" dir="${catalina.home}/logs" spawn="false"> 1556 1558 <arg line="/c echo. > catalina.out"/> 1557 1559 </exec> 1558 <exec executable="cmd" os ="${os.windows}" dir="${web.writablehome}/logs" spawn="false">1560 <exec executable="cmd" osfamily="windows" dir="${web.writablehome}/logs" spawn="false"> 1559 1561 <arg line="/c echo. > greenstone.log"/> 1560 1562 </exec> 1561 <exec executable="cmd" os ="${os.windows}" dir="${web.writablehome}/logs" spawn="false">1563 <exec executable="cmd" osfamily="windows" dir="${web.writablehome}/logs" spawn="false"> 1562 1564 <arg line="/c echo. > server.log"/> 1563 1565 </exec> … … 2071 2073 the "install" argument to copy the gdbmjava.dll into the correct location. --> 2072 2074 <echo>Windows: compile javagdbm</echo> 2073 <exec executable="${javagdbm.home}/winMake.bat" os ="${os.windows}" dir="${javagdbm.home}" failonerror="true">2075 <exec executable="${javagdbm.home}/winMake.bat" osfamily="windows" dir="${javagdbm.home}" failonerror="true"> 2074 2076 <env key="GSDL3SRCHOME" path="${basedir}"/> 2075 2077 </exec> 2076 <exec executable="${javagdbm.home}/winMake.bat" os ="${os.windows}" dir="${javagdbm.home}" failonerror="true">2078 <exec executable="${javagdbm.home}/winMake.bat" osfamily="windows" dir="${javagdbm.home}" failonerror="true"> 2077 2079 <env key="GSDL3SRCHOME" path="${basedir}"/> 2078 2080 <arg value="install"/> … … 2237 2239 </if> 2238 2240 <!-- windows: --> 2239 <exec executable="nmake" dir="${common.src.home}" os ="${os.windows}" failonerror="true">2241 <exec executable="nmake" dir="${common.src.home}" osfamily="windows" failonerror="true"> 2240 2242 <arg value="/f"/> 2241 2243 <arg value="win32.mak"/> … … 2252 2254 </if> 2253 2255 <!-- windows: distclean = clean + remove configure products (remove makefiles). But on Windows there is no removing makefiles, so we just call clean --> 2254 <exec executable="nmake" dir="${common.src.home}" os ="${os.windows}" failonerror="true">2256 <exec executable="nmake" dir="${common.src.home}" osfamily="windows" failonerror="true"> 2255 2257 <arg value="/f"/> 2256 2258 <arg value="win32.mak"/> … … 2265 2267 </exec> 2266 2268 <!-- windows: --> 2267 <exec executable="nmake" dir="${common.src.home}" os ="${os.windows}" failonerror="true">2269 <exec executable="nmake" dir="${common.src.home}" osfamily="windows" failonerror="true"> 2268 2270 <arg value="/f"/> 2269 2271 <arg value="win32.mak"/> … … 2311 2313 2312 2314 <!-- windows: --> 2313 <exec executable="nmake" dir="${common.src.home}" os ="${os.windows}" failonerror="true">2315 <exec executable="nmake" dir="${common.src.home}" osfamily="windows" failonerror="true"> 2314 2316 <arg value="/f"/> 2315 2317 <arg value="win32.mak"/> … … 2405 2407 resolveExecutable="true" failonerror="true"/> 2406 2408 <!-- windows --> 2407 <exec executable="clean.bat" os ="${os.windows}" dir="${gli.home}"2409 <exec executable="clean.bat" osfamily="windows" dir="${gli.home}" 2408 2410 resolveExecutable="true" failonerror="true"/> 2409 2411 </target> … … 2420 2422 resolveExecutable="true" failonerror="true"/> 2421 2423 <!-- windows --> 2422 <exec executable="makegli.bat" os ="${os.windows}" dir="${gli.home}" resolveExecutable="true" failonerror="true"/>2424 <exec executable="makegli.bat" osfamily="windows" dir="${gli.home}" resolveExecutable="true" failonerror="true"/> 2423 2425 <!--remote gli--> 2424 <exec executable="makejar.bat" os ="${os.windows}" dir="${gli.home}"2426 <exec executable="makejar.bat" osfamily="windows" dir="${gli.home}" 2425 2427 resolveExecutable="true" failonerror="true"/> 2426 2428 <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> … … 2438 2440 <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.home}/lib"/> 2439 2441 </exec> 2440 <exec executable="${basedir}/gli/gli.bat" os ="${os.windows}" dir="${basedir}/gli" spawn="true">2442 <exec executable="${basedir}/gli/gli.bat" osfamily="windows" dir="${basedir}/gli" spawn="true"> 2441 2443 <env key="GSDL3PATH" path="${basedir}"/> 2442 2444 <env key="GSDLPATH" path="${gs2build.home}"/> … … 2695 2697 </if> 2696 2698 <!-- windows: --> 2697 <exec executable="nmake" dir="${build.src.home}" os ="${os.windows}" failonerror="true">2699 <exec executable="nmake" dir="${build.src.home}" osfamily="windows" failonerror="true"> 2698 2700 <arg value="/f"/> 2699 2701 <arg value="win32.mak"/> … … 2712 2714 </if> 2713 2715 <!-- windows: distclean = clean + remove configure products (remove makefiles). But on Windows there is no removing makefiles, so we just call clean --> 2714 <exec executable="nmake" dir="${build.src.home}" os ="${os.windows}" failonerror="true">2716 <exec executable="nmake" dir="${build.src.home}" osfamily="windows" failonerror="true"> 2715 2717 <arg value="/f"/> 2716 2718 <arg value="win32.mak"/> … … 2741 2743 2742 2744 <!-- run the setup script --> 2743 <!-- <exec executable="${compile.windows.c++.setup}" os ="${os.windows}" failonerror="true"/>-->2745 <!-- <exec executable="${compile.windows.c++.setup}" osfamily="windows" failonerror="true"/>--> 2744 2746 <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant--> 2745 <exec executable="nmake" dir="${build.src.home}" os ="${os.windows}" failonerror="true">2747 <exec executable="nmake" dir="${build.src.home}" osfamily="windows" failonerror="true"> 2746 2748 <arg value="/f"/> 2747 2749 <arg value="win32.mak"/> 2748 2750 <arg value="GSDLHOME=${gs2build.home}"/> 2749 2751 </exec> 2750 <exec executable="nmake" dir="${build.src.home}" os ="${os.windows}" failonerror="true">2752 <exec executable="nmake" dir="${build.src.home}" osfamily="windows" failonerror="true"> 2751 2753 <arg value="/f"/> 2752 2754 <arg value="win32.mak"/>
Note:
See TracChangeset
for help on using the changeset viewer.