summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorAndrew Morrow <andrew.morrow@10gen.com>2019-09-16 19:21:02 +0000
committerevergreen <evergreen@mongodb.com>2019-09-16 19:21:02 +0000
commit54d1ab613046f06d0524aa9f7a244dfe3a076aa0 (patch)
treeaf8cc0576c03cdd0b6e08588304b55ae932ffbe5 /SConstruct
parenteddda0424bd26a9784c373d510a61a49b38790e8 (diff)
downloadmongo-54d1ab613046f06d0524aa9f7a244dfe3a076aa0.tar.gz
SERVER-42887 Make roles injectible instead
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct60
1 files changed, 40 insertions, 20 deletions
diff --git a/SConstruct b/SConstruct
index 4fd117320f0..e3e470619c3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3767,6 +3767,44 @@ if get_option('install-mode') == 'hygienic':
env["AIB_TARBALL_SUFFIX"] = "tgz"
env.Tool('auto_install_binaries')
+ env.DeclareRoles(
+ roles=[
+
+ env.Role(
+ name="base",
+ ),
+
+ env.Role(
+ name="debug",
+ ),
+
+ env.Role(
+ name="dev",
+ dependencies=[
+ "runtime"
+ ],
+ ),
+
+ env.Role(
+ name="meta",
+ ),
+
+ env.Role(
+ name="runtime",
+ dependencies=[
+ # On windows, we want the runtime role to depend
+ # on the debug role so that PDBs end in the
+ # runtime package.
+ "debug" if env.TargetOSIs('windows') else None,
+ ],
+ transitive=True,
+ silent=True,
+ ),
+ ],
+ base_role="base",
+ meta_role="meta",
+ )
+
env.AddSuffixMapping({
"$PROGSUFFIX": env.SuffixMap(
directory="$PREFIX_BINDIR",
@@ -3774,7 +3812,7 @@ if get_option('install-mode') == 'hygienic':
"runtime",
]
),
-
+
"$LIBSUFFIX": env.SuffixMap(
directory="$PREFIX_LIBDIR",
default_roles=[
@@ -3797,7 +3835,7 @@ if get_option('install-mode') == 'hygienic':
"debug",
]
),
-
+
".dSYM": env.SuffixMap(
directory="$PREFIX_DEBUGDIR",
default_roles=[
@@ -3812,26 +3850,8 @@ if get_option('install-mode') == 'hygienic':
]
),
- ".lib": env.SuffixMap(
- directory="$PREFIX_LIBDIR",
- default_roles=[
- "dev"
- ]
- ),
-
- ".h": env.SuffixMap(
- directory="$PREFIX_INCLUDEDIR",
- default_roles=[
- "dev",
- ]
- ),
})
- if env.TargetOSIs('windows'):
- # On windows, we want the runtime role to depend on the debug role so that PDBs
- # end in the runtime package.
- env.AddRoleDependencies(role="runtime", dependencies=["debug"])
-
env.AddPackageNameAlias(
component="dist",
role="runtime",