Attachment #345454 for bug #465242




env.Library('stacktrace', 'util/stacktrace.cpp')

env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp',
            LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools',
                     '$BUILD_DIR/mongo/base/base'])

serverOnlyFiles += mmapFiles

                                       "defaultversion",
                                       "gridfs",
                                       "notmongodormongos"])
env.Library("allclient", "client/clientOnly.cpp", LIBDEPS=["clientandshell"])

if has_option( "sharedclient" ):
    sharedClientLibName = str( env.SharedLibrary( "mongoclient", [], LIBDEPS=["allclient"] )[0] )

# dbtests test binary
env.StaticLibrary('testframework', ['dbtests/framework.cpp'], LIBDEPS=['unittest/unittest'])

        env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.h" ) )
        env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.hpp" ) )

#lib
if installSetup.libraries:
    env.Install('$INSTALL_DIR/$NIX_LIB_DIR', '#${LIBPREFIX}mongoclient${LIBSUFFIX}')
    if has_option( "sharedclient" ):
        env.Install( "$INSTALL_DIR/$NIX_LIB_DIR",  '#${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')

# Stage the top-level mongodb banners
distsrc = env.Dir('#distsrc')
env.Append(MODULE_BANNERS = [distsrc.File('README'),




# programs.

Import('env clientEnv')
Import("has_option")

env.Command(['mongo/base/error_codes.h', 'mongo/base/error_codes.cpp',],
            ['mongo/base/generate_error_codes.py', 'mongo/base/error_codes.err'],

    'mongo/client/dbclient.cpp',
    'mongo/client/dbclient_rs.cpp',
    'mongo/client/dbclientcursor.cpp',
    'mongo/client/distlock.cpp',
    'mongo/client/gridfs.cpp',
    'mongo/client/model.cpp',
    'mongo/client/sasl_client_authenticate.cpp',

    'mongo/util/timer.cpp',
    'mongo/util/trace.cpp',
    'mongo/util/util.cpp',
    'mongo/util/version.cpp',
    ]

clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp',


if env['MONGO_BUILD_SASL_CLIENT']:
    clientSource = clientSourceAll
    clientLibs = ["gsasl"]
else:
    clientSource = clientSourceBasic
    clientLibs = []

exampleSourceMap = [
        ('authTest', 'mongo/client/examples/authTest.cpp'),

    clientHeaders.extend(Glob('mongo/%s/*.h' % path))
    clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))


mongoclient_libs = [ env.Library('mongoclient', clientSource, LIBS=clientLibs) ]
if has_option( "sharedclient" ):
	mongoclient_libs.append( env.SharedLibrary('mongoclient', clientSource) )

mongoclient_install = env.Install('#/', mongoclient_libs)
	
env.Alias('mongoclient', mongoclient_install)

clientTests = clientEnv.Install('#/', [
        clientEnv.Program(target,
                          [source, mongoclient_libs[-1]]) for (target, source) in exampleSourceMap])

clientTests.append(
    clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp')))

prefix = GetOption("prefix")

env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
if has_option( "sharedclient" ):
	env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')

for x in clientHeaderDirectories:
    inst = env.Install(prefix + "/include/mongo/" + x,

Lines 843-849 Link Here

(-)mongodb-src-r2.4.1/SConstruct (-1 / +1 lines)
843		844
844	env['MONGO_BUILD_SASL_CLIENT'] = bool(has_option("use-sasl-client"))	845	env['MONGO_BUILD_SASL_CLIENT'] = bool(has_option("use-sasl-client"))
845	if env['MONGO_BUILD_SASL_CLIENT'] and not conf.CheckLibWithHeader(	846	if env['MONGO_BUILD_SASL_CLIENT'] and not conf.CheckLibWithHeader(
846	"gsasl", "gsasl.h", "C", "gsasl_check_version(GSASL_VERSION);", autoadd=False):	847	"gsasl", "gsasl.h", "C", "gsasl_check_version(GSASL_VERSION);"):
847		848
848	Exit(1)	849	Exit(1)
849		850

Return to bug 465242

Lines 452-458 Link Here

(-)mongodb-src-r2.4.1/src/mongo/SConscript (-11 / +1 lines)
452	env.Library('stacktrace', 'util/stacktrace.cpp')	452	env.Library('stacktrace', 'util/stacktrace.cpp')
453		453
454	env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp',	454	env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp',
455	LIBDEPS=['stacktrace',	455	LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools',
456	'$BUILD_DIR/mongo/base/base'])	456	'$BUILD_DIR/mongo/base/base'])
457		457
458	serverOnlyFiles += mmapFiles	458	serverOnlyFiles += mmapFiles
Lines 654-663 Link Here
654	"defaultversion",	654	"defaultversion",
655	"gridfs",	655	"gridfs",
656	"notmongodormongos"])	656	"notmongodormongos"])
657	env.Library("allclient", "client/clientOnly.cpp", LIBDEPS=["clientandshell"])
658
659	if has_option( "sharedclient" ):
660	sharedClientLibName = str( env.SharedLibrary( "mongoclient", [], LIBDEPS=["allclient"] )[0] )
661		657
662	# dbtests test binary	658	# dbtests test binary
663	env.StaticLibrary('testframework', ['dbtests/framework.cpp'], LIBDEPS=['unittest/unittest'])	659	env.StaticLibrary('testframework', ['dbtests/framework.cpp'], LIBDEPS=['unittest/unittest'])
Lines 806-817 Link Here
806	env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.h" ) )	802	env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.h" ) )
807	env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.hpp" ) )	803	env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.hpp" ) )
808		804
809	#lib
810	if installSetup.libraries:
811	env.Install('$INSTALL_DIR/$NIX_LIB_DIR', '#${LIBPREFIX}mongoclient${LIBSUFFIX}')
812	if has_option( "sharedclient" ):
813	env.Install( "$INSTALL_DIR/$NIX_LIB_DIR", '#${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
814
815	# Stage the top-level mongodb banners	805	# Stage the top-level mongodb banners
816	distsrc = env.Dir('#distsrc')	806	distsrc = env.Dir('#distsrc')
817	env.Append(MODULE_BANNERS = [distsrc.File('README'),	807	env.Append(MODULE_BANNERS = [distsrc.File('README'),

Lines 4-9 Link Here

(-)mongodb-src-r2.4.1/src/SConscript.client (-8 / +13 lines)
4	# programs.	4	# programs.
5		5
6	Import('env clientEnv')	6	Import('env clientEnv')
		7	Import("has_option")
7		8
8	env.Command(['mongo/base/error_codes.h', 'mongo/base/error_codes.cpp',],	9	env.Command(['mongo/base/error_codes.h', 'mongo/base/error_codes.cpp',],
9	['mongo/base/generate_error_codes.py', 'mongo/base/error_codes.err'],	10	['mongo/base/generate_error_codes.py', 'mongo/base/error_codes.err'],
Lines 37-43 Link Here
37	'mongo/client/dbclient.cpp',	38	'mongo/client/dbclient.cpp',
38	'mongo/client/dbclient_rs.cpp',	39	'mongo/client/dbclient_rs.cpp',
39	'mongo/client/dbclientcursor.cpp',	40	'mongo/client/dbclientcursor.cpp',
40	'mongo/client/distlock.cpp',
41	'mongo/client/gridfs.cpp',	41	'mongo/client/gridfs.cpp',
42	'mongo/client/model.cpp',	42	'mongo/client/model.cpp',
43	'mongo/client/sasl_client_authenticate.cpp',	43	'mongo/client/sasl_client_authenticate.cpp',
Lines 84-90 Link Here
84	'mongo/util/timer.cpp',	84	'mongo/util/timer.cpp',
85	'mongo/util/trace.cpp',	85	'mongo/util/trace.cpp',
86	'mongo/util/util.cpp',	86	'mongo/util/util.cpp',
87	'mongo/util/version.cpp',
88	]	87	]
89		88
90	clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp',	89	clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp',
Lines 94-101 Link Here
94		93
95	if env['MONGO_BUILD_SASL_CLIENT']:	94	if env['MONGO_BUILD_SASL_CLIENT']:
96	clientSource = clientSourceAll	95	clientSource = clientSourceAll
		96	clientLibs = ["gsasl"]
97	else:	97	else:
98	clientSource = clientSourceBasic	98	clientSource = clientSourceBasic
		99	clientLibs = []
99		100
100	exampleSourceMap = [	101	exampleSourceMap = [
101	('authTest', 'mongo/client/examples/authTest.cpp'),	102	('authTest', 'mongo/client/examples/authTest.cpp'),
Lines 134-149 Link Here
134	clientHeaders.extend(Glob('mongo/%s/*.h' % path))	135	clientHeaders.extend(Glob('mongo/%s/*.h' % path))
135	clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))	136	clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))
136		137
137	mongoclient_lib = env.Library('mongoclient', clientSource),	138
138	mongoclient_install = env.Install('#/', [	139	mongoclient_libs = [ env.Library('mongoclient', clientSource, LIBS=clientLibs) ]
139	mongoclient_lib,	140	if has_option( "sharedclient" ):
140	#env.SharedLibrary('mongoclient', clientSource),	141	mongoclient_libs.append( env.SharedLibrary('mongoclient', clientSource) )
141	])	142
		143	mongoclient_install = env.Install('#/', mongoclient_libs)
		144
142	env.Alias('mongoclient', mongoclient_install)	145	env.Alias('mongoclient', mongoclient_install)
143		146
144	clientTests = clientEnv.Install('#/', [	147	clientTests = clientEnv.Install('#/', [
145	clientEnv.Program(target,	148	clientEnv.Program(target,
146	[source, mongoclient_lib]) for (target, source) in exampleSourceMap])	149	[source, mongoclient_libs[-1]]) for (target, source) in exampleSourceMap])
147		150
148	clientTests.append(	151	clientTests.append(
149	clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp')))	152	clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp')))
Lines 178-183 Link Here
178	prefix = GetOption("prefix")	181	prefix = GetOption("prefix")
179		182
180	env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')	183	env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
		184	if has_option( "sharedclient" ):
		185	env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
181		186
182	for x in clientHeaderDirectories:	187	for x in clientHeaderDirectories:
183	inst = env.Install(prefix + "/include/mongo/" + x,	188	inst = env.Install(prefix + "/include/mongo/" + x,