Changeset 23849
- Timestamp:
- 2011-04-05T11:40:25+12:00 (13 years ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.properties.in
r23808 r23849 19 19 # uncomment if you don't want to have collection building enabled 20 20 #disable.collection.building=true 21 # 22 # uncomment (and edit) if you want to control where perl is found 23 #perl.path=/usr/bin 21 24 22 25 ## Greenstone 3 server program options -
main/trunk/greenstone3/build.xml
r23847 r23849 75 75 <!-- get properties from the environment --> 76 76 <property environment="env"/> 77 78 <!-- uses perl.path if set in build.properties, otherwise try for 79 environment variable PERLPATH, and failing that assumes 'perl' 80 is on environment PATH --> 81 <if><bool><isset property="env.PERLPATH"/></bool> 82 <property name="perl.path" value="${env.PERLPATH}"/> 83 </if> 84 85 <!-- full.perl.path is for pretty-printing only, e.g. used in target "start" --> 86 <if><bool><isset property="perl.path"/></bool> 87 <property name="full.perl.path" value="${perl.path}${file.separator}perl"/> 88 <else> 89 <property name="full.perl.path" value="perl (will use the enviroment variable PATH to find this executable)"/> 90 </else> 91 </if> 77 92 78 93 <!-- get the filesets defining components and executables --> … … 558 573 <echo>Tomcat: ${catalina.home}</echo> 559 574 <echo>Java : ${java.home}</echo> 575 <if><bool><available file="${build.src.home}"/></bool> 576 <echo>Perl : ${full.perl.path}</echo> 577 </if> 560 578 <echo>URL : http://${tomcat.server}:${tomcat.port}${app.path}/</echo> 561 579 <!-- assuming that index.html is not needed here --> … … 575 593 <echo message=" Execute 'ant -projecthelp' for a list of targets."/> 576 594 <echo message=" Execute 'ant -help' for Ant help."/> 577 <echo>To install Greenstone3, run '${install-command}'. 578 There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option. 579 To log the output, use the '-logfile build.log' option. 580 The README.txt file has more information about the ant targets and install process. 595 <echo> 596 To install Greenstone3, run '${install-command}'. 597 There are properties defined in build.properties. The install 598 process will ask you if these properties are set correctly. 599 To avoid this prompt, use the '-Dproperties.accepted=yes' 600 option. 601 To log the output, use the '-logfile build.log' option. 602 The README.txt file has more information about the ant targets 603 and install process. 581 604 </echo> 582 605 </target> … … 961 984 <!--<env key="GSDLOS" value="linux"/> do we need this?? --> 962 985 <env key="GSDL3HOME" value="${basedir}"/> 986 <env key="PERLPATH" value="${perl.path}"/> 963 987 <env key="PATH" path="${tomcat.path}"/> 964 988 <env key="CATALINA_OPTS" value="${catalina.opts}"/> … … 972 996 <env key="GSDLOS" value="windows"/> 973 997 <env key="GSDL3HOME" value="${basedir}"/> 998 <env key="PERLPATH" value="${perl.path}"/> 974 999 <env key="Path" path="${tomcat.path}"/> 975 1000 <env key="PATH" path="${tomcat.path}"/> … … 1436 1461 1437 1462 <!-- windows: just the java stuff. Calling without the "compile" argument first will run winMake.bat with "all" which will then perform both the compile AND link targets in jni/win32.mak (thereby also generating gdbmjava.dll). Then we run the same command with the "install" argument to copy the gdbmjava.dll into the correct location. --> 1438 <echo>Windows: compile javagdbm (java only)</echo>1463 <echo>Windows: compile javagdbm</echo> 1439 1464 <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true" /> 1440 1465 <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true"> 1466 <!-- <env key="GSDLHOME" path="${gs2build.home}"/> --> 1441 1467 <arg value="install"/> 1442 1468 </exec>
Note:
See TracChangeset
for help on using the changeset viewer.