svn commit: r1295051 - in /subversion/branches/svnmucc: BRANCH-README Makefile.in build/generator/gen_make.py

[da...@apache.org]

Author: danielsh
Date: Wed Feb 29 10:06:09 2012
New Revision: 1295051

URL: http://svn.apache.org/viewvc?rev=1295051&view=rev
Log:
On the svnmucc branch, install a compatibility symlink.

* Makefile.in
  (INSTALL_EXTRA_TOOLS): New.

* build/generator/gen_make.py
  (Generator.write):
    Add 'tools' to the list of install= areas that have an associated
    INSTALL_EXTRA_$(AREA) target.  See the source of build-outputs.mk
    --- namely build/generator/templates/makefile.ezt --- for the gory
    details.

* BRANCH-README: Remove this task.

Modified:
    subversion/branches/svnmucc/BRANCH-README
    subversion/branches/svnmucc/Makefile.in
    subversion/branches/svnmucc/build/generator/gen_make.py

Modified: subversion/branches/svnmucc/BRANCH-README
URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/BRANCH-README?rev=1295051&r1=1295050&r2=1295051&view=diff
==============================================================================
--- subversion/branches/svnmucc/BRANCH-README (original)
+++ subversion/branches/svnmucc/BRANCH-README Wed Feb 29 10:06:09 2012
@@ -1,6 +1,3 @@
 Branch that promotes svnmucc to subversion/svnmucc/.
 
-TODO: Make 'make install-tools' install a compatibility symlink:
-        $(DESTDIR)/bin/svn-tools/svnmucc -> $(DESTDIR)/bin/svnmucc
-
 TODO: Determine whether there is consensus to merge this to trunk

Modified: subversion/branches/svnmucc/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/Makefile.in?rev=1295051&r1=1295050&r2=1295051&view=diff
==============================================================================
--- subversion/branches/svnmucc/Makefile.in (original)
+++ subversion/branches/svnmucc/Makefile.in Wed Feb 29 10:06:09 2012
@@ -872,3 +872,9 @@ extraclean-ctypes-python: clean-ctypes-p
 # manually describe a dependency, which we won't otherwise detect
 subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql
 subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-checks.sql
+
+# Compatibility symlink.
+# This runs after the target of the same name in build-outputs.mk.
+INSTALL_EXTRA_TOOLS=\
+  $(MKDIR) $(DESTDIR)$(bindir); \
+  ln -s $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)

Modified: subversion/branches/svnmucc/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/build/generator/gen_make.py?rev=1295051&r1=1295050&r2=1295051&view=diff
==============================================================================
--- subversion/branches/svnmucc/build/generator/gen_make.py (original)
+++ subversion/branches/svnmucc/build/generator/gen_make.py Wed Feb 29 10:06:09 2012
@@ -410,7 +410,8 @@ class Generator(gen_base.GeneratorBase):
         # in Makefile.in
         ### we should turn AREA into an object, then test it instead of this
         if area[:5] == 'swig-' and area[-4:] != '-lib' or \
-           area[:7] == 'javahl-':
+           area[:7] == 'javahl-' \
+           or area == 'tools':
           ezt_area.extra_install = 'yes'
 
     ########################################