Changeset 28311
- Timestamp:
- 2013-09-25T21:27:04+12:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r28297 r28311 445 445 </condition> 446 446 447 <!-- if we're told to work with gnome-lib, or if there's a gnome-lib-minimal that the user 448 has placed in gs2build/ext, then compile gs2build after sourcing gnome-lib environment --> 449 <condition property="opt.gnomelibext.arg" 450 value="--enable-gnome-lib-ext" else=" "> 451 <or> 452 <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/> 453 <istrue value="${use.gnomelib.ext}"/> 454 <istrue value="${checkout.gnomelib.ext}"/> 455 </or> 456 </condition> 457 447 458 <!-- if you want to disable wvware, do so here: set the value (not else) field to contain minus-minus-disable-wvware --> 448 <condition property="gs2.opt.args" value=" " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">459 <condition property="gs2.opt.args" value="${opt.gnomelibext.arg} " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite"> 449 460 <istrue value="${with.jni}"/> 450 461 </condition> … … 633 644 <chmod dir="${basedir}/bin/script" perm="ugo+rx" 634 645 includes="*.sh,*.pl"/> 635 636 <!-- if the user has set checkout.gnomelib.ext to true, and is using a compiled version of gnome-lib637 (it would have been compiled up by this stage), remind them to source devel.bash before compiling -->638 <condition property="run.source.devel">639 <available file="${basedir}/gs2build/ext/gnome-lib/${os.bin.dir}" type="dir"/>640 </condition>641 <if><bool>642 <and>643 <istrue value="${checkout.gnomelib.ext}"/>644 <istrue value="${run.source.devel}"/>645 </and>646 </bool>647 <!-- This is automatically done now in the gs2build/common-src/packages/configure script if the648 gnomelib.ext directory is detected649 650 <echo>651 *********************************************652 As you have set checkout.gnomelib.ext,653 before running ant install next,654 run source devel.bash from655 ${basedir}/gs2build/ext/gnome-lib656 *********************************************</echo>657 -->658 </if>659 646 </target> 660 647 661 648 <!-- 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 --> 662 <target name="install" depends="init,install-common-src,install-collection-building,install-runtime,install-solr-ext,setup-for-eclipse" 649 <!--before configuring build-src, make sure that gnome-lib is compiled up--> 650 <target name="install" depends="init,compile-gnome-lib,install-common-src,install-collection-building,install-runtime,install-solr-ext,setup-for-eclipse" 663 651 description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/> 664 652 … … 2631 2619 <property name="gnome.lib.compiled.dir" value="${basedir}/gs2build/ext/gnome-lib/${os.bin.dir}"/> 2632 2620 2633 <condition property="gnome.src.lib.present"> 2634 <available file="${gnome.lib.src.dir}" type="dir" /> 2635 </condition> 2636 <condition property="gnome.compiled.lib.present"> 2621 <condition property="gnome.compiled.lib.present" value="true" else="false"> 2637 2622 <available file="${gnome.lib.compiled.dir}" type="dir"/> 2638 2623 </condition> 2639 <condition property="gnome.lib.min.present" >2624 <condition property="gnome.lib.min.present" value="true" else="false"> 2640 2625 <available file="${basedir}/gs2build/ext/gnome-lib-minimal" type="dir" /> 2641 2626 </condition> 2642 2627 2628 <!-- Make sure to checkout gnome-lib if it was not checked out at this stage 2629 since we're instructed to do so in th pre-condition to this target --> 2643 2630 <if> 2644 2631 <bool> 2645 2632 <and> 2646 <!-- <istrue value="${checkout.gnomelib.ext}"/> make sure user wants gnome-lib --> 2647 <not><isset property="${gnome.lib.min.present}"/></not> <!-- no gnome-lib-minimal binary present --> 2633 <istrue value="${checkout.gnomelib.ext}"/> 2634 <not><istrue value="${gnome.lib.min.present}"/></not> 2635 <not><istrue value="${gnome.src.lib.present}"/></not> 2636 </and> 2637 </bool> 2638 <antcall target="checkout-gnome-lib"/> 2639 </if> 2640 2641 <!-- Now check we have the gnome-lib src folder at last --> 2642 <condition property="gnome.src.lib.present" value="true" else="false"> 2643 <available file="${gnome.lib.src.dir}" type="dir" /> 2644 </condition> 2645 2646 <!--<echo>MIN: ${gnome.lib.min.present} 2647 SRC LIB: ${gnome.src.lib.present} 2648 COMPILED: ${gnome.compiled.lib.present}</echo>--> 2649 2650 <if> 2651 <bool> 2652 <and> 2653 <isfalse value="${gnome.lib.min.present}"/> <!-- no gnome-lib-minimal binary present --> 2648 2654 <istrue value="${gnome.src.lib.present}"/> <!-- gnome-lib folder for compilation is present--> 2649 < not><istrue value="${gnome.compiled.lib.present}"/></not> <!-- gnome-lib not yet compiled, so no gnome-lib/os subfolder yet -->2655 <isfalse value="${gnome.compiled.lib.present}"/> <!-- gnome-lib not yet compiled, so no gnome-lib/os subfolder yet --> 2650 2656 </and> 2651 2657 </bool> … … 2666 2672 2667 2673 <antcall target="checkout-gnome-lib"/> 2668 < antcall target="compile-gnome-lib"/>2674 <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src--> 2669 2675 2670 2676 <else>
Note:
See TracChangeset
for help on using the changeset viewer.