1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
Fix some build problems:
- SWIG out-of-tree stuff
- Add aprutil as a direct dependency for libsvn_client and libsvn_ra.
--- a/build/generator/swig/checkout_swig_header.py
+++ b/build/generator/swig/checkout_swig_header.py
@@ -40,15 +40,14 @@
def write_makefile_rules(self, makefile):
"""Write makefile rules to checkout files"""
- script_path = '$(top_srcdir)/build/generator/swig/checkout_swig_header.py'
- conf = '$(abs_srcdir)/build.conf'
- makefile.write('CHECKOUT_SWIG = cd $(top_builddir) && $(PYTHON)' +
- ' %s %s $(SWIG)\n\n' % (script_path, conf))
+ script_path = 'build/generator/swig/checkout_swig_header.py'
+ makefile.write('CHECKOUT_SWIG = cd $(top_srcdir) &&' +
+ ' $(PYTHON) %s build.conf $(SWIG)\n' % script_path)
checkout_locations = []
for path in self.swig_checkout_files:
out = self._output_file(path)
checkout_locations.append(out)
- makefile.write('%s: %s\n' % (out, script_path) +
+ makefile.write('%s: $(top_srcdir)/%s\n' % (out, script_path) +
'\t$(CHECKOUT_SWIG) %s\n\n' % path)
makefile.write('SWIG_CHECKOUT_FILES = %s\n\n\n'
% " ".join(checkout_locations))
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,8 +113,8 @@
SHELL = @SHELL@
LIBTOOL = @SVN_LIBTOOL@
-LTFLAGS = --tag=CC --silent
-LTCXXFLAGS = --tag=CXX --silent
+LTFLAGS = --tag=CC
+LTCXXFLAGS = --tag=CXX
LT_CFLAGS = @LT_CFLAGS@
LT_LDFLAGS = @LT_LDFLAGS@
LT_SO_VERSION = @SVN_LT_SOVERSION@
@@ -315,14 +315,14 @@
# The path to generated and complementary source files for the SWIG
# bindings.
-SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl
-SWIG_PY_DIR = $(abs_builddir)/subversion/bindings/swig/python
-SWIG_RB_DIR = $(abs_builddir)/subversion/bindings/swig/ruby
+SWIG_PL_DIR = $(top_builddir)/subversion/bindings/swig/perl
+SWIG_PY_DIR = $(top_builddir)/subversion/bindings/swig/python
+SWIG_RB_DIR = $(top_builddir)/subversion/bindings/swig/ruby
# The path to the source files for the SWIG bindings
SWIG_PL_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/perl
-SWIG_PY_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/python
-SWIG_RB_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig/ruby
+SWIG_PY_SRC_DIR = $(top_srcdir)/subversion/bindings/swig/python
+SWIG_RB_SRC_DIR = $(top_srcdir)/subversion/bindings/swig/ruby
### Automate JAR creation using Makefile generator's javahl-java.jar
### property. Enhance generator to support JAR installation.
@@ -811,8 +811,7 @@
fi
for d in $(SWIG_PL_DIR)/libsvn_swig_perl; \
do \
- cd $$d; \
- rm -rf *.lo *.la *.o .libs; \
+ (cd $$d && rm -rf *.lo *.la *.o .libs); \
done
if [ -f "$(SWIG_PL_DIR)/native/Makefile" ]; then \
cd $(SWIG_PL_DIR)/native; $(MAKE) clean; \
@@ -846,7 +845,7 @@
fi
for d in $(SWIG_PY_DIR) $(SWIG_PY_DIR)/libsvn_swig_py; \
do \
- cd $$d && rm -rf *.lo *.la *.o *.pyc .libs; \
+ (cd $$d && rm -rf *.lo *.la *.o *.pyc .libs); \
done
find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) -name "*.pyc" -exec rm {} ';'
@@ -876,8 +875,7 @@
fi
for d in $(SWIG_RB_DIR) $(SWIG_RB_DIR)/libsvn_swig_ruby; \
do \
- cd $$d; \
- rm -rf *.lo *.la *.o .libs; \
+ (cd $$d && rm -rf *.lo *.la *.o .libs); \
done
extraclean-swig-rb: clean-swig-rb
--- a/build/generator/gen_base.py
+++ b/build/generator/gen_base.py
@@ -340,7 +340,8 @@
class SWIGSource(SourceFile):
def __init__(self, filename):
- SourceFile.__init__(self, filename, build_path_dirname(filename))
+ SourceFile.__init__(self, filename,
+ build_path_dirname('$(top_srcdir)/' + filename))
lang_abbrev = {
--- a/build/generator/swig/header_wrappers.py
+++ b/build/generator/swig/header_wrappers.py
@@ -52,7 +52,7 @@
"""Write makefile rules for generating SWIG wrappers for Subversion
header files."""
wrapper_fnames = []
- python_script = '$(abs_srcdir)/build/generator/swig/header_wrappers.py'
+ python_script = 'build/generator/swig/header_wrappers.py'
makefile.write('GEN_SWIG_WRAPPER = cd $(top_srcdir) && $(PYTHON)' +
' %s build.conf $(SWIG)\n\n' % python_script)
for fname in self.includes:
--- a/configure.ac
+++ b/configure.ac
@@ -688,6 +688,7 @@
fi
AH_BOTTOM([
+#undef /* */ _
/* Indicate to translators that string X should be translated. Do not look
up the translation at run time; just expand to X. This macro is suitable
for use where a constant string is required at compile time. */
@@ -1504,6 +1505,11 @@
[Defined to the config.guess name of the build target])
AC_OUTPUT
+if test "$abs_srcdir" != "$abs_builddir"
+then
+ AC_MSG_NOTICE([Creating build directories])
+ (cd "$abs_srcdir"; find subversion tools -type d) | xargs $MKDIR
+fi
# ==== Print final messages to user ==========================================
--- a/build.conf
+++ b/build.conf
@@ -213,7 +213,7 @@
description = Subversion Client Library
type = lib
path = subversion/libsvn_client
-libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr
+libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr aprutil apriconv apr
install = lib
msvc-export = svn_client.h private/svn_client_private.h
@@ -276,7 +276,7 @@
description = Subversion Repository Access Library
type = lib
path = subversion/libsvn_ra
-libs = libsvn_delta libsvn_subr ra-libs apriconv apr
+libs = libsvn_delta libsvn_subr ra-libs aprutil apriconv apr
# conditionally add more dependencies
add-deps = $(SVN_RA_LIB_DEPS)
add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS)
--- a/subversion/libsvn_ra_serf/update.c
+++ b/subversion/libsvn_ra_serf/update.c
@@ -3064,12 +3064,6 @@
SVN_ERR(svn_ra_serf__process_pending(parser_ctx,
&report->report_received,
iterpool_inner));
-
- /* Debugging purposes only! */
- for (i = 0; i < sess->num_conns; i++)
- {
- serf_debug__closed_conn(sess->conns[i]->bkt_alloc);
- }
}
/* If we got a complete report, close the edit. Otherwise, abort it. */
--- a/subversion/libsvn_ra_serf/util.c
+++ b/subversion/libsvn_ra_serf/util.c
@@ -962,12 +962,6 @@
return svn_ra_serf__wrap_err(status, _("Error running context"));
}
-
- /* Debugging purposes only! */
- for (i = 0; i < sess->num_conns; i++)
- {
- serf_debug__closed_conn(sess->conns[i]->bkt_alloc);
- }
}
svn_pool_destroy(iterpool);
|
