Changeset 28643 for main/trunk/greenstone3/build.xml

Timestamp:

2013-11-19T14:59:12+13:00 (10 years ago)

Author:

ak19

Message:

Reverting to 28635, but gs2build/build-src/Makefile.in now still sets the SHELL makefile variable so that pushd and source work with dash (Ubuntu Makefiles use dash instead of bash).

File:

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

main/trunk/greenstone3/build.xml

@@ -451 +451 @@
     <or>
       <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/>
-      <istrue value="${checkout.gnomelibmin.ext}"/>
       <istrue value="${use.gnomelib.ext}"/>
       <istrue value="${checkout.gnomelib.ext}"/>
@@ -874 +873 @@
     <available file="${basedir}/common-src" property="common.src.present"/>
     <available file="${basedir}/gs2build" property="gs2build.present"/>
-    <!--<available file="${gnome-lib-dir}" property="gnome-lib.present"/>-->
-    <condition property="gnome-lib.present">
-      <or>
-    <available file="${gnome-lib-dir}" type="dir"/><!--Only set if use.gnomelib is on-->
-    <available file="${basedir}/gs2build/ext/gnome-lib" type="dir"/>
-    <available file="${basedir}/gs2build/ext/gnome-lib-minimal" type="dir"/>
-      </or>
-    </condition>
+    <available file="${gnome-lib-dir}" property="gnome-lib.present"/>
 
     <condition property="tomcat.islocal">
@@ -2712 +2704 @@
     <if>
       <bool>
-    <istrue value="${checkout.gnomelibmin.ext}"/>
+    <istrue value="${checkout.gnomelib.ext}"/>
       </bool>
 
-      <antcall target="checkout-gnome-lib-min"/>
+      <antcall target="checkout-gnome-lib"/>
+      <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src-->
+
       <else>
-
-    <if>
-      <bool>
-        <istrue value="${checkout.gnomelib.ext}"/>
-      </bool>
-      
-      <antcall target="checkout-gnome-lib"/>
-      <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src-->
-      
-      <else>
-        <echo>**** Not preparing gnome-lib:</echo>
-        <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo>
-      </else>
-    </if>
+    <echo>**** Not preparing gnome-lib:</echo>
+    <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo>
       </else>
     </if>
   </target>
 
-  <target name="checkout-gnome-lib-min" depends="init" if="collection.building.enabled" unless="nosvn.mode">
-    <if>
-      <bool>
-    <and>
-      <istrue value="${checkout.gnomelibmin.ext}"/>
-      <not><istrue value="${gnome-lib.present}"/></not>
-    </and>
-      </bool>
-
-      <echo>checking out gnome-lib-minimal</echo>
-      <exec executable="svn" os="${os.unix}">
-    <arg value="export"/>
-    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-linux-x64.tar.gz"/>
-    <arg value="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"/>
-      </exec>
-      
-      <exec executable="tar" os="${os.unix}" dir="${gs2build.home}/ext">
-    <arg value="-xvzf" />
-    <arg value="${gs2build.home}/ext/gnome-lib-minimal.tar.gz" />
-      </exec>
-      <!--<untar compression="gzip" 
-         src="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"
-         dest="${gs2build.home}/ext"/>-->
-
-      <delete file="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"/>
-
-      <else>
-    <echo>gnomelib already exists at ${gnomelib.src.dir}</echo>
-      </else>
-    </if>
-
-  </target>
 
   <target name="checkout-gnome-lib" depends="init" if="collection.building.enabled" unless="nosvn.mode">
@@ -2882 +2832 @@
   </target>
  
-  <target name="configure-build-src" depends="init,checkout-gnome-lib-min" if="collection.building.enabled"
+  <target name="configure-build-src" depends="init" if="collection.building.enabled"
     description="Configure the build-src component">
     <exec executable="${build.src.home}/configure" os="${os.unix}"