diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | SConstruct | 76 | ||||
-rwxr-xr-x | buildscripts/errorcodes.py | 2 | ||||
-rw-r--r-- | buildscripts/utils.py | 7 | ||||
-rw-r--r-- | distsrc/client/LICENSE.txt | 203 | ||||
-rw-r--r-- | distsrc/client/SConstruct | 36 |
6 files changed, 307 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 9b8ff680ff4..ec40a731bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -79,10 +79,12 @@ mongostat *.tar.gz mongodb-* +mongo-cxx-driver-* #libs libmongoclient.* libmongotestfiles.* +libmongoshellfiles.* # examples firstExample diff --git a/SConstruct b/SConstruct index 74726aa4511..3dce641c062 100644 --- a/SConstruct +++ b/SConstruct @@ -331,6 +331,8 @@ else: if ( not ( usesm or usev8 or justClientLib) ): usesm = True +distBuild = len( COMMAND_LINE_TARGETS ) == 1 and ( str( COMMAND_LINE_TARGETS[0] ) == "s3dist" or str( COMMAND_LINE_TARGETS[0] ) == "dist" ) + extraLibPlaces = [] def addExtraLibs( s ): @@ -351,13 +353,34 @@ if GetOption( "extralib" ) is not None: for x in GetOption( "extralib" ).split( "," ): env.Append( LIBS=[ x ] ) -# class InstallSetup: -# binaries = True -# clientSrc = False +class InstallSetup: + binaries = False + clientSrc = False + headers = False + bannerDir = None + headerRoot = "include" -# def default(self): + def __init__(self): + self.default() + + def default(self): + self.binaries = True + self.clientSrc = False + self.headers = False + self.bannerDir = None + self.headerRoot = "include" + + def justClient(self): + self.binaries = False + self.clientSrc = True + self.headers = True + self.bannerDir = "distsrc/client/" + self.headerRoot = "" -# installSetup = Installsetup() +installSetup = InstallSetup() +if distBuild: + installSetup.bannerDir = "distsrc" + # ------ SOURCE FILE SETUP ----------- @@ -397,11 +420,11 @@ coreServerFiles += Glob( "db/stats/*.cpp" ) serverOnlyFiles += [ "db/driverHelpers.cpp" ] if usesm: - commonFiles += [ "scripting/engine_spidermonkey.cpp" ] + coreServerFiles += [ "scripting/engine_spidermonkey.cpp" ] elif usev8: - commonFiles += [ Glob( "scripting/*v8*.cpp" ) ] + coreServerFiles += [ Glob( "scripting/*v8*.cpp" ) ] else: - commonFiles += [ "scripting/engine_none.cpp" ] + coreServerFiles += [ "scripting/engine_none.cpp" ] coreShardFiles = [] shardServerFiles = coreShardFiles + Glob( "s/strategy*.cpp" ) + [ "s/commands_admin.cpp" , "s/commands_public.cpp" , "s/request.cpp" , "s/cursors.cpp" , "s/server.cpp" , "s/chunk.cpp" , "s/shard.cpp" , "s/shardkey.cpp" , "s/config.cpp" , "s/config_migrate.cpp" , "s/s_only.cpp" , "s/stats.cpp" , "s/balance.cpp" , "db/cmdline.cpp" ] @@ -445,12 +468,14 @@ nixLibPrefix = "lib" distName = GetOption( "distname" ) dontReplacePackage = False -distBuild = len( COMMAND_LINE_TARGETS ) == 1 and ( str( COMMAND_LINE_TARGETS[0] ) == "s3dist" or str( COMMAND_LINE_TARGETS[0] ) == "dist" ) if distBuild: release = True if GetOption( "prefix" ): installDir = GetOption( "prefix" ) + if installDir.find( "mongo-cxx-driver" ) >= 0: + installSetup.justClient() + def findVersion( root , choices ): if not isinstance(root, list): @@ -1082,6 +1107,7 @@ clientLibName = str( env.Library( "mongoclient" , allClientFiles )[0] ) if GetOption( "sharedclient" ): sharedClientLibName = str( env.SharedLibrary( "mongoclient" , allClientFiles )[0] ) env.Library( "mongotestfiles" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + ["client/gridfs.cpp"]) +env.Library( "mongoshellfiles" , allClientFiles + coreServerFiles ) clientTests = [] @@ -1164,7 +1190,7 @@ elif not onlyServer: if weird: mongo = shellEnv.Program( "mongo" , shell32BitFiles ) else: - shellEnv.Prepend( LIBS=[ "mongoclient"] ) + shellEnv.Prepend( LIBS=[ "mongoshellfiles"] ) mongo = shellEnv.Program( "mongo" , coreShellFiles ) if weird: @@ -1468,6 +1494,9 @@ def checkGlibc(target,source,env): allBinaries = [] def installBinary( e , name ): + if not installSetup.binaries: + return + global allBinaries if windows: @@ -1508,18 +1537,29 @@ env.Alias( "core" , [ add_exe( "mongo" ) , add_exe( "mongod" ) , add_exe( "mongo # on a case-by-case basis. #headers -for id in [ "", "util/", "util/mongoutils/", "util/concurrency/", "db/" , "client/" , "bson/", "bson/util/"]: - env.Install( installDir + "/include/mongo/" + id , Glob( id + "*.h" ) ) +if installSetup.headers: + for id in [ "", "util/", "util/mongoutils/", "util/concurrency/", "db/" , "db/stats/" , "db/repl/" , "client/" , "bson/", "bson/util/" , "s/" , "scripting/" ]: + env.Install( installDir + "/" + installSetup.headerRoot + "/mongo/" + id , Glob( id + "*.h" ) ) + env.Install( installDir + "/" + installSetup.headerRoot + "/mongo/" + id , Glob( id + "*.hpp" ) ) + +if installSetup.clientSrc: + for x in allClientFiles: + x = str(x) + env.Install( installDir + "/mongo/" + x.rpartition( "/" )[0] , x ) #lib -env.Install( installDir + "/" + nixLibPrefix, clientLibName ) +if installSetup.binaries: + env.Install( installDir + "/" + nixLibPrefix, clientLibName ) #textfiles -if distBuild or release: - #don't want to install these /usr/local/ for example - env.Install( installDir , "distsrc/README" ) - env.Install( installDir , "distsrc/THIRD-PARTY-NOTICES" ) - env.Install( installDir , "distsrc/GNU-AGPL-3.0" ) +if installSetup.bannerDir: + for x in os.listdir( installSetup.bannerDir ): + full = installSetup.bannerDir + "/" + x + if os.path.isdir( full ): + continue + if x.find( "~" ) >= 0: + continue + env.Install( installDir , full ) #final alias env.Alias( "install" , installDir ) diff --git a/buildscripts/errorcodes.py b/buildscripts/errorcodes.py index ede2927879d..cce94f394c7 100755 --- a/buildscripts/errorcodes.py +++ b/buildscripts/errorcodes.py @@ -9,7 +9,7 @@ def getAllSourceFiles( arr=None , prefix="." ): arr = [] for x in os.listdir( prefix ): - if x.startswith( "." ) or x.startswith( "pcre-" ) or x.startswith( "32bit" ) or x.startswith( "mongodb-" ) or x.startswith("debian"): + if x.startswith( "." ) or x.startswith( "pcre-" ) or x.startswith( "32bit" ) or x.startswith( "mongodb-" ) or x.startswith("debian") or x.startswith( "mongo-cxx-driver" ): continue full = prefix + "/" + x if os.path.isdir( full ): diff --git a/buildscripts/utils.py b/buildscripts/utils.py index dd43110a652..faf48b21d41 100644 --- a/buildscripts/utils.py +++ b/buildscripts/utils.py @@ -52,6 +52,13 @@ def ensureDir( name ): if not os.path.exists( d ): raise "Failed to create dir: " + name + +def distinctAsString( arr ): + s = set() + for x in arr: + s.add( str(x) ) + return list(s) + def checkMongoPort( port=27017 ): sock = socket.socket() sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) diff --git a/distsrc/client/LICENSE.txt b/distsrc/client/LICENSE.txt new file mode 100644 index 00000000000..4a67574d9bc --- /dev/null +++ b/distsrc/client/LICENSE.txt @@ -0,0 +1,203 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct new file mode 100644 index 00000000000..450f3bc1ff0 --- /dev/null +++ b/distsrc/client/SConstruct @@ -0,0 +1,36 @@ + +import os + +AddOption( "--extrapath", + dest="extrapath", + type="string", + nargs=1, + action="store", + help="comma separated list of add'l paths (--extrapath /opt/foo/,/foo) static linking" ) + +env = Environment() + +def addExtraLibs( s ): + for x in s.split(","): + env.Append( CPPPATH=[ x + "/include" ] ) + env.Append( LIBPATH=[ x + "/lib" ] ) + env.Append( LIBPATH=[ x + "/lib64" ] ) + +if GetOption( "extrapath" ) is not None: + addExtraLibs( GetOption( "extrapath" ) ) + +env.Append( CPPPATH=[ "mongo/" ] ) + +env.Append( CPPDEFINES=[ "_SCONS" , "MONGO_EXPOSE_MACROS" ] ) + +allClientFiles = [] +allClientFiles += Glob( "mongo/*.cpp" ) +allClientFiles += Glob( "mongo/client/*.cpp" ) +allClientFiles += Glob( "mongo/s/*.cpp" ) +allClientFiles += Glob( "mongo/shell/*.cpp" ) +allClientFiles += Glob( "mongo/db/*.cpp" ) +allClientFiles += Glob( "mongo/scripting/*.cpp" ) +allClientFiles += Glob( "mongo/util/*.cpp" ) +allClientFiles += Glob( "mongo/util/*.c" ) + +env.Library( "mongoclient" , allClientFiles ) |