Author: hwright
Date: Thu Aug 4 13:03:38 2011
New Revision: 1153873
URL: http://svn.apache.org/viewvc?rev=1153873&view=rev
Log:
Merge r1149401 from trunk:
* r1149401
Fail early when attempting to build swig-pl after configuring
--without-swig.
Justification:
Convert mysterious error messages to a clean early exit.
Votes:
+1: danielsh, arfrever, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build/generator/swig/header_wrappers.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 4 13:03:38 2011
@@ -54,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152726,1153416
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152726,1153416
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1153873&r1=1153872&r2=1153873&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 4 13:03:38 2011
@@ -220,11 +220,3 @@ Approved changes:
Can be too slow to be useable.
Votes:
+1: philip, pburba, rhuijben
-
- * r1149401
- Fail early when attempting to build swig-pl after configuring
- --without-swig.
- Justification:
- Convert mysterious error messages to a clean early exit.
- Votes:
- +1: danielsh, arfrever, rhuijben
Modified: subversion/branches/1.7.x/build/generator/swig/header_wrappers.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/generator/swig/header_wrappers.py?rev=1153873&r1=1153872&r2=1153873&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/generator/swig/header_wrappers.py (original)
+++ subversion/branches/1.7.x/build/generator/swig/header_wrappers.py Thu Aug
4 13:03:38 2011
@@ -65,7 +65,13 @@ class Generator(generator.swig.Generator
)
makefile.write('SWIG_WRAPPERS = %s\n\n' % ' '.join(wrapper_fnames))
for short_name in self.short.values():
- makefile.write('autogen-swig-%s: $(SWIG_WRAPPERS)\n' % short_name)
+ # swig-pl needs the '.swig_checked' target here; swig-rb and swig-py
+ # already reach it via a different dependency chain:
+ #
+ # In build-outputs.mk, swig-py and swig-rb targets depend on *.la
+ # targets, which depend on *.lo targets, which depend on *.c targets,
+ # which depend on .swig_checked target.
+ makefile.write('autogen-swig-%s: .swig_checked $(SWIG_WRAPPERS)\n' %
short_name)
makefile.write('\n\n')
def proxy_filename(self, include_filename):
