Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed name LOCN opts variable for + packages. No longer include the c…

…orresponding build directories for compilation (reduces number of -I rules by a factor of approximately 2).
  • Loading branch information...
commit 8543088cfa47758c2aa94d5c55a4b91706f23be6 1 parent 5f5de5c
@che2 che2 authored
View
6 tools/waf/bde/bdewafbuild.py
@@ -139,8 +139,8 @@ def _build_package_impl(self, package_name, package_node, group_node, components
cxxflags = cxxflags,
cxxincludes = cxxincludes,
linkflags = linkflags,
- includes = '.',
- export_includes = '.',
+ includes = [package_node],
+ export_includes = [package_node],
use = internal_deps,
uselib = external_deps,
lib = libs,
@@ -169,7 +169,7 @@ def _build_package_impl(self, package_name, package_node, group_node, components
lib = libs,
stlib = stlibs,
cust_libpaths = libpaths,
- includes = '.',
+ includes = [package_node],
use = [package_name + '_lib'] + dum_task_gens,
uselib = external_deps
)
View
5 tools/waf/bde/bdewafconfigure.py
@@ -40,9 +40,6 @@ def __init__(self, ctx):
self.unsupported_groups = set()
self.unsupported_packages = set()
- self.sl_package_deps = {}
- self.sl_package_locations = {}
-
self.group_options = {}
self.group_export_options = {}
self.package_options = {}
@@ -237,7 +234,7 @@ def _evaluate_group_options(self, group):
package_node = group_node.make_node(package)
# hacks to make bst+apache work. bst+apache's opts file references the _LOCN variable.
- p_opts.options['%s_LOCN' % package.upper()] = package_node.abspath()
+ p_opts.options['%s_LOCN' % package.upper().replace('+', '_')] = package_node.abspath()
# from bde_build.pl 'BDE_CXXINCLUDES = $(SWITCHCHAR)I. $(BDE_CXXINCLUDE) $(PKG_INCLUDES) $(GRP_INCLUDES)'
p_opts.options['BDE_CXXINCLUDES'] = '$(BDE_CXXINCLUDE)'
Please sign in to comment.
Something went wrong with that request. Please try again.