Changeset 28636

Show
Ignore:
Timestamp:
18.11.2013 21:45:29 (6 years ago)
Author:
ak19
Message:

As part of getting diffcol to work with GS3, GS3 needs to be compiled up, for which the following changes were made: 1. Modifications to build.properties and build.xml to checkout and set up gnome-lib-minimal and still pass the --enable-gnome-lib-ext flag to build-src/configure.in. 2. Fixing up build-src/Makefile.in so that sourcing gnome-lib can work on Ubuntu, which uses dash instead of bash and so does not recongise pushd/popd or source (only the dot). To get the build-src Makefile to work on Ubuntu, Makefile.in now sets the SHELL to be bin/bash for running make, and then executes the commands for sourcing gnome-lib in the same subshell as the one which compiles up build-src subdirs like wvware.

Location:
main/trunk
Files:
3 modified

Legend:

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

    r28308 r28636  
    2626srcdir = @srcdir@ 
    2727 
     28SHELL=/bin/bash 
    2829PACKAGE = @PACKAGE@ 
    2930VERSION = @VERSION@ 
     
    5859 
    5960all: 
    60     if test $(ENABLE_GNOMELIB_EXT) = 1; then \ 
    61       if test -d ../ext/gnome-lib; then \ 
    62         pushd ../ext/gnome-lib && source ./devel.bash && popd; \ 
    63       elif test -d ../ext/gnome-lib-minimal; then \ 
    64         pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \ 
    65       fi; \ 
    66     fi 
    6761    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 
    6862      echo making $@ in $$odir; \ 
    69       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
     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; \ 
    7072    done 
    7173 
  • main/trunk/greenstone3/build.properties.in

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

    r28613 r28636  
    451451    <or> 
    452452      <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/> 
     453      <istrue value="${checkout.gnomelibmin.ext}"/> 
    453454      <istrue value="${use.gnomelib.ext}"/> 
    454455      <istrue value="${checkout.gnomelib.ext}"/> 
     
    873874    <available file="${basedir}/common-src" property="common.src.present"/> 
    874875    <available file="${basedir}/gs2build" property="gs2build.present"/> 
    875     <available file="${gnome-lib-dir}" property="gnome-lib.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> 
    876884 
    877885    <condition property="tomcat.islocal"> 
     
    27042712    <if> 
    27052713      <bool> 
    2706     <istrue value="${checkout.gnomelib.ext}"/> 
     2714    <istrue value="${checkout.gnomelibmin.ext}"/> 
    27072715      </bool> 
    27082716 
    2709       <antcall target="checkout-gnome-lib"/> 
    2710       <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src--> 
    2711  
     2717      <antcall target="checkout-gnome-lib-min"/> 
    27122718      <else> 
    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> 
     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> 
    27152733      </else> 
    27162734    </if> 
    27172735  </target> 
    27182736 
     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> 
    27192769 
    27202770  <target name="checkout-gnome-lib" depends="init" if="collection.building.enabled" unless="nosvn.mode"> 
     
    28322882  </target> 
    28332883  
    2834   <target name="configure-build-src" depends="init" if="collection.building.enabled" 
     2884  <target name="configure-build-src" depends="init,checkout-gnome-lib-min" if="collection.building.enabled" 
    28352885    description="Configure the build-src component"> 
    28362886    <exec executable="${build.src.home}/configure" os="${os.unix}"