diff options
| -rw-r--r-- | SConstruct | 31 | ||||
| -rw-r--r-- | src/mongo/SConscript | 33 | ||||
| -rw-r--r-- | src/mongo/db/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/shell/SConscript | 1 |
4 files changed, 31 insertions, 36 deletions
diff --git a/SConstruct b/SConstruct index 07dc5e427ab..2d80cba783d 100644 --- a/SConstruct +++ b/SConstruct @@ -5096,35 +5096,6 @@ if get_option('legacy-tarball') == 'true': module_sconscripts = moduleconfig.get_module_sconscripts(mongo_modules) -# This generates a numeric representation of the version string so that -# you can easily compare versions of MongoDB without having to parse -# the version string. -# -# Examples: -# 5.1.1-123 => ['5', '1', '1', '123', None, None] => [5, 1, 2, -100] -# 5.1.1-rc2 => ['5', '1', '1', 'rc2', 'rc', '2'] => [5, 1, 1, -23] -# 5.1.1-rc2-123 => ['5', '1', '1', 'rc2-123', 'rc', '2'] => [5, 1, 1, -23] -# 5.1.0-alpha-123 => ['5', '1', '0', 'alpha-123', 'alpha', ''] => [5, 1, 0, -50] -# 5.1.0-alpha1-123 => ['5', '1', '0', 'alpha1-123', 'alpha', '1'] => [5, 1, 0, -49] -# 5.1.1 => ['5', '1', '1', '', None, None] => [5, 1, 1, 0] - -version_parts = [ x for x in re.match(r'^(\d+)\.(\d+)\.(\d+)-?((?:(rc|alpha)(\d?))?.*)?', - env['MONGO_VERSION']).groups() ] -version_extra = version_parts[3] if version_parts[3] else "" -if version_parts[4] == 'rc': - version_parts[3] = int(version_parts[5]) + -25 -elif version_parts[4] == 'alpha': - if version_parts[5] == '': - version_parts[3] = -50 - else: - version_parts[3] = int(version_parts[5]) + -50 -elif version_parts[3]: - version_parts[2] = int(version_parts[2]) + 1 - version_parts[3] = -100 -else: - version_parts[3] = 0 -version_parts = [ int(x) for x in version_parts[:4]] - # The following symbols are exported for use in subordinate SConscript files. # Ideally, the SConscript files would be purely declarative. They would only # import build environment objects, and would contain few or no conditional @@ -5150,8 +5121,6 @@ Export([ 'use_system_version_of_library', 'use_vendored_libunwind', 'usemozjs', - 'version_extra', - 'version_parts', 'wiredtiger', ]) diff --git a/src/mongo/SConscript b/src/mongo/SConscript index 8a7e3af3a01..ba404f5467e 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -7,14 +7,41 @@ Import([ "has_option", "get_option", "use_libunwind", - "version_extra", - "version_parts", ]) env = env.Clone() env.InjectMongoIncludePaths() +# This generates a numeric representation of the version string so that +# you can easily compare versions of MongoDB without having to parse +# the version string. +# +# Examples: +# 5.1.1-123 => ['5', '1', '1', '123', None, None] => [5, 1, 2, -100] +# 5.1.1-rc2 => ['5', '1', '1', 'rc2', 'rc', '2'] => [5, 1, 1, -23] +# 5.1.1-rc2-123 => ['5', '1', '1', 'rc2-123', 'rc', '2'] => [5, 1, 1, -23] +# 5.1.0-alpha-123 => ['5', '1', '0', 'alpha-123', 'alpha', ''] => [5, 1, 0, -50] +# 5.1.0-alpha1-123 => ['5', '1', '0', 'alpha1-123', 'alpha', '1'] => [5, 1, 0, -49] +# 5.1.1 => ['5', '1', '1', '', None, None] => [5, 1, 1, 0] + +version_parts = [ x for x in re.match(r'^(\d+)\.(\d+)\.(\d+)-?((?:(rc|alpha)(\d?))?.*)?', + env['MONGO_VERSION']).groups() ] +version_extra = version_parts[3] if version_parts[3] else "" +if version_parts[4] == 'rc': + version_parts[3] = int(version_parts[5]) + -25 +elif version_parts[4] == 'alpha': + if version_parts[5] == '': + version_parts[3] = -50 + else: + version_parts[3] = int(version_parts[5]) + -50 +elif version_parts[3]: + version_parts[2] = int(version_parts[2]) + 1 + version_parts[3] = -100 +else: + version_parts[3] = 0 +version_parts = [ int(x) for x in version_parts[:4]] + env.AppendUnique( FORCEINCLUDES=[ 'mongo/platform/basic.h', @@ -48,6 +75,8 @@ env.SConscript( ], exports=[ 'env', + 'version_extra', + 'version_parts', ], ) diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index c94a8f06836..f83373e8d84 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -2315,8 +2315,6 @@ env.Program( "default", "dist", "dist-test", - "serverless", - "serverless-test", "servers", "integration-tests", ], diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript index 5e64d6ce24e..03317db08f3 100644 --- a/src/mongo/shell/SConscript +++ b/src/mongo/shell/SConscript @@ -346,7 +346,6 @@ if not has_option('noshell') and usemozjs: "default", "dist", "dist-test", - "serverless-test", "shell", "integration-tests", ], |