58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
|
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
|
||
|
|
index c8f925b7..0e4f99ad 100644
|
||
|
|
--- a/src/mongo/SConscript
|
||
|
|
+++ b/src/mongo/SConscript
|
||
|
|
@@ -671,44 +671,6 @@ for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
|
||
|
|
for target in env["DIST_BINARIES"]:
|
||
|
|
installBinary(env, "db/modules/" + target)
|
||
|
|
|
||
|
|
-# Set the download url to the right place
|
||
|
|
-compass_type = 'compass-community'
|
||
|
|
-if 'enterprise' in env['MONGO_MODULES']:
|
||
|
|
- compass_type = 'compass'
|
||
|
|
-
|
||
|
|
-compass_script = "install_compass"
|
||
|
|
-if env.TargetOSIs('windows'):
|
||
|
|
- # On windows the .in needs to be explicitly added to the file.
|
||
|
|
- compass_script = "Install-Compass.ps1.in"
|
||
|
|
-
|
||
|
|
-compass_python_interpreter = '/usr/bin/env python2'
|
||
|
|
-if env.TargetOSIs('darwin'):
|
||
|
|
- compass_python_interpreter = '/usr/bin/env python'
|
||
|
|
-
|
||
|
|
-compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script,
|
||
|
|
- SUBST_DICT=[
|
||
|
|
- ('@compass_type@', compass_type),
|
||
|
|
- ('@python_interpreter@', compass_python_interpreter),
|
||
|
|
- ])
|
||
|
|
-distBinaries.append(compass_installer)
|
||
|
|
-
|
||
|
|
-if not hygienic:
|
||
|
|
- compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
|
||
|
|
-else:
|
||
|
|
- compass_script_installer = env.AutoInstall(
|
||
|
|
- 'bin',
|
||
|
|
- source=[
|
||
|
|
- compass_installer,
|
||
|
|
- ],
|
||
|
|
- INSTALL_ALIAS=[
|
||
|
|
- 'tools',
|
||
|
|
- ],
|
||
|
|
- )
|
||
|
|
-
|
||
|
|
-if env.TargetOSIs('posix'):
|
||
|
|
- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
|
||
|
|
- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
|
||
|
|
-
|
||
|
|
# "dist" target is valid only when --use-new-tools is specified
|
||
|
|
# Attempts to build release artifacts without tools must fail
|
||
|
|
if has_option("use-new-tools"):
|
||
|
|
@@ -726,7 +688,6 @@ if has_option("use-new-tools"):
|
||
|
|
'--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
|
||
|
|
'--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
|
||
|
|
'--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
|
||
|
|
- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
|
||
|
|
'${TEMPFILE(SOURCES[1:])}'
|
||
|
|
],
|
||
|
|
),
|