You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ar...@apache.org on 2011/04/27 23:54:34 UTC
svn commit: r1097258 - in /subversion/trunk: ./ Makefile.in
build/generator/templates/makefile.ezt configure.ac
Author: arfrever
Date: Wed Apr 27 21:54:33 2011
New Revision: 1097258
URL: http://svn.apache.org/viewvc?rev=1097258&view=rev
Log:
Follow-up to r1088462:
Don't indefinitely rebuild SWIG-based bindings.
* build/generator/templates/makefile.ezt
(check-SWIG): Rename to ...
(.swig_checked): ... this. Create .swig_checked file to avoid running this
rule more than once.
* configure.ac: Delete .swig_checked file.
* Makefile.in
(clean-swig): Delete .swig_checked file.
* .
(svn:ignore): Ignore .swig_checked file.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/Makefile.in
subversion/trunk/build/generator/templates/makefile.ezt
subversion/trunk/configure.ac
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 27 21:54:33 2011
@@ -7,6 +7,7 @@ config.status
configure
libtool
.gdb_history
+.swig_checked
*.orig
*.rej
TAGS
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1097258&r1=1097257&r2=1097258&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Wed Apr 27 21:54:33 2011
@@ -708,6 +708,7 @@ install-swig-py: install-swig-py-lib
install-swig-rb: install-swig-rb-lib
clean-swig: clean-swig-headers clean-swig-py clean-swig-rb clean-swig-pl
+ @rm -f .swig_checked
extraclean-swig: extraclean-swig-headers extraclean-swig-py \
extraclean-swig-rb extraclean-swig-pl
Modified: subversion/trunk/build/generator/templates/makefile.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/makefile.ezt?rev=1097258&r1=1097257&r2=1097258&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/makefile.ezt (original)
+++ subversion/trunk/build/generator/templates/makefile.ezt Wed Apr 27 21:54:33 2011
@@ -73,16 +73,17 @@ autogen-swig: autogen-swig-[swig_langs.s
# Section 4: Rules to build SWIG .c files from .i files
########################################
[for swig_c]
-[swig_c.c_file]: check-SWIG [for swig_c.deps] [swig_c.deps][end]
+[swig_c.c_file]: .swig_checked [for swig_c.deps] [swig_c.deps][end]
$(SWIG) $(SWIG_INCLUDES) [swig_c.opts] -o $@ $(top_srcdir)/[swig_c.source][end]
# This needs to be here, rather than in Makefile.in, else
# './autogen.sh --release' doesn't find it.
-check-SWIG:
+.swig_checked:
@if [ "$(SWIG)" = "none" ]; then \
echo "SWIG disabled at configure time" >&2; \
exit 1; \
fi
+ @touch .swig_checked
########################################
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1097258&r1=1097257&r2=1097258&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Wed Apr 27 21:54:33 2011
@@ -1263,6 +1263,9 @@ if test -e packages/solaris/pkginfo.in;
fi
AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
+# Ensure that SWIG is checked after reconfiguration.
+rm -f .swig_checked
+
AC_OUTPUT
# ==== Print final messages to user ==========================================