summaryrefslogtreecommitdiff
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
parent02ebff5285c59edae92fb683d46c995cc1c9ff2b (diff)
downloadmongo-511909c99011b09cc379191bddd22009cff2c0f5.tar.gz
SERVER-37402 Finalize embedded licensing
-rw-r--r--etc/evergreen.yml78
-rw-r--r--src/mongo/embedded/LICENSE-Embedded.txt7
-rw-r--r--src/mongo/embedded/SConscript11
-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
-rw-r--r--src/mongo/embedded/mongoc_embedded/SConscript29
-rw-r--r--src/mongo/embedded/mongoc_embedded/mongo-embedded-c-driver.podspec.in36
-rw-r--r--src/mongo/embedded/mongoc_embedded/mongoc_embedded.podspec.in36
12 files changed, 144 insertions, 249 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 6688619f720..4e0c2499b40 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -3680,7 +3680,36 @@ tasks:
export ${compile_env|}
${cmake_path|/opt/cmake/bin/cmake} -DCMAKE_INSTALL_PREFIX=$WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp -DENABLE_SHM_COUNTERS=OFF -DENABLE_SNAPPY=OFF -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_TESTS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_STATIC=OFF ${cdriver_cmake_flags}
make install VERBOSE=1
- cp COPYING $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp
+
+ # TODO: Remove this when we upgrade to a version of the C driver that has CDRIVER-2854 fixed.
+ mkdir -p $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/share/doc/mongo-c-driver
+ cp COPYING $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/share/doc/mongo-c-driver
+ cp THIRD_PARTY_NOTICES $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/share/doc/mongo-c-driver
+ if [ -d $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks ]; then
+
+ # We need to account for the fact that on the Darwin
+ # mobile platforms, things shouldn't go to the Resources
+ # directory but on macOS they should. If the Resources
+ # directory is there (it should be for the plist file),
+ # then use it, otherwise just use the framework root.
+ if [ -e $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/mongoc.framework/Resources ]; then
+ cp COPYING $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/mongoc.framework/Resources
+ cp THIRD_PARTY_NOTICES $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/mongoc.framework/Resources
+ else
+ cp COPYING $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/mongoc.framework
+ cp THIRD_PARTY_NOTICES $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/mongoc.framework
+ fi
+
+ if [ -e $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/bson.framework/Resources ]; then
+ cp COPYING $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/bson.framework/Resources
+ cp THIRD_PARTY_NOTICES $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/bson.framework/Resources
+ else
+ cp COPYING $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/bson.framework
+ cp THIRD_PARTY_NOTICES $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp/Frameworks/bson.framework
+ fi
+
+ fi
+
mv $WORKDIR/src/build/mongo-embedded-sdk-$VERSION-tmp $WORKDIR/src/build/mongo-embedded-sdk-$VERSION
- name: embedded_sdk_install_dev
@@ -3713,6 +3742,14 @@ tasks:
set -o errexit
set -o verbose
+ cat <<EOF > mongo-embedded-sdk-${version}/README-Licenses.txt
+ The software accompanying this file is Copyright (C) 2018 MongoDB, Inc. and
+ is licensed to you on the terms set forth in the following files:
+ - mongo-c-driver: share/doc/mongo-c-driver/COPYING
+ - mongo_embedded: share/doc/mongo_embedded/LICENSE-Embedded.txt
+ - mongoc_embedded: share/doc/mongo_embedded/LICENSE-Embedded.txt
+ EOF
+
tar cfvz embedded-sdk.tgz mongo-embedded-sdk-${version}
# Upload it so we can download from EVG.
@@ -4142,10 +4179,10 @@ tasks:
set -o verbose
pushd mongo-embedded-sdk-${version}
+
for directory in *OS *Simulator; do
pushd $directory
- tar --include "*/Frameworks*" --include "*/LICENSE*" --include "*/COPYING" --strip-components=1 -xf ./embedded-sdk.tgz
- cp ./COPYING ../COPYING
+ tar --include "*/Frameworks/*" --strip-components=1 -xf ./embedded-sdk.tgz
popd
done
@@ -4156,13 +4193,38 @@ tasks:
${compile_env|} xcrun lipo $_OSFile $_SimulatorFile -create -output $_OSFile
done
done
+
popd
- tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}.tgz ./mongo-embedded-sdk-${version}/*OS
+ cat <<EOF > mongo-embedded-sdk-${version}/README-Licenses.txt
+ The software accompanying this file is Copyright (C) 2018 MongoDB, Inc. and
+ is licensed to you on the terms set forth in the following files:
+ - mongo-c-driver: iPhoneOS/Frameworks/mongoc.framework/COPYING
+ - mongo_embedded: iPhoneOS/Frameworks/mongo_embedded.framework/LICENSE-Embedded.txt
+ - mongoc_embedded: iPhoneOS/Frameworks/mongoc_embedded.framework/LICENSE-Embedded.txt
+ EOF
+ tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}.tgz ./mongo-embedded-sdk-${version}/*OS ./mongo-embedded-sdk-${version}/README-Licenses.txt
+
+ cat <<EOF > mongo-embedded-sdk-${version}/README-Licenses.txt
+ The software accompanying this file is Copyright (C) 2018 MongoDB, Inc. and
+ is licensed to you on the terms set forth in the following files:
+ - mongo-c-driver: iPhoneOS/Frameworks/mongoc.framework/COPYING
+ EOF
+ tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}-mongo-c-driver.tgz ./mongo-embedded-sdk-${version}/*OS/Frameworks/bson.framework ./mongo-embedded-sdk-${version}/*OS/Frameworks/mongoc.framework ./mongo-embedded-sdk-${version}/README-Licenses.txt
+
+ cat <<EOF > mongo-embedded-sdk-${version}/README-Licenses.txt
+ The software accompanying this file is Copyright (C) 2018 MongoDB, Inc. and
+ is licensed to you on the terms set forth in the following files:
+ - mongo_embedded: iPhoneOS/Frameworks/mongo_embedded.framework/LICENSE-Embedded.txt
+ EOF
+ tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}-mongo-embedded.tgz ./mongo-embedded-sdk-${version}/*OS/Frameworks/mongo_embedded.framework ./mongo-embedded-sdk-${version}/README-Licenses.txt
- tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}-mongo-c-driver.tgz ./mongo-embedded-sdk-${version}/*OS/Frameworks/bson.framework ./mongo-embedded-sdk-${version}/*OS/Frameworks/mongoc.framework ./mongo-embedded-sdk-${version}/COPYING
- tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}-mongo-embedded.tgz ./mongo-embedded-sdk-${version}/*OS/Frameworks/mongo_embedded.framework
- tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}-mongoc-embedded.tgz ./mongo-embedded-sdk-${version}/*OS/Frameworks/mongoc_embedded.framework
+ cat <<EOF > mongo-embedded-sdk-${version}/README-Licenses.txt
+ The software accompanying this file is Copyright (C) 2018 MongoDB, Inc. and
+ is licensed to you on the terms set forth in the following files:
+ - mongoc_embedded: iPhoneOS/Frameworks/mongoc_embedded.framework/LICENSE-Embedded.txt
+ EOF
+ tar --exclude "mongo-embedded-sdk-${version}/*/*.tgz" -zcvf mongo-embedded-sdk-${version}-mongoc-embedded.tgz ./mongo-embedded-sdk-${version}/*OS/Frameworks/mongoc_embedded.framework ./mongo-embedded-sdk-${version}/README-Licenses.txt
- command: s3.put
params:
@@ -4202,7 +4264,7 @@ tasks:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
local_file: "mongo-embedded-sdk-${version}-mongoc-embedded.tgz"
- remote_file: "${project}/embedded-sdk/mongoc-embedded-apple-multiarch/${revision}/${version}.tgz"
+ remote_file: "${project}/embedded-sdk/mongoc-embedded-apple-multiarch/${revision}/mongo-embedded-sdk-${version}.tgz"
bucket: mciuploads
permissions: public-read
content_type: application/tar
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"