Changeset 28643

Show
Ignore:
Timestamp:
19.11.2013 14:59:12 (6 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).

Location:
main/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/Makefile.in

    r28636 r28643  
    2626srcdir = @srcdir@ 
    2727 
    28 SHELL=/bin/bash 
     28SHELL = /bin/bash 
    2929PACKAGE = @PACKAGE@ 
    3030VERSION = @VERSION@ 
     
    5959 
    6060all: 
     61    if test $(ENABLE_GNOMELIB_EXT) = 1; then \ 
     62      if test -d ../ext/gnome-lib; then \ 
     63        pushd ../ext/gnome-lib && source ./devel.bash && popd; \ 
     64      elif test -d ../ext/gnome-lib-minimal; then \ 
     65        pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \ 
     66      fi; \ 
     67    fi 
    6168    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 
    6269      echo making $@ in $$odir; \ 
    63       if test $(ENABLE_GNOMELIB_EXT) = 1; then \ 
    64         if test -d ../ext/gnome-lib; then \ 
    65           (pushd ../ext/gnome-lib && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    66         elif test -d ../ext/gnome-lib-minimal; then \ 
    67           (pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    68         fi; \ 
    69       else \ 
    70         (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    71       fi; \ 
     70      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    7271    done 
    7372 
  • main/trunk/greenstone3/build.properties.in

    r28636 r28643  
    9696## and if compiling imagemagick 
    9797## These extensions should be in the [gsdl3home]/gs2build/ext directory 
    98 #checkout.gnomelibmin.ext=true 
    9998#checkout.gnomelib.ext=true 
    10099#checkout.imagemagick.ext=true 
  • main/trunk/greenstone3/build.xml

    r28636 r28643  
    451451    <or> 
    452452      <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/> 
    453       <istrue value="${checkout.gnomelibmin.ext}"/> 
    454453      <istrue value="${use.gnomelib.ext}"/> 
    455454      <istrue value="${checkout.gnomelib.ext}"/> 
     
    874873    <available file="${basedir}/common-src" property="common.src.present"/> 
    875874    <available file="${basedir}/gs2build" property="gs2build.present"/> 
    876     <!--<available file="${gnome-lib-dir}" property="gnome-lib.present"/>--> 
    877     <condition property="gnome-lib.present"> 
    878       <or> 
    879     <available file="${gnome-lib-dir}" type="dir"/><!--Only set if use.gnomelib is on--> 
    880     <available file="${basedir}/gs2build/ext/gnome-lib" type="dir"/> 
    881     <available file="${basedir}/gs2build/ext/gnome-lib-minimal" type="dir"/> 
    882       </or> 
    883     </condition> 
     875    <available file="${gnome-lib-dir}" property="gnome-lib.present"/> 
    884876 
    885877    <condition property="tomcat.islocal"> 
     
    27122704    <if> 
    27132705      <bool> 
    2714     <istrue value="${checkout.gnomelibmin.ext}"/> 
     2706    <istrue value="${checkout.gnomelib.ext}"/> 
    27152707      </bool> 
    27162708 
    2717       <antcall target="checkout-gnome-lib-min"/> 
     2709      <antcall target="checkout-gnome-lib"/> 
     2710      <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src--> 
     2711 
    27182712      <else> 
    2719  
    2720     <if> 
    2721       <bool> 
    2722         <istrue value="${checkout.gnomelib.ext}"/> 
    2723       </bool> 
    2724        
    2725       <antcall target="checkout-gnome-lib"/> 
    2726       <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src--> 
    2727        
    2728       <else> 
    2729         <echo>**** Not preparing gnome-lib:</echo> 
    2730         <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo> 
    2731       </else> 
    2732     </if> 
     2713    <echo>**** Not preparing gnome-lib:</echo> 
     2714    <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo> 
    27332715      </else> 
    27342716    </if> 
    27352717  </target> 
    27362718 
    2737   <target name="checkout-gnome-lib-min" depends="init" if="collection.building.enabled" unless="nosvn.mode"> 
    2738     <if> 
    2739       <bool> 
    2740     <and> 
    2741       <istrue value="${checkout.gnomelibmin.ext}"/> 
    2742       <not><istrue value="${gnome-lib.present}"/></not> 
    2743     </and> 
    2744       </bool> 
    2745  
    2746       <echo>checking out gnome-lib-minimal</echo> 
    2747       <exec executable="svn" os="${os.unix}"> 
    2748     <arg value="export"/> 
    2749     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-linux-x64.tar.gz"/> 
    2750     <arg value="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"/> 
    2751       </exec> 
    2752        
    2753       <exec executable="tar" os="${os.unix}" dir="${gs2build.home}/ext"> 
    2754     <arg value="-xvzf" /> 
    2755     <arg value="${gs2build.home}/ext/gnome-lib-minimal.tar.gz" /> 
    2756       </exec> 
    2757       <!--<untar compression="gzip"  
    2758          src="${gs2build.home}/ext/gnome-lib-minimal.tar.gz" 
    2759          dest="${gs2build.home}/ext"/>--> 
    2760  
    2761       <delete file="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"/> 
    2762  
    2763       <else> 
    2764     <echo>gnomelib already exists at ${gnomelib.src.dir}</echo> 
    2765       </else> 
    2766     </if> 
    2767  
    2768   </target> 
    27692719 
    27702720  <target name="checkout-gnome-lib" depends="init" if="collection.building.enabled" unless="nosvn.mode"> 
     
    28822832  </target> 
    28832833  
    2884   <target name="configure-build-src" depends="init,checkout-gnome-lib-min" if="collection.building.enabled" 
     2834  <target name="configure-build-src" depends="init" if="collection.building.enabled" 
    28852835    description="Configure the build-src component"> 
    28862836    <exec executable="${build.src.home}/configure" os="${os.unix}"