Changeset 28636
- Timestamp:
- 2013-11-18T21:45:29+13:00 (10 years ago)
- Location:
- main/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/build-src/Makefile.in
r28308 r28636 26 26 srcdir = @srcdir@ 27 27 28 SHELL=/bin/bash 28 29 PACKAGE = @PACKAGE@ 29 30 VERSION = @VERSION@ … … 58 59 59 60 all: 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 fi67 61 for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 68 62 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; \ 70 72 done 71 73 -
main/trunk/greenstone3/build.properties.in
r28297 r28636 96 96 ## and if compiling imagemagick 97 97 ## These extensions should be in the [gsdl3home]/gs2build/ext directory 98 #checkout.gnomelibmin.ext=true 98 99 #checkout.gnomelib.ext=true 99 100 #checkout.imagemagick.ext=true -
main/trunk/greenstone3/build.xml
r28613 r28636 451 451 <or> 452 452 <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/> 453 <istrue value="${checkout.gnomelibmin.ext}"/> 453 454 <istrue value="${use.gnomelib.ext}"/> 454 455 <istrue value="${checkout.gnomelib.ext}"/> … … 873 874 <available file="${basedir}/common-src" property="common.src.present"/> 874 875 <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> 876 884 877 885 <condition property="tomcat.islocal"> … … 2704 2712 <if> 2705 2713 <bool> 2706 <istrue value="${checkout.gnomelib .ext}"/>2714 <istrue value="${checkout.gnomelibmin.ext}"/> 2707 2715 </bool> 2708 2716 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"/> 2712 2718 <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> 2715 2733 </else> 2716 2734 </if> 2717 2735 </target> 2718 2736 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> 2719 2769 2720 2770 <target name="checkout-gnome-lib" depends="init" if="collection.building.enabled" unless="nosvn.mode"> … … 2832 2882 </target> 2833 2883 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" 2835 2885 description="Configure the build-src component"> 2836 2886 <exec executable="${build.src.home}/configure" os="${os.unix}"
Note:
See TracChangeset
for help on using the changeset viewer.