Changeset 28320

Timestamp:

2013-09-26T19:03:02+12:00 (11 years ago)

Author:

ak19

Message:

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

File:

• main/trunk/greenstone3/build.xml (modified) (7 diffs)

main/trunk/greenstone3/build.xml

@@ -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 -->
   <!--before configuring build-src, make sure that gnome-lib is compiled up-->
-  <target name="install" depends="init,compile-gnome-lib,install-common-src,install-collection-building,install-runtime,install-solr-ext,setup-for-eclipse"
+  <target name="install" depends="init,compile-imagemagick,compile-gnome-lib,install-common-src,install-collection-building,install-runtime,install-solr-ext,setup-for-eclipse"
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/>
 
@@ -2542 +2542 @@
 
       <antcall target="checkout-imagemagick"/>
-      <antcall target="compile-imagemagick"/>
+      <!--Compilation of imagemagick now happens during ant install, still before configuring the src code, as before -->
 
       <else>
@@ -2583 +2583 @@
     <property name="imagemagick.compiled.dir" value="${gs2build.home}/ext/imagemagick/${os.bin.dir}"/>
 
-    <condition property="imagemagick.src.present">
+    <condition property="imagemagick.src.present.firstcheck">
       <available file="${imagemagick.src.dir}" type="dir" />
     </condition>
@@ -2593 +2593 @@
     </condition>-->
 
+    <!-- imagemagick will only be checked out if the user set the checkout.imagemagick.ext in build.properties -->
+    <if>
+      <bool>
+    <isfalse value="${imagemagick.src.present.firstcheck}"/>
+      </bool>
+      <antcall target="checkout-imagemagick"/>
+    </if>
+
+    <!-- keep track of whether the imagemagick src is now indeed present. Need to know this for a subsequent test -->
+    <condition property="imagemagick.src.present">
+      <available file="${imagemagick.src.dir}" type="dir" />
+    </condition>
+
     <if>
       <bool>
     <and>
       <istrue value="${imagemagick.src.present}"/> <!-- imagemagick src code is present -->
-      <not><istrue value="${imagemagick.compiled.present}"/></not> <!-- imagemagick src not compiled yet, so no imagemagick/os subfolder yet -->
-      </and>
+      <isfalse value="${imagemagick.compiled.present}"/> <!-- imagemagick src not compiled yet, so no imagemagick/os subfolder yet -->
+    </and>
       </bool>
       <!-- 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}"/>
 
+    <condition property="gnome.src.lib.present.firstcheck" value="true" else="false">
+      <available file="${gnome.lib.src.dir}" type="dir" />
+    </condition>
     <condition property="gnome.compiled.lib.present" value="true" else="false">
       <available file="${gnome.lib.compiled.dir}" type="dir"/>
@@ -2631 +2647 @@
       <bool>
     <and>
-      <istrue value="${checkout.gnomelib.ext}"/>
-      <not><istrue value="${gnome.lib.min.present}"/></not>
-      <not><istrue value="${gnome.src.lib.present}"/></not>
+      <isfalse value="${gnome.lib.min.present}"/>
+      <isfalse value="${gnome.src.lib.present.firstcheck}"/>
     </and>
       </bool>
@@ -2639 +2654 @@
     </if>
 
-    <!-- Now check we have the gnome-lib src folder at last -->
+    <!-- Keep track of whether we have the gnome-lib src folder now. Need to know this for a subsequent test -->
     <condition property="gnome.src.lib.present" value="true" else="false">
       <available file="${gnome.lib.src.dir}" type="dir" />