← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mongo/base/SConscript

  • 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/mongo/base/SConscript
 
1
# -*- mode: python -*-
 
2
 
 
3
Import("env")
 
4
 
 
5
env.Command(['error_codes.h', 'error_codes.cpp'], ['generate_error_codes.py', 'error_codes.err'],
 
6
            '$PYTHON $SOURCES $TARGETS')
 
7
 
 
8
env.StaticLibrary('base', ['configuration_variable_manager.cpp',
 
9
                           'error_codes.cpp',
 
10
                           'global_initializer.cpp',
 
11
                           'global_initializer_registerer.cpp',
 
12
                           'init.cpp',
 
13
                           'initializer.cpp',
 
14
                           'initializer_context.cpp',
 
15
                           'initializer_dependency_graph.cpp',
 
16
                           'make_string_vector.cpp',
 
17
                           'parse_number.cpp',
 
18
                           'status.cpp',
 
19
                           'string_data.cpp'])
 
20
 
 
21
env.CppUnitTest('configuration_variable_manager_test',
 
22
                ['configuration_variable_manager_test.cpp'],
 
23
                LIBDEPS=['base'])
 
24
 
 
25
env.CppUnitTest('initializer_dependency_graph_test',
 
26
                ['initializer_dependency_graph_test.cpp'],
 
27
                LIBDEPS=['base'])
 
28
 
 
29
env.CppUnitTest('initializer_test',
 
30
                ['initializer_test.cpp'],
 
31
                LIBDEPS=['base'])
 
32
 
 
33
env.CppUnitTest('owned_pointer_vector_test',
 
34
                ['owned_pointer_vector_test.cpp'],
 
35
                LIBDEPS=['base'])
 
36
 
 
37
env.CppUnitTest('owned_pointer_map_test',
 
38
                ['owned_pointer_map_test.cpp'],
 
39
                LIBDEPS=['base'])
 
40
 
 
41
env.CppUnitTest('parse_number_test',
 
42
                ['parse_number_test.cpp'],
 
43
                LIBDEPS=['base'])
 
44
 
 
45
env.CppUnitTest('status_test',
 
46
                'status_test.cpp',
 
47
                LIBDEPS=['base'])
 
48
 
 
49
env.CppUnitTest('counter_test',
 
50
                'counter_test.cpp',
 
51
                LIBDEPS=['base'])
 
52
 
 
53
env.CppUnitTest('string_data_test',
 
54
                'string_data_test.cpp',
 
55
                LIBDEPS=['$BUILD_DIR/mongo/unittest/unittest'])