Skip to content

Commit

Permalink
SERVER-44278 Upgrade timelib to 2018.03
Browse files Browse the repository at this point in the history
This is a third-party source upgrade of timelib to version 2018.03.
  • Loading branch information
Ryan Egesdahl authored and Evergreen Agent committed Jun 26, 2020
1 parent e976a66 commit 22d98e7
Show file tree
Hide file tree
Showing 41 changed files with 23,310 additions and 26,199 deletions.
2 changes: 1 addition & 1 deletion README.third_party.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ a notice will be included in
| [SafeInt] | MIT | 3.23 | 3.23 | | |
| [scons] | MIT | 3.1.2 | 3.1.2 | | |
| [Snappy] | BSD-3-Clause | 1.1.8 | 1.1.7 |||
| [timelib] | MIT | 2018.01 | 2018.01 | ||
| [timelib] | MIT | 2018.03 | 2018.03 | ||
| [TomCrypt] | Public Domain | 1.18.2 | 1.18.2 |||
| [Unicode] | Unicode-DFS-2015 | 13.0.0 | 8.0.0 |||
| [Valgrind] | BSD-3-Clause<sup>\[<a href="#note_vg" id="ref_vg">1</a>]</sup> | 3.15.0 | 3.11.0 | ||
Expand Down
2 changes: 1 addition & 1 deletion src/third_party/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mozjsSuffix = '-60'
yamlSuffix = '-0.6.2'
icuSuffix = '-57.1'
gperftoolsSuffix = '-2.7'
timelibSuffix = '-2018.01'
timelibSuffix = '-2018.03'
tomcryptSuffix = '-1.18.2'

thirdPartyEnvironmentModifications = {
Expand Down
27 changes: 4 additions & 23 deletions src/third_party/scripts/timelib_get_sources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,22 @@
set -o verbose
set -o errexit

# This script downloads and imports timelib
# timelib does not use any autotools/cmake/config system to it is a simple import.
# This script downloads and imports timelib. It is designed to run on Linux or Mac OS X

# This script is designed to run on Linux or Mac OS X
# Parsers make use of re2c, which needs to be installed and be version 0.15.3
# *only*. re2c 0.16 introduces an issues with clang which causes any date
# parser to hang.
#
# timelib does not use any autotools/cmake/config system so it is a simple import.

IS_WSL=$(grep -q Microsoft /proc/version)

VERSION=2018.01
VERSION=2018.03
NAME=timelib
TARBALL=$VERSION.tar.gz
TARBALL_DIR=$NAME-$VERSION
if $IS_WSL; then
if grep -q Microsoft /proc/version; then
TEMP_DIR=$(wslpath -u $(powershell.exe -Command "Get-ChildItem Env:TEMP | Get-Content | Write-Host"))
else
TEMP_DIR="/tmp"
fi
TEMP_DIR=$(mktemp -d $TEMP_DIR/$NAME.XXXXXX)
DEST_DIR=`git rev-parse --show-toplevel`/src/third_party/$NAME-$VERSION

# Check prerequisites: re2c, wget
if ! [ -x "$(command -v re2c)" ]; then
echo 'Error: re2c is not installed.' >&2
exit 1
fi

RE2C_VERSION=`re2c --version`
if ! [ "re2c 0.15.3" == "$RE2C_VERSION" ]; then
echo 'Error: re2c MUST be version 0.15.3.' >&2
exit 1
fi

if ! [ -x "$(command -v wget)" ]; then
echo 'Error: wget is not installed.' >&2
exit 1
Expand Down
Loading

0 comments on commit 22d98e7

Please sign in to comment.