subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1469682 - in /subversion/branches/1.8.x: ./ STATUS build.conf build/generator/gen_base.py build/generator/gen_make.py build/generator/templates/build-outputs.mk.ezt
Date Fri, 19 Apr 2013 04:00:58 GMT
Author: svn-role
Date: Fri Apr 19 04:00:57 2013
New Revision: 1469682

URL: http://svn.apache.org/r1469682
Log:
Merge r1469248 from trunk:

 * r1469248
   Install mod_dontdothat with install-tools into $(APACHE_LIBEXECDIR).
   Justification:
     Fixes issue #4338 which is a 1.8 blocker.
     See: http://subversion.tigris.org/issues/show_bug.cgi?id=4338
   Votes:
     +1: brane, rhuijben, philip

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/build.conf
    subversion/branches/1.8.x/build/generator/gen_base.py
    subversion/branches/1.8.x/build/generator/gen_make.py
    subversion/branches/1.8.x/build/generator/templates/build-outputs.mk.ezt

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1469248

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1469682&r1=1469681&r2=1469682&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Apr 19 04:00:57 2013
@@ -64,11 +64,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1469248
-   Install mod_dontdothat with install-tools into $(APACHE_LIBEXECDIR).
-   Justification:
-     Fixes issue #4338 which is a 1.8 blocker.
-     See: http://subversion.tigris.org/issues/show_bug.cgi?id=4338
-   Votes:
-     +1: brane, rhuijben, philip

Modified: subversion/branches/1.8.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build.conf?rev=1469682&r1=1469681&r2=1469682&view=diff
==============================================================================
--- subversion/branches/1.8.x/build.conf (original)
+++ subversion/branches/1.8.x/build.conf Fri Apr 19 04:00:57 2013
@@ -381,7 +381,7 @@ type = apache-mod
 path = tools/server-side/mod_dontdothat
 nonlibs = mod_dav_svn apr aprutil
 libs = libsvn_subr xml
-install = apache-mod
+install = tools
 msvc-libs = libhttpd.lib
 
 # ----------------------------------------------------------------------------

Modified: subversion/branches/1.8.x/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/gen_base.py?rev=1469682&r1=1469681&r2=1469682&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_base.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_base.py Fri Apr 19 04:00:57 2013
@@ -1133,9 +1133,10 @@ class IncludeDependencyInfo:
     return hdrs
 
 class FileInfo:
-    def __init__(self, filename, when):
+    def __init__(self, filename, when, target=None):
         self.filename = filename
         self.when = when
+        self.target = target
 
 def _sorted_files(graph, area):
   "Given a list of targets, sort them based on their dependencies."
@@ -1173,9 +1174,9 @@ def _sorted_files(graph, area):
           s = graph.get_sources(DT_LINK, t.name)
           for d in s:
             if d not in targets:
-              files.append(FileInfo(d.filename, d.when))
+              files.append(FileInfo(d.filename, d.when, d))
         else:
-          files.append(FileInfo(t.filename, t.when))
+          files.append(FileInfo(t.filename, t.when, t))
 
         # don't consider this target any more
         targets.remove(t)

Modified: subversion/branches/1.8.x/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/gen_make.py?rev=1469682&r1=1469681&r2=1469682&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_make.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_make.py Fri Apr 19 04:00:57 2013
@@ -371,23 +371,26 @@ class Generator(gen_base.GeneratorBase):
       # get the output files for these targets, sorted in dependency order
       files = gen_base._sorted_files(self.graph, area)
 
-      ezt_area = _eztdata(type=area, files=[ ], apache_files=[ ],
-                          extra_install=None)
+      ezt_area_type = (area == 'apache-mod' and 'mods-shared' or area)
+      ezt_area = _eztdata(type=ezt_area_type, files=[], extra_install=None)
+
+      def file_to_eztdata(file):
+          # cd to dirname before install to work around libtool 1.4.2 bug.
+          dirname, fname = build_path_splitfile(file.filename)
+          return _eztdata(mode=None,
+                          dirname=dirname, fullname=file.filename,
+                          filename=fname, when=file.when)
 
       def apache_file_to_eztdata(file):
           # cd to dirname before install to work around libtool 1.4.2 bug.
           dirname, fname = build_path_splitfile(file.filename)
           base, ext = os.path.splitext(fname)
           name = base.replace('mod_', '')
