summaryrefslogtreecommitdiff
path: root/src/mongo/embedded/mongo_embedded
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2018-10-14 12:13:22 -0400
committerAndrew Morrow <acm@mongodb.com>2018-10-23 10:32:22 -0400
commit511909c99011b09cc379191bddd22009cff2c0f5 (patch)
tree415a1cb136090df0dcdd34d43103308f4558b722 /src/mongo/embedded/mongo_embedded
parent02ebff5285c59edae92fb683d46c995cc1c9ff2b (diff)
downloadmongo-511909c99011b09cc379191bddd22009cff2c0f5.tar.gz
SERVER-37402 Finalize embedded licensing
Diffstat (limited to 'src/mongo/embedded/mongo_embedded')
-rw-r--r--src/mongo/embedded/mongo_embedded/SConscript32
-rw-r--r--src/mongo/embedded/mongo_embedded/java/aar/build.gradle30
-rw-r--r--src/mongo/embedded/mongo_embedded/java/build.gradle36
-rw-r--r--src/mongo/embedded/mongo_embedded/java/jar/build.gradle32
-rw-r--r--src/mongo/embedded/mongo_embedded/java/settings.gradle30
-rw-r--r--src/mongo/embedded/mongo_embedded/mongo_embedded.podspec.in36
6 files changed, 36 insertions, 160 deletions
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"