← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/SConscript.client

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/SConscript.client
5
5
 
6
6
Import('env clientEnv')
7
7
 
8
 
clientSource = [
 
8
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
            '$PYTHON $SOURCES $TARGETS')
 
11
 
 
12
env.Command(['mongo/db/auth/action_type.h', 'mongo/db/auth/action_type.cpp'], 
 
13
            ['mongo/db/auth/generate_action_types.py', 'mongo/db/auth/action_types.txt'],
 
14
            '$PYTHON $SOURCES $TARGETS')
 
15
 
 
16
clientSourceBasic = [
 
17
    'mongo/base/configuration_variable_manager.cpp',
 
18
    'mongo/base/error_codes.cpp',
 
19
    'mongo/base/global_initializer.cpp',
 
20
    'mongo/base/global_initializer_registerer.cpp',
 
21
    'mongo/base/init.cpp',
 
22
    'mongo/base/initializer.cpp',
 
23
    'mongo/base/initializer_context.cpp',
 
24
    'mongo/base/initializer_dependency_graph.cpp',
 
25
    'mongo/base/make_string_vector.cpp',
 
26
    'mongo/base/parse_number.cpp',
 
27
    'mongo/base/status.cpp',
 
28
    'mongo/base/string_data.cpp',
 
29
    'mongo/bson/bson_validate.cpp',
9
30
    'mongo/bson/oid.cpp',
 
31
    'mongo/bson/util/bson_extract.cpp',
10
32
    'mongo/buildinfo.cpp',
11
 
    "mongo/client/authentication_table_common.cpp",
12
 
    "mongo/client/authentication_table_client.cpp",
13
33
    'mongo/client/clientAndShell.cpp',
14
34
    'mongo/client/clientOnly.cpp',
15
35
    'mongo/client/connection_factory.cpp',
20
40
    'mongo/client/distlock.cpp',
21
41
    'mongo/client/gridfs.cpp',
22
42
    'mongo/client/model.cpp',
 
43
    'mongo/client/sasl_client_authenticate.cpp',
23
44
    'mongo/client/syncclusterconnection.cpp',
24
45
    'mongo/db/jsobj.cpp',
25
46
    'mongo/db/json.cpp',
26
47
    'mongo/db/lasterror.cpp',
27
48
    'mongo/db/namespace.cpp',
28
 
    'mongo/db/nonce.cpp',
29
49
    'mongo/db/dbmessage.cpp',
30
50
    'mongo/pch.cpp',
 
51
    'mongo/platform/random.cpp',
31
52
    'mongo/util/assert_util.cpp',
32
53
    'mongo/util/background.cpp',
33
54
    'mongo/util/base64.cpp',
40
61
    'mongo/util/debug_util.cpp',
41
62
    'mongo/util/stacktrace.cpp',
42
63
    'mongo/util/file_allocator.cpp',
 
64
    'mongo/util/fail_point.cpp',
 
65
    'mongo/util/fail_point_registry.cpp',
 
66
    'mongo/util/fail_point_service.cpp',
43
67
    'mongo/util/histogram.cpp',
44
68
    'mongo/util/intrusive_counter.cpp',
45
69
    'mongo/util/log.cpp',
50
74
    'mongo/util/net/message.cpp',
51
75
    'mongo/util/net/message_port.cpp',
52
76
    'mongo/util/net/sock.cpp',
 
77
    'mongo/util/net/ssl_manager.cpp',
53
78
    'mongo/util/password.cpp',
54
79
    'mongo/util/ramlog.cpp',
55
80
    'mongo/util/signal_handlers.cpp',
59
84
    'mongo/util/timer.cpp',
60
85
    'mongo/util/trace.cpp',
61
86
    'mongo/util/util.cpp',
 
87
    'mongo/util/version.cpp',
62
88
    ]
63
89
 
 
90
clientSourceSasl = ['mongo/client/sasl_client_authenticate_impl.cpp',
 
91
                    'mongo/util/gsasl_session.cpp']
 
92
 
 
93
clientSourceAll = clientSourceBasic + clientSourceSasl
 
94
 
 
95
if env['MONGO_BUILD_SASL_CLIENT']:
 
96
    clientSource = clientSourceAll
 
97
else:
 
98
    clientSource = clientSourceBasic
 
99
 
64
100
exampleSourceMap = [
65
101
        ('authTest', 'mongo/client/examples/authTest.cpp'),
66
102
        ('clientTest', 'mongo/client/examples/clientTest.cpp'),
73
109
        ]
74
110
 
75
111
clientHeaderDirectories = [
 
112
    "base/",
76
113
    "bson/",
77
114
    "bson/util/",
78
115
    "client/",
79
116
    "db/",
 
117
    "db/auth/",
80
118
    "db/stats/",
81
119
    "db/repl/",
82
120
    "db/ops/",
119
157
                 '$CLIENT_SCONSTRUCT',
120
158
                 '$CLIENT_LICENSE',
121
159
                 'SConscript.client',
 
160
                 'mongo/base/generate_error_codes.py',
 
161
                 'mongo/base/error_codes.err',
 
162
                 'mongo/db/auth/generate_action_types.py',
 
163
                 'mongo/db/auth/action_types.txt',
122
164
                 '#buildscripts/make_archive.py',
123
 
                 clientSource,
 
165
                 clientSourceAll,
124
166
                 clientHeaders,
125
167
                 [source for (target, source) in exampleSourceMap],
126
168
                 'mongo/bson/bsondemo/bsondemo.cpp',
138
180
env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
139
181
 
140
182
for x in clientHeaderDirectories:
141
 
    env.Install(prefix + "/include/mongo/" + x,
142
 
                [Glob('mongo/%s*.h' % x), Glob('mongo/%s*.hpp' % x)])
 
183
    inst = env.Install(prefix + "/include/mongo/" + x,
 
184
                       [Glob('mongo/%s*.h' % x), Glob('mongo/%s*.hpp' % x)])
 
185
    env.AddPostAction(inst, Chmod('$TARGET', 0644))