Author: breser
Date: Wed Aug 14 20:29:45 2013
New Revision: 1514030
URL: http://svn.apache.org/r1514030
Log:
Adjust gen_make.py to handle wrapped add-deps.
* build.conf: Revert temporary fix from r1514020.
* build/generator/gen_make.py
(Generator.write): Make the add_deps value in the _eztdata be a list.
* build/generator/templates/build-outputs.mk.ezt: Treat target.add_deps as a
list.
Modified:
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_make.py
subversion/trunk/build/generator/templates/build-outputs.mk.ezt
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1514030&r1=1514029&r2=1514030&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Aug 14 20:29:45 2013
@@ -683,7 +683,9 @@ path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr java-sdk
sources = *.cpp *.c
-add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
$(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS)
$(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
+add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
+ $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS)
+ $(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
Modified: subversion/trunk/build/generator/gen_make.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1514030&r1=1514029&r2=1514030&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Wed Aug 14 20:29:45 2013
@@ -238,6 +238,7 @@ class Generator(gen_base.GeneratorBase):
header_class_filenames = [ ]
deps = [ ]
libs = [ ]
+ add_deps = target_ob.add_deps.split()
for link_dep in self.graph.get_sources(gen_base.DT_LINK, target_ob.name):
if isinstance(link_dep, gen_base.TargetJava):
@@ -288,7 +289,7 @@ class Generator(gen_base.GeneratorBase):
varname=targ_varname,
path=path,
install=None,
- add_deps=target_ob.add_deps,
+ add_deps=add_deps,
objects=objects,
deps=deps,
when=target_ob.when,
Modified: subversion/trunk/build/generator/templates/build-outputs.mk.ezt
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/build-outputs.mk.ezt?rev=1514030&r1=1514029&r2=1514030&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/build-outputs.mk.ezt (original)
+++ subversion/trunk/build/generator/templates/build-outputs.mk.ezt Wed Aug 14
20:29:45 2013
@@ -99,7 +99,7 @@ autogen-swig: autogen-swig-[swig_langs.s
install-[target.install]: [target.install_deps][end]
[is target.type "java"][target.varname]_HEADERS = [for
target.headers][if-index target.headers first][else] [end][target.headers][end]
[target.varname]_OBJECTS = [for target.objects][if-index target.objects
first][else] [end][target.objects][end]
-[target.varname]_DEPS = $([target.varname]_HEADERS)
$([target.varname]_OBJECTS) [target.add_deps] [for target.deps][if-index
target.deps first][else] [end][target.deps][end]
+[target.varname]_DEPS = $([target.varname]_HEADERS)
$([target.varname]_OBJECTS)[for target.add_deps] [target.add_deps][end][for
target.deps][if-index target.deps first][else] [end][target.deps][end]
[target.name]: $([target.varname]_DEPS)
[if-any target.headers][target.varname]_CLASS_FILENAMES =[for
target.header_class_filenames] [target.header_class_filenames][end]
[target.varname]_CLASSES =[for target.header_classes]
[target.header_classes][end]
@@ -110,9 +110,9 @@ $([target.varname]_OBJECTS): $([target.v
[target.link_cmd] -d [target.output_dir] -classpath
[target.classes]:$([target.varname]_CLASSPATH) $([target.varname]_SRC)
[if-any target.jar]
$(JAR) cf [target.jar_path] -C [target.classes][for target.packages]
[target.packages][end][end][end]
-[else][is target.type "i18n"][target.varname]_DEPS = [target.add_deps][for
target.objects] [target.objects][end][for target.deps] [target.deps][end]
+[else][is target.type "i18n"][target.varname]_DEPS =[for target.add_deps]
[target.add_deps][end][for target.objects] [target.objects][end][for
target.deps] [target.deps][end]
[target.name]: $([target.varname]_DEPS)
-[else][target.varname]_DEPS = [target.add_deps][for target.objects]
[target.objects][end][for target.deps] [target.deps][end]
+[else][target.varname]_DEPS =[for target.add_deps] [target.add_deps][end][for
target.objects] [target.objects][end][for target.deps] [target.deps][end]
[target.varname]_OBJECTS =[for target.objnames] [target.objnames][end]
[target.filename]: $([target.varname]_DEPS)
[if-any target.when]if $([target.when]) ; then [else][end]cd
[target.path] && [target.link_cmd] $([target.varname]_LDFLAGS) -o
[target.basename] [target.undefined_flag] $([target.varname]_OBJECTS)[for
target.libs] [target.libs][end] $(LIBS)[if-any target.when] ; else echo "fake"
> [target.filename] ; fi[else][end]
