Changeset 28320

Show
Ignore:
Timestamp:
26.09.2013 19:03:02 (6 years ago)
Author:
ak19
Message:

Like gnome-lib, imagemagick is now also compiled up during ant install instead of ant prepare

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r28311 r28320  
    648648  <!-- 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 --> 
    649649  <!--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" 
    651651    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/> 
    652652 
     
    25422542 
    25432543      <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 --> 
    25452545 
    25462546      <else> 
     
    25832583    <property name="imagemagick.compiled.dir" value="${gs2build.home}/ext/imagemagick/${os.bin.dir}"/> 
    25842584 
    2585     <condition property="imagemagick.src.present"> 
     2585    <condition property="imagemagick.src.present.firstcheck"> 
    25862586      <available file="${imagemagick.src.dir}" type="dir" /> 
    25872587    </condition> 
     
    25932593    </condition>--> 
    25942594 
     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 
    25952608    <if> 
    25962609      <bool> 
    25972610    <and> 
    25982611      <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       </and> 
     2612      <isfalse value="${imagemagick.compiled.present}"/> <!-- imagemagick src not compiled yet, so no imagemagick/os subfolder yet --> 
     2613    </and> 
    26012614      </bool> 
    26022615      <!-- then compile it. Only necessary for mac/linux, since windows has a stable working binary of imagemagick --> 
     
    26192632    <property name="gnome.lib.compiled.dir" value="${basedir}/gs2build/ext/gnome-lib/${os.bin.dir}"/> 
    26202633 
     2634    <condition property="gnome.src.lib.present.firstcheck" value="true" else="false"> 
     2635      <available file="${gnome.lib.src.dir}" type="dir" /> 
     2636    </condition> 
    26212637    <condition property="gnome.compiled.lib.present" value="true" else="false"> 
    26222638      <available file="${gnome.lib.compiled.dir}" type="dir"/> 
     
    26312647      <bool> 
    26322648    <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}"/> 
    26362651    </and> 
    26372652      </bool> 
     
    26392654    </if> 
    26402655 
    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 --> 
    26422657    <condition property="gnome.src.lib.present" value="true" else="false"> 
    26432658      <available file="${gnome.lib.src.dir}" type="dir" />