diff options
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/embedded/LICENSE-Embedded.txt | 7 | ||||
-rw-r--r-- | src/mongo/embedded/SConscript | 11 | ||||
-rw-r--r-- | src/mongo/embedded/mongo_embedded/SConscript | 32 | ||||
-rw-r--r-- | src/mongo/embedded/mongo_embedded/java/aar/build.gradle | 30 | ||||
-rw-r--r-- | src/mongo/embedded/mongo_embedded/java/build.gradle | 36 | ||||
-rw-r--r-- | src/mongo/embedded/mongo_embedded/java/jar/build.gradle | 32 | ||||
-rw-r--r-- | src/mongo/embedded/mongo_embedded/java/settings.gradle | 30 | ||||
-rw-r--r-- | src/mongo/embedded/mongo_embedded/mongo_embedded.podspec.in | 36 | ||||
-rw-r--r-- | src/mongo/embedded/mongoc_embedded/SConscript | 29 | ||||
-rw-r--r-- | src/mongo/embedded/mongoc_embedded/mongo-embedded-c-driver.podspec.in | 36 | ||||
-rw-r--r-- | src/mongo/embedded/mongoc_embedded/mongoc_embedded.podspec.in | 36 |
11 files changed, 74 insertions, 241 deletions
diff --git a/src/mongo/embedded/LICENSE-Embedded.txt b/src/mongo/embedded/LICENSE-Embedded.txt index 3514d4fbddd..d1af5ae91f5 100644 --- a/src/mongo/embedded/LICENSE-Embedded.txt +++ b/src/mongo/embedded/LICENSE-Embedded.txt @@ -1,5 +1,12 @@ License Agreement +The software accompanying this License Agreement is Copyright (C) 2018 +MongoDB, Inc. and is licensed to you on the terms set forth below, or +in the alternative and at your election, on the terms of the Server +Side Public License, Version 1, a copy of which is either provided in +the accompanying file entitled LICENSE-Community.txt, or available +at https://www.mongodb.com/licensing/server-side-public-license. + The following License Agreement establishes the terms on which MongoDB, Inc. (“Company”) grants a license to Company’s applicable proprietary application software solely in machine-readable, diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index 4fdb72cb3fc..ec0faa4bede 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -39,17 +39,6 @@ env.SConscript( }, ) -if get_option('install-mode') == 'hygienic': - env.AutoInstall( - '', - source=[ - 'LICENSE-Embedded.txt', - ], - INSTALL_ALIAS=[ - 'embedded-dev', - ], - ) - yamlEnv = env.Clone() yamlEnv.InjectThirdPartyIncludePaths(libraries=['yaml']) diff --git a/src/mongo/embedded/mongo_embedded/SConscript b/src/mongo/embedded/mongo_embedded/SConscript index bc01f5e42c2..f3f5b9dd22b 100644 --- a/src/mongo/embedded/mongo_embedded/SConscript +++ b/src/mongo/embedded/mongo_embedded/SConscript @@ -7,6 +7,20 @@ Import("get_option") env = env.Clone() + +if get_option('install-mode') == 'hygienic': + env.AutoInstall( + 'share/doc/mongo_embedded', + source=[ + '#/LICENSE-Community.txt', + '#/distsrc/THIRD-PARTY-NOTICES', + '../LICENSE-Embedded.txt', + ], + INSTALL_ALIAS=[ + 'embedded-dev', + ], + ) + mongoEmbeddedEnv = env.Clone() mongoEmbeddedEnv.AppendUnique( CPPDEFINES=[ @@ -115,6 +129,22 @@ installHeaderRoot = env.Dir('$INSTALL_DIR/include/mongo_embedded/v1/mongo_embedd frameworkDir = env.Dir('$INSTALL_DIR/Frameworks/mongo_embedded.framework') env.Alias('install-embedded-dev', frameworkDir) +resourceDir = frameworkDir +if env.TargetOSIs('macOS'): + resourceDir = resourceDir.Dir('Resources') + +env.Install( + target=resourceDir, + source=env.File( + name=[ + 'LICENSE-Community.txt', + 'LICENSE-Embedded.txt', + 'THIRD-PARTY-NOTICES', + ], + directory=env.Dir('$INSTALL_DIR/share/doc/mongo_embedded'), + ), +) + env.Install( target=frameworkDir.Dir('Headers'), source=installHeaderRoot.File('mongo_embedded.h') @@ -137,7 +167,7 @@ mongoEmbeddedPlist = env.Substfile( ) env.Install( - target=frameworkDir, + target=resourceDir, source=mongoEmbeddedPlist, ) diff --git a/src/mongo/embedded/mongo_embedded/java/aar/build.gradle b/src/mongo/embedded/mongo_embedded/java/aar/build.gradle index bcc10d43624..9fca4b80956 100644 --- a/src/mongo/embedded/mongo_embedded/java/aar/build.gradle +++ b/src/mongo/embedded/mongo_embedded/java/aar/build.gradle @@ -1,33 +1,3 @@ - -/** - * Copyright (C) 2018-present MongoDB, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the Server Side Public License, version 1, - * as published by MongoDB, Inc. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Server Side Public License for more details. - * - * You should have received a copy of the Server Side Public License - * along with this program. If not, see - * <http://www.mongodb.com/licensing/server-side-public-license>. - * - * As a special exception, the copyright holders give permission to link the - * code of portions of this program with the OpenSSL library under certain - * conditions as described in each individual source file and distribute - * linked combinations including the program with the OpenSSL library. You - * must comply with the Server Side Public License in all respects for - * all of the code used other than as permitted herein. If you modify file(s) - * with this exception, you may extend this exception to your version of the - * file(s), but you are not obligated to do so. If you do not wish to do so, - * delete this exception statement from your version. If you delete this - * exception statement from all source files in the program, then also delete - * it in the license file. - */ - apply plugin: 'com.android.library' apply plugin: 'digital.wup.android-maven-publish' apply plugin: 'optional-base' diff --git a/src/mongo/embedded/mongo_embedded/java/build.gradle b/src/mongo/embedded/mongo_embedded/java/build.gradle index 458cb713332..00e99ceb9fe 100644 --- a/src/mongo/embedded/mongo_embedded/java/build.gradle +++ b/src/mongo/embedded/mongo_embedded/java/build.gradle @@ -1,41 +1,11 @@ - -/** - * Copyright (C) 2018-present MongoDB, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the Server Side Public License, version 1, - * as published by MongoDB, Inc. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Server Side Public License for more details. - * - * You should have received a copy of the Server Side Public License - * along with this program. If not, see - * <http://www.mongodb.com/licensing/server-side-public-license>. - * - * As a special exception, the copyright holders give permission to link the - * code of portions of this program with the OpenSSL library under certain - * conditions as described in each individual source file and distribute - * linked combinations including the program with the OpenSSL library. You - * must comply with the Server Side Public License in all respects for - * all of the code used other than as permitted herein. If you modify file(s) - * with this exception, you may extend this exception to your version of the - * file(s), but you are not obligated to do so. If you do not wish to do so, - * delete this exception statement from your version. If you delete this - * exception statement from all source files in the program, then also delete - * it in the license file. - */ - ext.jnaVersion = '4.5.2' ext.libraryName = 'embedded-capi' -ext.licenseShort = 'AGPL-3.0' +ext.licenseShort = 'MongoDB Embedded License' ext.pomName = 'MongoDB Embedded for Java' ext.pomDescription = 'The MongoDB Embedded SDK for Java' ext.pomUrl = 'http://www.mongodb.org' -ext.pomLicenseName = 'GNU Affero General Public License version 3' -ext.pomLicenseUrl = 'http://www.gnu.org/licenses/agpl-3.0.html' +ext.pomLicenseName = 'MongoDB Embedded License' +ext.pomLicenseUrl = 'https://www.mongodb.com/licensing/embedded-license' ext.pomScmConnection = 'https://github.com/mongodb/mongo.git' ext.pomScmDevConnection = 'git@github.com:mongodb/mongo.git' ext.pomScmUrl = 'https://github.com/mongodb/mongo' diff --git a/src/mongo/embedded/mongo_embedded/java/jar/build.gradle b/src/mongo/embedded/mongo_embedded/java/jar/build.gradle index f5cc29d62dd..ce6995bea2d 100644 --- a/src/mongo/embedded/mongo_embedded/java/jar/build.gradle +++ b/src/mongo/embedded/mongo_embedded/java/jar/build.gradle @@ -1,33 +1,3 @@ - -/** - * Copyright (C) 2018-present MongoDB, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the Server Side Public License, version 1, - * as published by MongoDB, Inc. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Server Side Public License for more details. - * - * You should have received a copy of the Server Side Public License - * along with this program. If not, see - * <http://www.mongodb.com/licensing/server-side-public-license>. - * - * As a special exception, the copyright holders give permission to link the - * code of portions of this program with the OpenSSL library under certain - * conditions as described in each individual source file and distribute - * linked combinations including the program with the OpenSSL library. You - * must comply with the Server Side Public License in all respects for - * all of the code used other than as permitted herein. If you modify file(s) - * with this exception, you may extend this exception to your version of the - * file(s), but you are not obligated to do so. If you do not wish to do so, - * delete this exception statement from your version. If you delete this - * exception statement from all source files in the program, then also delete - * it in the license file. - */ - apply plugin: 'java-library' apply plugin: 'osgi' apply plugin: 'maven-publish' @@ -128,4 +98,4 @@ bintray { name = getGitVersion() } } -}
\ No newline at end of file +} diff --git a/src/mongo/embedded/mongo_embedded/java/settings.gradle b/src/mongo/embedded/mongo_embedded/java/settings.gradle index 84ecd3ed4e0..0c62f13cff1 100644 --- a/src/mongo/embedded/mongo_embedded/java/settings.gradle +++ b/src/mongo/embedded/mongo_embedded/java/settings.gradle @@ -1,32 +1,2 @@ - -/** - * Copyright (C) 2018-present MongoDB, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the Server Side Public License, version 1, - * as published by MongoDB, Inc. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Server Side Public License for more details. - * - * You should have received a copy of the Server Side Public License - * along with this program. If not, see - * <http://www.mongodb.com/licensing/server-side-public-license>. - * - * As a special exception, the copyright holders give permission to link the - * code of portions of this program with the OpenSSL library under certain - * conditions as described in each individual source file and distribute - * linked combinations including the program with the OpenSSL library. You - * must comply with the Server Side Public License in all respects for - * all of the code used other than as permitted herein. If you modify file(s) - * with this exception, you may extend this exception to your version of the - * file(s), but you are not obligated to do so. If you do not wish to do so, - * delete this exception statement from your version. If you delete this - * exception statement from all source files in the program, then also delete - * it in the license file. - */ - include ':aar' include ':jar' diff --git a/src/mongo/embedded/mongo_embedded/mongo_embedded.podspec.in b/src/mongo/embedded/mongo_embedded/mongo_embedded.podspec.in index 3c3e8e756b3..9fabc4e5f3b 100644 --- a/src/mongo/embedded/mongo_embedded/mongo_embedded.podspec.in +++ b/src/mongo/embedded/mongo_embedded/mongo_embedded.podspec.in @@ -1,36 +1,3 @@ -#- -# Copyright (C) 2018 MongoDB Inc. -# -# This program is free software: you can redistribute it and/or modify - -# Copyright (C) 2018-present MongoDB, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the Server Side Public License, version 1, -# as published by MongoDB, Inc. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Server Side Public License for more details. -# -# You should have received a copy of the Server Side Public License -# along with this program. If not, see -# <http://www.mongodb.com/licensing/server-side-public-license>. -# -# As a special exception, the copyright holders give permission to link the -# code of portions of this program with the OpenSSL library under certain -# conditions as described in each individual source file and distribute -# linked combinations including the program with the OpenSSL library. You -# must comply with the Server Side Public License in all respects for -# all of the code used other than as permitted herein. If you modify file(s) -# with this exception, you may extend this exception to your version of the -# file(s), but you are not obligated to do so. If you do not wish to do so, -# delete this exception statement from your version. If you delete this -# exception statement from all source files in the program, then also delete -# it in the license file. -# - Pod::Spec.new do |s| s.name = "mongo_embedded" @@ -44,8 +11,7 @@ Pod::Spec.new do |s| s.homepage = "https://www.mongodb.com" s.author = { "MongoDB, Inc" => "cocoapods@mongodb.com" } - s.license = "GNU Affero General Public License v3.0" - # s.license = { :type => "AGPLv3", :file => "FILE_LICENSE" } + s.license = { :type => "MongoDB Embedded License", :file => "iPhoneOS/Frameworks/mongo_embedded.framework/LICENSE-Embedded.txt" } s.ios.deployment_target = "11.0" s.watchos.deployment_target = "4.3" diff --git a/src/mongo/embedded/mongoc_embedded/SConscript b/src/mongo/embedded/mongoc_embedded/SConscript index fa25dd0a1c9..2097ba835e7 100644 --- a/src/mongo/embedded/mongoc_embedded/SConscript +++ b/src/mongo/embedded/mongoc_embedded/SConscript @@ -10,6 +10,18 @@ env = env.Clone() if not env['MONGO_HAVE_LIBMONGOC']: Return() +if get_option('install-mode') == 'hygienic': + env.AutoInstall( + 'share/doc/mongoc_embedded', + source=[ + '#/LICENSE-Community.txt', + '../LICENSE-Embedded.txt', + ], + INSTALL_ALIAS=[ + 'embedded-dev', + ], + ) + def create_mongoc_env(env): mongocEnv = env.Clone() if mongocEnv['MONGO_HAVE_LIBMONGOC'] == "framework": @@ -114,6 +126,21 @@ installHeaderRoot = env.Dir('$INSTALL_DIR/include/mongoc_embedded/v1/mongoc_embe frameworkDir = env.Dir('$INSTALL_DIR/Frameworks/mongoc_embedded.framework') env.Alias('install-embedded-dev', frameworkDir) +resourceDir = frameworkDir +if env.TargetOSIs('macOS'): + resourceDir = resourceDir.Dir('Resources') + +env.Install( + target=resourceDir, + source=env.File( + name=[ + 'LICENSE-Community.txt', + 'LICENSE-Embedded.txt', + ], + directory=env.Dir('$INSTALL_DIR/share/doc/mongoc_embedded'), + ), +) + env.Install( target=frameworkDir.Dir('Headers'), source=installHeaderRoot.File('mongoc_embedded.h'), @@ -136,7 +163,7 @@ mongocEmbeddedPlist = env.Substfile( ) env.Install( - target=frameworkDir, + target=resourceDir, source=mongocEmbeddedPlist, ) diff --git a/src/mongo/embedded/mongoc_embedded/mongo-embedded-c-driver.podspec.in b/src/mongo/embedded/mongoc_embedded/mongo-embedded-c-driver.podspec.in index 4a32f4382b9..7a6f5e53ebb 100644 --- a/src/mongo/embedded/mongoc_embedded/mongo-embedded-c-driver.podspec.in +++ b/src/mongo/embedded/mongoc_embedded/mongo-embedded-c-driver.podspec.in @@ -1,36 +1,3 @@ -#- -# Copyright (C) 2018 MongoDB Inc. -# -# This program is free software: you can redistribute it and/or modify - -# Copyright (C) 2018-present MongoDB, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the Server Side Public License, version 1, -# as published by MongoDB, Inc. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Server Side Public License for more details. -# -# You should have received a copy of the Server Side Public License -# along with this program. If not, see -# <http://www.mongodb.com/licensing/server-side-public-license>. -# -# As a special exception, the copyright holders give permission to link the -# code of portions of this program with the OpenSSL library under certain -# conditions as described in each individual source file and distribute -# linked combinations including the program with the OpenSSL library. You -# must comply with the Server Side Public License in all respects for -# all of the code used other than as permitted herein. If you modify file(s) -# with this exception, you may extend this exception to your version of the -# file(s), but you are not obligated to do so. If you do not wish to do so, -# delete this exception statement from your version. If you delete this -# exception statement from all source files in the program, then also delete -# it in the license file. -# - Pod::Spec.new do |s| s.name = "mongo-embedded-c-driver" @@ -46,7 +13,7 @@ Pod::Spec.new do |s| s.homepage = "https://www.mongodb.com" s.author = { "MongoDB, Inc" => "cocoapods@mongodb.com" } - s.license = { :type => "APACHE", :file => "COPYING" } + s.license = { :type => "Apache License, Version 2.0", :file => "iPhoneOS/Frameworks/mongoc.framework/COPYING" } s.ios.deployment_target = "11.0" s.osx.deployment_target = "10.10" @@ -54,6 +21,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = "10.2" s.source = { :http => "https://s3.amazonaws.com/mciuploads/mongodb-mongo-master/embedded-sdk/mongo-c-driver-cocoapod-latest.tgz" } + s.ios.vendored_frameworks = "iPhoneOS/Frameworks/bson.framework", "iPhoneOS/Frameworks/mongoc.framework" s.osx.vendored_frameworks = "MacOS/Frameworks/bson.framework", "MacOS/Frameworks/mongoc.framework" s.watchos.vendored_frameworks = "WatchOS/Frameworks/bson.framework", "WatchOS/Frameworks/mongoc.framework" diff --git a/src/mongo/embedded/mongoc_embedded/mongoc_embedded.podspec.in b/src/mongo/embedded/mongoc_embedded/mongoc_embedded.podspec.in index bac3b8c21dd..6fdad93d061 100644 --- a/src/mongo/embedded/mongoc_embedded/mongoc_embedded.podspec.in +++ b/src/mongo/embedded/mongoc_embedded/mongoc_embedded.podspec.in @@ -1,36 +1,3 @@ -#- -# Copyright (C) 2018 MongoDB Inc. -# -# This program is free software: you can redistribute it and/or modify - -# Copyright (C) 2018-present MongoDB, Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the Server Side Public License, version 1, -# as published by MongoDB, Inc. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Server Side Public License for more details. -# -# You should have received a copy of the Server Side Public License -# along with this program. If not, see -# <http://www.mongodb.com/licensing/server-side-public-license>. -# -# As a special exception, the copyright holders give permission to link the -# code of portions of this program with the OpenSSL library under certain -# conditions as described in each individual source file and distribute -# linked combinations including the program with the OpenSSL library. You -# must comply with the Server Side Public License in all respects for -# all of the code used other than as permitted herein. If you modify file(s) -# with this exception, you may extend this exception to your version of the -# file(s), but you are not obligated to do so. If you do not wish to do so, -# delete this exception statement from your version. If you delete this -# exception statement from all source files in the program, then also delete -# it in the license file. -# - Pod::Spec.new do |s| s.name = "mongoc_embedded" @@ -44,8 +11,7 @@ Pod::Spec.new do |s| s.homepage = "https://www.mongodb.com" s.author = { "MongoDB, Inc" => "cocoapods@mongodb.com" } - s.license = "GNU Affero General Public License v3.0" - # s.license = { :type => "AGPLv3", :file => "FILE_LICENSE" } + s.license = { :type => "MongoDB Embedded License", :file => "iPhoneOS/Frameworks/mongoc_embedded/LICENSE-Embedded.txt" } s.ios.deployment_target = "11.0" s.watchos.deployment_target = "4.3" |