Changeset 28320
- Timestamp:
- 2013-09-26T19:03:02+12:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r28311 r28320 648 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 --> 649 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"650 <target name="install" depends="init,compile-imagemagick,compile-gnome-lib,install-common-src,install-collection-building,install-runtime,install-solr-ext,setup-for-eclipse" 651 651 description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/> 652 652 … … 2542 2542 2543 2543 <antcall target="checkout-imagemagick"/> 2544 < antcall target="compile-imagemagick"/>2544 <!--Compilation of imagemagick now happens during ant install, still before configuring the src code, as before --> 2545 2545 2546 2546 <else> … … 2583 2583 <property name="imagemagick.compiled.dir" value="${gs2build.home}/ext/imagemagick/${os.bin.dir}"/> 2584 2584 2585 <condition property="imagemagick.src.present ">2585 <condition property="imagemagick.src.present.firstcheck"> 2586 2586 <available file="${imagemagick.src.dir}" type="dir" /> 2587 2587 </condition> … … 2593 2593 </condition>--> 2594 2594 2595 <!-- imagemagick will only be checked out if the user set the checkout.imagemagick.ext in build.properties --> 2596 <if> 2597 <bool> 2598 <isfalse value="${imagemagick.src.present.firstcheck}"/> 2599 </bool> 2600 <antcall target="checkout-imagemagick"/> 2601 </if> 2602 2603 <!-- keep track of whether the imagemagick src is now indeed present. Need to know this for a subsequent test --> 2604 <condition property="imagemagick.src.present"> 2605 <available file="${imagemagick.src.dir}" type="dir" /> 2606 </condition> 2607 2595 2608 <if> 2596 2609 <bool> 2597 2610 <and> 2598 2611 <istrue value="${imagemagick.src.present}"/> <!-- imagemagick src code is present --> 2599 < not><istrue value="${imagemagick.compiled.present}"/></not> <!-- imagemagick src not compiled yet, so no imagemagick/os subfolder yet -->2600 2612 <isfalse value="${imagemagick.compiled.present}"/> <!-- imagemagick src not compiled yet, so no imagemagick/os subfolder yet --> 2613 </and> 2601 2614 </bool> 2602 2615 <!-- then compile it. Only necessary for mac/linux, since windows has a stable working binary of imagemagick --> … … 2619 2632 <property name="gnome.lib.compiled.dir" value="${basedir}/gs2build/ext/gnome-lib/${os.bin.dir}"/> 2620 2633 2634 <condition property="gnome.src.lib.present.firstcheck" value="true" else="false"> 2635 <available file="${gnome.lib.src.dir}" type="dir" /> 2636 </condition> 2621 2637 <condition property="gnome.compiled.lib.present" value="true" else="false"> 2622 2638 <available file="${gnome.lib.compiled.dir}" type="dir"/> … … 2631 2647 <bool> 2632 2648 <and> 2633 <istrue value="${checkout.gnomelib.ext}"/> 2634 <not><istrue value="${gnome.lib.min.present}"/></not> 2635 <not><istrue value="${gnome.src.lib.present}"/></not> 2649 <isfalse value="${gnome.lib.min.present}"/> 2650 <isfalse value="${gnome.src.lib.present.firstcheck}"/> 2636 2651 </and> 2637 2652 </bool> … … 2639 2654 </if> 2640 2655 2641 <!-- Now check we have the gnome-lib src folder at last -->2656 <!-- Keep track of whether we have the gnome-lib src folder now. Need to know this for a subsequent test --> 2642 2657 <condition property="gnome.src.lib.present" value="true" else="false"> 2643 2658 <available file="${gnome.lib.src.dir}" type="dir" />
Note:
See TracChangeset
for help on using the changeset viewer.