1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 9cde728..e29664e 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -629,33 +629,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)
-
-compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
-
-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"):
@@ -673,7 +646,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:])}'
],
),
|
GitWeb