-          return _eztdata(fullname=file.filename, dirname=dirname,
+          return _eztdata(mode='apache-mod',
+                          fullname=file.filename, dirname=dirname,
                           name=name, filename=fname, when=file.when)
-      if area == 'apache-mod':
-        data.areas.append(ezt_area)
 
-        for file in files:
-          ezt_area.files.append(apache_file_to_eztdata(file))
-
-      elif area != 'test' and area != 'bdb-test':
+      if area != 'test' and area != 'bdb-test':
         data.areas.append(ezt_area)
 
         area_var = area.replace('-', '_')
@@ -395,31 +398,20 @@ class Generator(gen_base.GeneratorBase):
         ezt_area.varname = area_var
         ezt_area.uppervar = upper_var
 
-        # ### TODO: This is a hack.  See discussion here:
-        # ### email to dev@, 2012-03-16, from Daniel Shahaf, subject
-        # ### "[1.7.x] build.conf += install-tools of an apache-mod",
-        # ### http://mid.gmane.org/20120316191639.GA28451@daniel3.local
-        apache_files = [gen_base.FileInfo(t.filename, t.when)
-                        for t in inst_targets
-                        if isinstance(t, gen_base.TargetApacheMod)]
-
-        files = [f for f in files if f not in apache_files]
-        for file in apache_files:
-          ezt_area.apache_files.append(apache_file_to_eztdata(file))
         for file in files:
-          # cd to dirname before install to work around libtool 1.4.2 bug.
-          dirname, fname = build_path_splitfile(file.filename)
-          ezt_file = _eztdata(dirname=dirname, fullname=file.filename,
-                              filename=fname, when=file.when)
-          if area == 'locale':
-            lang, objext = os.path.splitext(fname)
-            installdir = '$(DESTDIR)$(%sdir)/%s/LC_MESSAGES' % (area_var, lang)
-            ezt_file.installdir = installdir
-            ezt_file.objext = objext
+          if isinstance(file.target, gen_base.TargetApacheMod):
+            ezt_file = apache_file_to_eztdata(file)
           else:
-            ezt_file.install_fname = build_path_join('$(%sdir)' % area_var,
-                                                     fname)
-
+            ezt_file = file_to_eztdata(file)
+            if area == 'locale':
+              lang, objext = os.path.splitext(ezt_file.filename)
+              installdir = ('$(DESTDIR)$(%sdir)/%s/LC_MESSAGES'
+                            % (area_var, lang))
+              ezt_file.installdir = installdir
+              ezt_file.objext = objext
+            else:
+              ezt_file.install_fname = build_path_join('$(%sdir)' % area_var,
+                                                       ezt_file.filename)
           ezt_area.files.append(ezt_file)
 
         # certain areas require hooks for extra install rules defined

Modified: subversion/branches/1.8.x/build/generator/templates/build-outputs.mk.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/templates/build-outputs.mk.ezt?rev=1469682&r1=1469681&r2=1469682&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/templates/build-outputs.mk.ezt (original)
+++ subversion/branches/1.8.x/build/generator/templates/build-outputs.mk.ezt Fri Apr 19 04:00:57
2013
@@ -127,16 +127,13 @@ $([target.varname]_OBJECTS): $([target.v
 # Section 7: Install-Group install targets
 ########################################
 [for areas]
-[is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for
areas.files]
-	[if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname]
; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any
areas.files.when] ; fi[else][end][end]
-[else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
[for areas.apache_files] [areas.apache_files.fullname][end]
-	$(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
-	$(MKDIR) [areas.files.installdir]
-	[if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname]
; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any
areas.files.when] ; fi[else][end][else]
-	[if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname]
; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][if-any
areas.files.when] ; fi[else][end][end][end][for areas.apache_files]
-	[if-any areas.apache_files.when]if $([areas.apache_files.when]) ; then [else][end]cd [areas.apache_files.dirname]
; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][if-any
areas.apache_files.when] ; fi[else][end][end]
-[if-any areas.extra_install]	$(INSTALL_EXTRA_[areas.uppervar])
-[end][end][end]
+install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
+[if-any areas.files][for areas.files]	[is areas.files.mode "apache-mod"][if-any areas.files.when]if
$([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)"
; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any areas.files.when]
; fi[else][end][else][if-index areas.files first]$(MKDIR) $(DESTDIR)$([areas.varname]dir)
+	[else][end][is areas.type "locale"]$(MKDIR) [areas.files.installdir]
+	[if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname]
; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any
areas.files.when] ; fi[else][end][else][if-any areas.files.when]if $([areas.files.when]) ;
then [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename]
$(DESTDIR)[areas.files.install_fname][if-any areas.files.when] ; fi[else][end][end][end]
+[end][else]	$(MKDIR) $(DESTDIR)$([areas.varname]dir)
+[end][if-any areas.extra_install]	$(INSTALL_EXTRA_[areas.uppervar])
+[end][end]
 
 ########################################
 # Section 8: The install-include rule



Mime
View raw message