Changeset 22184
- Timestamp:
- 2010-05-27T11:34:47+12:00 (14 years ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.properties.in
r19932 r22184 47 47 compile.optimize=true 48 48 49 ## should compilation be static?? - used for distributions 49 # Control whether or not JNI bindings are used 50 # e.g. MG, MG++ and GDBM and the like 51 # Setting this false means these components are not available to the install 52 # The expectation is that collections will be build from 100% Java components: 53 # e.g Lucene and JDBM 54 # 55 # Ant 1.7.1 and before only test for *existence* so this needs to be commented 56 # in or out to control whether jni is used or not 57 with.jni=true 58 59 ## Control if compilation of gs2 is static or not. Used, for example, for distributions 60 # Same issue as 'with.jni' for how this gets used in ant 1.7.1 and before 50 61 #compile.static=true 62 51 63 52 64 ## windows c++ compilation -
main/trunk/greenstone3/build.xml
r22101 r22184 218 218 <condition property="static.arg" value="LDFLAGS=-static" else=" "> 219 219 <isset property="compile.static"/> 220 </condition> 221 222 <condition property="gs2.opt.args" value= " " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite"> 223 <istrue value="${with.jni}"/> 224 </condition> 225 <condition property="gs2.compile.target" value="with-jni" else="without-jni"> 226 <istrue value="${with.jni}"/> 227 </condition> 228 <condition property="gs2.install.target" value="install-with-jni" else="install-without-jni"> 229 <istrue value="${with.jni}"/> 230 </condition> 231 <condition property="gs2.windows.enablejni" value="1" else="0"> 232 <istrue value="${with.jni}"/> 220 233 </condition> 221 234 … … 315 328 <!-- mg and mgpp get installed into lib/jni but they may not be there yet 316 329 so we add them in by name --> 330 <!-- *** is there any way to make this optional, based on ${with.jni}? --> 317 331 <pathelement location="${lib.jni}/mg.jar"/> 318 332 <pathelement location="${lib.jni}/mgpp.jar"/> … … 810 824 <env key="CLASSPATH" path="${tomcat.classpath}"/> 811 825 <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}"/> 812 <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here ??-->826 <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here these days ??--> 813 827 <env key="WNHOME" path="${wn.home}"/> 814 828 </exec> … … 1197 1211 description="Configure only the packages."/> 1198 1212 1199 <target name="configure-javagdbm" >1213 <target name="configure-javagdbm" if="with.jni"> 1200 1214 <echo> 1201 1215 Configuring JavaGDBM … … 1228 1242 1229 1243 <target name="compile-packages" description="Compile only the source packages"> 1244 <!-- javagdbm --> 1245 <antcall target="compile-javagdbm"/> 1246 <!-- Search4j --> 1247 <antcall target="compile-search4j"/> 1248 </target> 1249 1250 <target name="compile-javagdbm" description="Compile JavaGDBM" if="with.jni"> 1230 1251 1231 1252 <!-- unix: --> … … 1246 1267 <echo>Install the javagdbm jar file</echo> 1247 1268 <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/> 1248 1249 1250 <!-- Search4j -->1251 <antcall target="compile-search4j"/>1252 1269 </target> 1253 1270 … … 1288 1305 1289 1306 <target name="install-auxiliary-jar-files" depends="init"> 1290 <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 1291 <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 1307 1308 <if> 1309 <bool><available file="${mg.home}/mg.jar"/></bool> 1310 <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 1311 </if> 1312 1313 <if> 1314 <bool><available file="${mgpp.home}/mg.jar"/></bool> 1315 <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 1316 </if> 1317 1292 1318 <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 1293 1319 </target> 1294 1320 1295 <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos" />1321 <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos" if="with.jni"/> 1296 1322 1297 1323 <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac"> … … 1355 1381 <arg value="--prefix=${gs2build.home}"/> <!-- what value to use?? --> 1356 1382 <arg value="--bindir=${gs2build.home}/bin/${os.bin.dir}"/> <!-- what value to use?? --> 1357 <arg value="--enable-jni"/>1383 <arg line="${gs2.opt.args}"/> 1358 1384 <arg line="${static.arg}"/> 1359 1385 </exec> … … 1389 1415 <!-- unix: --> 1390 1416 <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 1391 <arg value=" with-jni"/>1417 <arg value="${gs2.compile.target}"/> 1392 1418 </exec> 1393 1419 <!-- windows: --> … … 1396 1422 <arg value="win32.mak"/> 1397 1423 <arg value="GSDLHOME=${gs2build.home}"/> 1398 <arg value="ENABLE_JNI= 1"/>1399 <arg value="USE_SQLITE=0"/> 1424 <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/> 1425 <arg value="USE_SQLITE=0"/> <!-- Why is this not on by default? --> 1400 1426 </exec> 1401 1427 </target> … … 1431 1457 <!-- unix: --> 1432 1458 <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true"> 1433 <arg value=" install-with-jni"/>1459 <arg value="${gs2.install.target}"/> 1434 1460 </exec> 1435 1461 … … 1439 1465 <arg value="win32.mak"/> 1440 1466 <arg value="install"/> 1441 <arg value="ENABLE_JNI= 1"/>1442 <arg value="USE_SQLITE=0"/> 1467 <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/> 1468 <arg value="USE_SQLITE=0"/> <!-- why is this not on by default? --> 1443 1469 </exec> 1444 1470 … … 1672 1698 dir="${build.src.home}" failonerror="true"> 1673 1699 <arg value="--prefix=${gs2build.home}"/> 1700 <arg line="${gs2.opt.args}"/> 1674 1701 <arg line="${static.arg}"/> 1675 1702 </exec> … … 1882 1909 1883 1910 </project> 1911
Note:
See TracChangeset
for help on using the changeset viewer.