diff options
| author | Clarisse Cheah <clarisse.cheah@mongodb.com> | 2022-11-03 04:37:49 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-11-03 05:18:48 +0000 |
| commit | 30750d1877020e7ce47fc103fe4e9eb9ec80f38c (patch) | |
| tree | 8c76ee7d36c6e95989b0b40f2a179530dec5bd80 | |
| parent | b2cedbd538c9191566dfc429f600b2dd8c36f972 (diff) | |
| download | mongo-30750d1877020e7ce47fc103fe4e9eb9ec80f38c.tar.gz | |
Import wiredtiger: df5a0886739b55f767bf8f7b722adbc31f106826 from branch mongodb-master
ref: 11968677a2..df5a088673
for: 6.2.0-rc0
WT-10021 Remove directory exclusions for release packages
| -rwxr-xr-x | src/third_party/wiredtiger/dist/s_release | 10 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/dist/s_release.list | 9 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/docs/top/main.dox | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/src/third_party/wiredtiger/dist/s_release b/src/third_party/wiredtiger/dist/s_release index f6d541dae40..b4dfb273c97 100755 --- a/src/third_party/wiredtiger/dist/s_release +++ b/src/third_party/wiredtiger/dist/s_release @@ -16,16 +16,12 @@ PKG="wiredtiger-$pkgver" DEST="$RELEASE_DIR/$PKG" rm -rf $DEST ; mkdir -p $DEST -EXCLUSIONS=`sed -e '/^#/d' -e 's/^/--exclude /' < s_release.list` -if [ -d ../.hg ] ; then - echo "Running 'hg archive' to copy the tree" - (cd .. && hg archive $EXCLUSIONS $DEST) -elif [ -d ../.git ] ; then +if [ -d ../.git ] ; then echo "Running 'git archive' to copy the tree" - (cd .. && git archive HEAD) | (cd $DEST && tar xf - $EXCLUSIONS) + (cd .. && git archive HEAD) | (cd $DEST && tar xf -) else - echo "$0 must be run in a Git or Mercurial tree" + echo "$0 must be run in a Git tree" exit 1 fi diff --git a/src/third_party/wiredtiger/dist/s_release.list b/src/third_party/wiredtiger/dist/s_release.list deleted file mode 100644 index 06adae39e46..00000000000 --- a/src/third_party/wiredtiger/dist/s_release.list +++ /dev/null @@ -1,9 +0,0 @@ -# Exclusions from release packages. -# Each non-comment line is excluded from the release. -lang/python/src -src/server -test/format -test/packing -test/salvage -test/snapshot -test/thread diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index d1c671984c3..e3c740238b1 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "11968677a218af4d09f7f90e312a47c4858c39c9" + "commit": "df5a0886739b55f767bf8f7b722adbc31f106826" } diff --git a/src/third_party/wiredtiger/src/docs/top/main.dox b/src/third_party/wiredtiger/src/docs/top/main.dox index 1f19523e7ed..f6a0b695bbe 100644 --- a/src/third_party/wiredtiger/src/docs/top/main.dox +++ b/src/third_party/wiredtiger/src/docs/top/main.dox @@ -7,7 +7,7 @@ WiredTiger is an high performance, scalable, production quality, NoSQL, <table> @row{<b>WiredTiger 11.0.0</b> (current), - <a href="releases/wiredtiger-11.0.0.tar.bz2"><b>[Release package]</b></a>, + <a href="https://github.com/wiredtiger/wiredtiger/releases/tag/11.0.0"><b>[Source code]</b></a>, <a href="11.0.0/index.html"><b>[Documentation]</b></a>} @row{<b>WiredTiger 10.0.0</b> (previous), <a href="releases/wiredtiger-10.0.0.tar.bz2"><b>[Release package]</b></a>, |