SERVER-9668 Use SCons install target tags to identify mapping of targets to install packages.

Author: chasinglogic

SConstruct

@@ -100,6 +100,20 @@ add_option('prefix',
     help='installation prefix',
 )
 
+add_option('dest-dir',
+    default=None,
+    help='root of installation as a subdirectory of $BUILD_DIR'
+)
+
+add_option('legacy-tarball',
+    choices=['true', 'false'],
+    default='false',
+    const='true',
+    nargs='?',
+    type='choice',
+    help='Build a tarball matching the old MongoDB dist targets',
+)
+
 add_option('install-mode',
     choices=['legacy', 'hygienic'],
     default='legacy',
@@ -947,9 +961,9 @@ if cacheDir[0] not in ['$', '#']:
         print("Do not use relative paths with --cache-dir")
         Exit(1)
 
-installDir = get_option('prefix').rstrip('/')
-if installDir[0] not in ['$', '#']:
-    if not os.path.isabs(installDir):
+prefix = get_option('prefix').rstrip('/')
+if prefix[0] not in ['$', '#']:
+    if not os.path.isabs(prefix):
         print("Do not use relative paths with --prefix")
         Exit(1)
 
@@ -1029,12 +1043,33 @@ envDict = dict(BUILD_ROOT=buildDir,
                BENCHMARK_LIST='$BUILD_ROOT/benchmarks.txt',
                CONFIGUREDIR='$BUILD_ROOT/scons/$VARIANT_DIR/sconf_temp',
                CONFIGURELOG='$BUILD_ROOT/scons/config.log',
-               INSTALL_DIR=installDir,
+               PREFIX=get_option('prefix'),
                CONFIG_HEADER_DEFINES={},
                LIBDEPS_TAG_EXPANSIONS=[],
                )
 
 env = Environment(variables=env_vars, **envDict)
+
+if get_option('dest-dir') is None:
+    destDir = env.Dir('$BUILD_ROOT/install')
+    prefix = env.Dir(get_option('prefix'))
+    if destDir != prefix:
+        installDir = destDir.Dir(get_option('prefix')[1:])
+    else:
+        installDir = destDir
+else:
+    destDir = get_option('dest-dir')
+    if destDir[0] not in ['$', '#']:
+        if not os.path.isabs(destDir):
+            print("Do not use relative paths with --dest-dir")
+            Exit(1)
+    installDir = destDir
+
+env['INSTALL_DIR'] = installDir
+env['DEST_DIR'] = destDir
+if get_option('legacy-tarball') == 'true':
+    env['INSTALL_DIR'] = env.Dir('$INSTALL_DIR').Dir('$SERVER_DIST_BASENAME')
+
 del envDict
 
 for var in ['CC', 'CXX']:
@@ -3633,10 +3668,65 @@ if get_option('install-mode') == 'hygienic':
         env.Tool('separate_debug')
 
     env.Tool('auto_install_binaries')
+    env.AddSuffixMapping({
+        "$PROGSUFFIX": env.SuffixMap(
+            directory="$PREFIX_BIN_DIR",
+            default_roles=[
+                "runtime",
+            ]
+        ),
+        
+        "$LIBSUFFIX": env.SuffixMap(
+            directory="$PREFIX_LIB_DIR",
+            default_roles=[
+                "dev",
+            ]
+        ),
+
+        "$SHLIBSUFFIX": env.SuffixMap(
+            directory="$PREFIX_BIN_DIR" \
+            if mongo_platform.get_running_os_name() == "windows" \
+            else "$PREFIX_LIB_DIR",
+            default_roles=[
+                "runtime",
+            ]
+        ),
+
+        ".debug": env.SuffixMap(
+            directory="$PREFIX_DEBUG_DIR",
+            default_roles=[
+                "debug",
+            ]
+        ),
+        
+        ".dSYM": env.SuffixMap(
+            directory="$PREFIX_DEBUG_DIR",
+            default_roles=[
+                "debug"
+            ]
+        ),
+        
+        ".lib": env.SuffixMap(
+            directory="$PREFIX_LIB_DIR",
+            default_roles=[
+                "dev"
+            ]
+        ),
+        
+        ".h": env.SuffixMap(
+            directory="$PREFIX_INCLUDE_DIR",
+            default_roles=[
+                "dev",
+            ]
+        ),
+    })
+
     if env['PLATFORM'] == 'posix':
         env.AppendUnique(
             RPATH=[
-                env.Literal('\\$$ORIGIN/../lib')
+                # In the future when we want to improve dynamic builds
+                # we should set this to $PREFIX ideally
+                 env.Literal('\\$$ORIGIN/../lib'),
             ],
             LINKFLAGS=[
                 # Most systems *require* -z,origin to make origin work, but android
@@ -3957,10 +4047,6 @@ if should_dagger:
     # Require everything to be built before trying to extract build dependency information
     env.Requires(dependencyDb, allTargets)
 
-# We don't want installing files to cause them to flow into the cache,
-# since presumably we can re-install them from the origin if needed.
-env.NoCache(env.FindInstalledFiles())
-
 # Declare the cache prune target
 cachePrune = env.Command(
     target="#cache-prune",
@@ -3974,6 +4060,13 @@ cachePrune = env.Command(
 env.AlwaysBuild(cachePrune)
 env.Alias('cache-prune', cachePrune)
 
+if get_option('install-mode') == 'hygienic':
+    env.FinalizeInstallDependencies()
+
+# We don't want installing files to cause them to flow into the cache,	
+# since presumably we can re-install them from the origin if needed.	
+env.NoCache(env.FindInstalledFiles())
+
 # Substitute environment variables in any build targets so that we can
 # say, for instance:
 #

buildscripts/runandroidsim.sh

@@ -63,7 +63,7 @@ $ANDROID_SDK/platform-tools/adb push $DIRECTORY /data
 echo "Running the test on the virtual device"
 $ANDROID_SDK/platform-tools/adb shell /data/$(basename $DIRECTORY)/$TEST_PATH_IN_DIRECTORY "$@" | tee android_sim_test_output.txt 2>&1
 
-# On the android sim ( possibly on nomral android as well ) if a program fails its runtime link,
+# On the android sim ( possibly on normal android as well ) if a program fails its runtime link,
 # for example because of a missing library, it will have an exit code of 0. In which case the
 # android_sim_test_output.txt file will not contian the test output, but instead will contain
 # "CANNOT LINK EXECUTABLE"

etc/evergreen.yml

@@ -1321,6 +1321,8 @@ functions:
   "do benchmark embedded setup":
   - command: manifest.load
   - *git_get_project
+  - *set_task_expansion_macros
+  - *set_up_virtualenv
   - *fetch_artifacts
   - *get_buildnumber
   - *set_up_credentials
@@ -3856,7 +3858,7 @@ tasks:
           --install-mode=hygienic
           --js-engine=none
           --opt=size
-          --prefix='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION'
+          --dest-dir='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION'
           --separate-debug
           --ssl=off
           --use-system-mongo-c=on