diff options
| author | Jonathan Reams <jbreams@mongodb.com> | 2015-08-07 11:44:53 -0400 |
|---|---|---|
| committer | Jonathan Reams <jbreams@mongodb.com> | 2015-08-07 16:33:35 -0400 |
| commit | 51a8f1ca3dee1f4698dad6f9cf34ac11edb2e2c3 (patch) | |
| tree | 77657d0f3ffe767ec9ac7daa214d99bf9c8474e6 /SConstruct | |
| parent | 5033d600a0d447751265990ec26c2b0cfb6e3abb (diff) | |
| download | mongo-51a8f1ca3dee1f4698dad6f9cf34ac11edb2e2c3.tar.gz | |
SERVER-19822 Make sure directory names in dist archives are consistent
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 85465905559..c23a19762fb 100644 --- a/SConstruct +++ b/SConstruct @@ -2370,7 +2370,17 @@ env.AlwaysBuild( "lint" ) def getSystemInstallName(): dist_arch = GetOption("distarch") arch_name = env['TARGET_ARCH'] if not dist_arch else dist_arch - n = env.GetTargetOSName() + "-" + arch_name + + # We need to make sure the directory names inside dist tarballs are permanently + # consistent, even if the target OS name used in scons is different. Any differences + # between the names used by env.TargetOSIs/env.GetTargetOSName should be added + # to the translation dictionary below. + os_name_translations = { + 'windows': 'win32' + } + os_name = env.GetTargetOSName() + os_name = os_name_translations.get(os_name, os_name) + n = os_name + "-" + arch_name if len(mongo_modules): n += "-" + "-".join(m.name for m in mongo_modules) |