You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2012/08/02 06:02:59 UTC
svn commit: r1368347 - in /subversion/branches/1.7.x: ./ STATUS build.conf
build/generator/gen_make.py build/generator/templates/makefile.ezt
Author: svn-role
Date: Thu Aug 2 04:02:59 2012
New Revision: 1368347
URL: http://svn.apache.org/viewvc?rev=1368347&view=rev
Log:
Merge r1307177 from trunk:
* r1307177
Move mod_dontdothat to install-tools.
Justification:
Undo compatibility break of 'make install' in 1.7.3.
Votes:
+1: danielsh, gstein, jerenkrantz
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build.conf
subversion/branches/1.7.x/build/generator/gen_make.py
subversion/branches/1.7.x/build/generator/templates/makefile.ezt
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1307177
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1368347&r1=1368346&r2=1368347&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 2 04:02:59 2012
@@ -68,13 +68,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1307177
- Move mod_dontdothat to install-tools.
- Justification:
- Undo compatibility break of 'make install' in 1.7.3.
- Votes:
- +1: danielsh, gstein, jerenkrantz
-
* r1367498
Make FSFS revision files independent of APR hash order.
Justification:
Modified: subversion/branches/1.7.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build.conf?rev=1368347&r1=1368346&r2=1368347&view=diff
==============================================================================
--- subversion/branches/1.7.x/build.conf (original)
+++ subversion/branches/1.7.x/build.conf Thu Aug 2 04:02:59 2012
@@ -367,7 +367,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.7.x/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/generator/gen_make.py?rev=1368347&r1=1368346&r2=1368347&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/generator/gen_make.py (original)
+++ subversion/branches/1.7.x/build/generator/gen_make.py Thu Aug 2 04:02:59 2012
@@ -369,18 +369,21 @@ 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=[ ], extra_install=None)
+ ezt_area = _eztdata(type=area, files=[ ], apache_files=[ ],
+ extra_install=None)
- if area == 'apache-mod':
- data.areas.append(ezt_area)
-
- for file in files:
+ 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)
base, ext = os.path.splitext(fname)
name = base.replace('mod_', '')
- ezt_area.files.append(_eztdata(fullname=file, dirname=dirname,
- name=name, filename=fname))
+ return _eztdata(fullname=file, dirname=dirname,
+ name=name, filename=fname)
+ 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':
data.areas.append(ezt_area)
@@ -390,6 +393,14 @@ class Generator(gen_base.GeneratorBase):
ezt_area.varname = area_var
ezt_area.uppervar = upper_var
+ # ### TODO: This is a hack. See discussion here:
+ # ### http://mid.gmane.org/20120316191639.GA28451@daniel3.local
+ apache_files = [t.filename 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)
Modified: subversion/branches/1.7.x/build/generator/templates/makefile.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/generator/templates/makefile.ezt?rev=1368347&r1=1368346&r2=1368347&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/generator/templates/makefile.ezt (original)
+++ subversion/branches/1.7.x/build/generator/templates/makefile.ezt Thu Aug 2 04:02:59 2012
@@ -126,11 +126,12 @@ $([target.varname]_OBJECTS): $([target.v
[for areas]
[is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
-[else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][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]
cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
- cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end]
+ cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for areas.apache_files]
+ cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
[if-any areas.extra_install] $(INSTALL_EXTRA_[areas.uppervar])
[end][end][end]