Attachment #345496 for bug #465242




# 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
    env.Append(LIBS="gsasl")
else:
    clientSource = clientSourceBasic


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


mongoclient_libs = [ env.Library('mongoclient', clientSource) ]
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,




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'),

Return to bug 465242

Lines 4-9 Link Here

(-)a/src/SConscript.client (-8 / +12 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 36-42 clientSourceBasic = [ Link Here
36	'mongo/client/dbclient.cpp',	37	'mongo/client/dbclient.cpp',
37	'mongo/client/dbclient_rs.cpp',	38	'mongo/client/dbclient_rs.cpp',
38	'mongo/client/dbclientcursor.cpp',	39	'mongo/client/dbclientcursor.cpp',
39	'mongo/client/distlock.cpp',
40	'mongo/client/gridfs.cpp',	40	'mongo/client/gridfs.cpp',
41	'mongo/client/model.cpp',	41	'mongo/client/model.cpp',
42	'mongo/client/sasl_client_authenticate.cpp',	42	'mongo/client/sasl_client_authenticate.cpp',
Lines 83-89 clientSourceBasic = [ Link Here
83	'mongo/util/timer.cpp',	83	'mongo/util/timer.cpp',
84	'mongo/util/trace.cpp',	84	'mongo/util/trace.cpp',
85	'mongo/util/util.cpp',	85	'mongo/util/util.cpp',
86	'mongo/util/version.cpp',
87	]	86	]
88		87
89	clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp',	88	clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp',
Lines 93-98 clientSourceAll = clientSourceBasic + clientSourceSasl Link Here
93		92
94	if env['MONGO_BUILD_SASL_CLIENT']:	93	if env['MONGO_BUILD_SASL_CLIENT']:
95	clientSource = clientSourceAll	94	clientSource = clientSourceAll
		95	env.Append(LIBS="gsasl")
96	else:	96	else:
97	clientSource = clientSourceBasic	97	clientSource = clientSourceBasic
98		98
Lines 133-148 for path in clientHeaderDirectories: Link Here
133	clientHeaders.extend(Glob('mongo/%s/*.h' % path))	133	clientHeaders.extend(Glob('mongo/%s/*.h' % path))
134	clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))	134	clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))
135		135
136	mongoclient_lib = env.Library('mongoclient', clientSource),	136
137	mongoclient_install = env.Install('#/', [	137	mongoclient_libs = [ env.Library('mongoclient', clientSource) ]
138	mongoclient_lib,	138	if has_option( "sharedclient" ):
139	#env.SharedLibrary('mongoclient', clientSource),	139	mongoclient_libs.append( env.SharedLibrary('mongoclient', clientSource) )
140	])	140
		141	mongoclient_install = env.Install('#/', mongoclient_libs)
		142
141	env.Alias('mongoclient', mongoclient_install)	143	env.Alias('mongoclient', mongoclient_install)
142		144
143	clientTests = clientEnv.Install('#/', [	145	clientTests = clientEnv.Install('#/', [
144	clientEnv.Program(target,	146	clientEnv.Program(target,
145	[source, mongoclient_lib]) for (target, source) in exampleSourceMap])	147	[source, mongoclient_libs[-1]]) for (target, source) in exampleSourceMap])
146		148
147	clientTests.append(	149	clientTests.append(
148	clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp')))	150	clientEnv.Install('#/', clientEnv.Program('bsondemo', 'mongo/bson/bsondemo/bsondemo.cpp')))
Lines 177-182 env.Install( Link Here
177	prefix = GetOption("prefix")	179	prefix = GetOption("prefix")
178		180
179	env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')	181	env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
		182	if has_option( "sharedclient" ):
		183	env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
180		184
181	for x in clientHeaderDirectories:	185	for x in clientHeaderDirectories:
182	inst = env.Install(prefix + "/include/mongo/" + x,	186	inst = env.Install(prefix + "/include/mongo/" + x,

Lines 452-458 Link Here

(-)a/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'),