From 9699adfd4e4950dfc0e2510831e2d29decc802d0 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Wed, 17 Oct 2018 13:44:54 +0200 Subject: [PATCH 1/7] Add build script for Thrift 0.11.0 --- build-thrift-0.11.0.sh | 77 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100755 build-thrift-0.11.0.sh diff --git a/build-thrift-0.11.0.sh b/build-thrift-0.11.0.sh new file mode 100755 index 0000000..d2f8ce9 --- /dev/null +++ b/build-thrift-0.11.0.sh @@ -0,0 +1,77 @@ +#!/bin/bash + +root=$(pwd -P) +INSTALL_PREFIX=install_dir + +# NB: The custom bison/yacc setup works around old versions in Centos 6, +# OSX Yosemite, and OSX Sierra which are too old for Thrift 0.11. +# +# On OSX we also boostrap a custom flex. On Centos you will need to install +# it manually via: +# yum install -y flex flex-devel + +curl -O http://ftp.gnu.org/gnu/bison/bison-2.5.1.tar.gz && \ +rm -rf bison-2.5.1 && \ +tar -xzf bison-2.5.1.tar.gz && ( + cd bison-2.5.1 && \ + sh ./configure --prefix="$(pwd -P)/$INSTALL_PREFIX" && \ + make install +) + +curl -O ftp://ftp.invisible-island.net/byacc/byacc-20140715.tgz && \ +rm -rf byacc-20140715 && \ +tar -xzf byacc-20140715.tgz && ( + cd byacc-20140715 && \ + sh ./configure --prefix="$(pwd -P)/$INSTALL_PREFIX" && \ + make install +) + +export PATH=$(pwd -P)/bison-2.5.1/$INSTALL_PREFIX/bin:$(pwd -P)/byacc-20140715/$INSTALL_PREFIX/bin:$PATH + +if [[ "`uname`" == "Darwin"* ]]; then + # Upgraded to 2.6.0 to pick up OSX linker fix: https://sourceforge.net/p/flex/bugs/182/ + curl -L -O http://sourceforge.mirrorservice.org/f/fl/flex/flex-2.6.0.tar.gz && \ + rm -rf flex-2.6.0 && \ + tar -xzf flex-2.6.0.tar.gz && ( + cd flex-2.6.0 && \ + ./autogen.sh + sh ./configure --prefix="$(pwd -P)/$INSTALL_PREFIX" && \ + make install + ) + + export PATH=$(pwd -P)/flex-2.6.0/$INSTALL_PREFIX/bin:$PATH + LDFLAGS="-L$(pwd -P)/flex-2.6.0/$INSTALL_PREFIX/lib" +fi + +# NB: The configure --wthout-* flags just disable building any runtime libs +# for the generated code. We only want the codegen side of things. +curl -O http://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz && \ +rm -rf thrift-0.11.0 && \ +tar -xzf thrift-0.11.0.tar.gz && \ +LDFLAGS="-all-static $LDFLAGS" && \ +cd thrift-0.11.0 && \ +sh ./configure \ + --disable-shared \ + --without-cpp \ + --without-c_glib \ + --without-csharp \ + --without-erlang \ + --without-java \ + --without-erlang \ + --without-lua \ + --without-python \ + --without-perl \ + --without-php \ + --without-php_extension \ + --without-dart \ + --without-ruby \ + --without-haskell \ + --without-go \ + --without-nodejs \ + --without-rs \ + --without-haxe \ + --without-dotnetcore \ + --without-d && \ +make clean && \ +make LDFLAGS="$LDFLAGS" +mv compiler/cpp/thrift ${root}/thrift-0.11.0.binary From 22fdc7b96b277370c5363dfac7709af3eb152d81 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Sat, 27 Oct 2018 11:54:49 +0200 Subject: [PATCH 2/7] Disable QT compiliation --- build-thrift-0.11.0.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-thrift-0.11.0.sh b/build-thrift-0.11.0.sh index d2f8ce9..2e832af 100755 --- a/build-thrift-0.11.0.sh +++ b/build-thrift-0.11.0.sh @@ -63,6 +63,8 @@ sh ./configure \ --without-perl \ --without-php \ --without-php_extension \ + --without-qt4 \ + --without-qt5 \ --without-dart \ --without-ruby \ --without-haskell \ From f25787961c0e714f370662f5fba1a8c093f31d3d Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Sat, 27 Oct 2018 16:53:07 +0200 Subject: [PATCH 3/7] Extend extract utility to support .tgz endings --- utils.v1.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils.v1.bash b/utils.v1.bash index 22961e3..54d8244 100644 --- a/utils.v1.bash +++ b/utils.v1.bash @@ -82,6 +82,9 @@ function do_extract { *.tar.gz) tar zxf "$archive_path" ;; + *.tgz) + tar zxf "$archive_path" + ;; *) die "Unrecognized file extension for compressed archive at '${archive_path}'." ;; From fb7bf1a15609c251d98cd61fee5f498d164808ac Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Sat, 27 Oct 2018 16:56:25 +0200 Subject: [PATCH 4/7] Refactor Thrift 0.11.0 build script filesystem layout --- .../linux/x86_64/0.11.0/build-thrift.sh | 97 +++++++++++++++++++ .../bin/thrift/linux/x86_64/0.11.0/build.sh | 6 ++ build-support/bin/thrift/mac/10.10/0.11.0 | 1 + build-support/bin/thrift/mac/10.11/0.11.0 | 1 + .../thrift/mac/10.12/0.11.0/build-thrift.sh | 97 +++++++++++++++++++ .../bin/thrift/mac/10.12/0.11.0/build.sh | 4 + build-support/bin/thrift/mac/10.13/0.11.0 | 1 + build-support/bin/thrift/mac/10.8/0.11.0 | 1 + build-support/bin/thrift/mac/10.9/0.11.0 | 1 + build-thrift-0.11.0.sh | 79 --------------- 10 files changed, 209 insertions(+), 79 deletions(-) create mode 100755 build-support/bin/thrift/linux/x86_64/0.11.0/build-thrift.sh create mode 100755 build-support/bin/thrift/linux/x86_64/0.11.0/build.sh create mode 120000 build-support/bin/thrift/mac/10.10/0.11.0 create mode 120000 build-support/bin/thrift/mac/10.11/0.11.0 create mode 100755 build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh create mode 100755 build-support/bin/thrift/mac/10.12/0.11.0/build.sh create mode 120000 build-support/bin/thrift/mac/10.13/0.11.0 create mode 120000 build-support/bin/thrift/mac/10.8/0.11.0 create mode 120000 build-support/bin/thrift/mac/10.9/0.11.0 delete mode 100755 build-thrift-0.11.0.sh diff --git a/build-support/bin/thrift/linux/x86_64/0.11.0/build-thrift.sh b/build-support/bin/thrift/linux/x86_64/0.11.0/build-thrift.sh new file mode 100755 index 0000000..1ccae29 --- /dev/null +++ b/build-support/bin/thrift/linux/x86_64/0.11.0/build-thrift.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +source "$(git rev-parse --show-toplevel)/utils.v1.bash" + +set_strict_mode + +function build_bison { + local -r extracted_dirname="bison-${BISON_VERSION}" + local -r archive_filename="${extracted_dirname}.tar.gz" + local -r release_url="http://ftp.gnu.org/gnu/bison/${archive_filename}" + + local -r downloaded_archive="$(curl_file_with_fail "$release_url" "$archive_filename")" + local -r source_extracted_abs="$(extract_for "$downloaded_archive" "$extracted_dirname")" + + with_pushd >&2 "$source_extracted_abs" sh ./configure --prefix="$source_extracted_abs/$INSTALL_PREFIX" + with_pushd >&2 "$source_extracted_abs" make install + + export PATH="$source_extracted_abs/$INSTALL_PREFIX/bin:$PATH" +} + +function build_byacc { + local -r extracted_dirname="byacc-${BYACC_VERSION}" + local -r archive_filename="${extracted_dirname}.tgz" + local -r release_url="https://www.mirrorservice.org/sites/lynx.invisible-island.net/byacc/${archive_filename}" + + local -r downloaded_archive="$(curl_file_with_fail "$release_url" "$archive_filename")" + local -r source_extracted_abs="$(extract_for "$downloaded_archive" "$extracted_dirname")" + + with_pushd >&2 "$source_extracted_abs" sh ./configure --prefix="$source_extracted_abs/$INSTALL_PREFIX" + with_pushd >&2 "$source_extracted_abs" make install + + export PATH="$source_extracted_abs/$INSTALL_PREFIX/bin:$PATH" +} + +function build_thrift { + local -r extracted_dirname="thrift-${THRIFT_VERSION}" + local -r archive_filename="${extracted_dirname}.tar.gz" + local -r release_url="http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/${archive_filename}" + + local -r downloaded_archive="$(curl_file_with_fail "$release_url" "$archive_filename")" + local -r source_extracted_abs="$(extract_for "$downloaded_archive" "$extracted_dirname")" + + # NB: The configure --wthout-* flags just disable building any runtime libs + # for the generated code. We only want the codegen side of things. + with_pushd >&2 "$source_extracted_abs" \ + sh ./configure \ + --disable-shared \ + --without-cpp \ + --without-c_glib \ + --without-csharp \ + --without-erlang \ + --without-java \ + --without-erlang \ + --without-lua \ + --without-python \ + --without-perl \ + --without-php \ + --without-php_extension \ + --without-qt4 \ + --without-qt5 \ + --without-dart \ + --without-ruby \ + --without-haskell \ + --without-go \ + --without-nodejs \ + --without-rs \ + --without-haxe \ + --without-dotnetcore \ + --without-d + with_pushd >&2 "$source_extracted_abs" make clean + with_pushd >&2 "$source_extracted_abs" make LDFLAGS="-all-static" + + echo "$source_extracted_abs/compiler/cpp/thrift" +} + +## Interpret arguments and execute build. + +readonly THRIFT_VERSION="$1" +readonly BISON_VERSION="$2" +readonly BYACC_VERSION="$3" +readonly INSTALL_PREFIX=install_dir + +case "$(uname)" in + Darwin) + with_pushd "$(mkdirp_absolute_path "bison-${BISON_VERSION}-osx")" build_bison + with_pushd "$(mkdirp_absolute_path "byacc-${BYACC_VERSION}-osx")" build_byacc + with_pushd "$(mkdirp_absolute_path "thrift-${THRIFT_VERSION}-osx")" build_thrift + ;; + Linux) + with_pushd "$(mkdirp_absolute_path "bison-${BISON_VERSION}-linux")" build_bison + with_pushd "$(mkdirp_absolute_path "byacc-${BYACC_VERSION}-linux")" build_byacc + with_pushd "$(mkdirp_absolute_path "thrift-${THRIFT_VERSION}-linux")" build_thrift + ;; + *) + die "make does not support building for '$(uname)'" + ;; +esac diff --git a/build-support/bin/thrift/linux/x86_64/0.11.0/build.sh b/build-support/bin/thrift/linux/x86_64/0.11.0/build.sh new file mode 100755 index 0000000..da1d839 --- /dev/null +++ b/build-support/bin/thrift/linux/x86_64/0.11.0/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +yum install -y flex flex-devel + +readonly result="$(./build-thrift.sh 0.11.0 2.5.1 20140715)" +cp "$result" ./thrift diff --git a/build-support/bin/thrift/mac/10.10/0.11.0 b/build-support/bin/thrift/mac/10.10/0.11.0 new file mode 120000 index 0000000..adeceac --- /dev/null +++ b/build-support/bin/thrift/mac/10.10/0.11.0 @@ -0,0 +1 @@ +../10.12/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.11/0.11.0 b/build-support/bin/thrift/mac/10.11/0.11.0 new file mode 120000 index 0000000..adeceac --- /dev/null +++ b/build-support/bin/thrift/mac/10.11/0.11.0 @@ -0,0 +1 @@ +../10.12/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh b/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh new file mode 100755 index 0000000..1ccae29 --- /dev/null +++ b/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +source "$(git rev-parse --show-toplevel)/utils.v1.bash" + +set_strict_mode + +function build_bison { + local -r extracted_dirname="bison-${BISON_VERSION}" + local -r archive_filename="${extracted_dirname}.tar.gz" + local -r release_url="http://ftp.gnu.org/gnu/bison/${archive_filename}" + + local -r downloaded_archive="$(curl_file_with_fail "$release_url" "$archive_filename")" + local -r source_extracted_abs="$(extract_for "$downloaded_archive" "$extracted_dirname")" + + with_pushd >&2 "$source_extracted_abs" sh ./configure --prefix="$source_extracted_abs/$INSTALL_PREFIX" + with_pushd >&2 "$source_extracted_abs" make install + + export PATH="$source_extracted_abs/$INSTALL_PREFIX/bin:$PATH" +} + +function build_byacc { + local -r extracted_dirname="byacc-${BYACC_VERSION}" + local -r archive_filename="${extracted_dirname}.tgz" + local -r release_url="https://www.mirrorservice.org/sites/lynx.invisible-island.net/byacc/${archive_filename}" + + local -r downloaded_archive="$(curl_file_with_fail "$release_url" "$archive_filename")" + local -r source_extracted_abs="$(extract_for "$downloaded_archive" "$extracted_dirname")" + + with_pushd >&2 "$source_extracted_abs" sh ./configure --prefix="$source_extracted_abs/$INSTALL_PREFIX" + with_pushd >&2 "$source_extracted_abs" make install + + export PATH="$source_extracted_abs/$INSTALL_PREFIX/bin:$PATH" +} + +function build_thrift { + local -r extracted_dirname="thrift-${THRIFT_VERSION}" + local -r archive_filename="${extracted_dirname}.tar.gz" + local -r release_url="http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/${archive_filename}" + + local -r downloaded_archive="$(curl_file_with_fail "$release_url" "$archive_filename")" + local -r source_extracted_abs="$(extract_for "$downloaded_archive" "$extracted_dirname")" + + # NB: The configure --wthout-* flags just disable building any runtime libs + # for the generated code. We only want the codegen side of things. + with_pushd >&2 "$source_extracted_abs" \ + sh ./configure \ + --disable-shared \ + --without-cpp \ + --without-c_glib \ + --without-csharp \ + --without-erlang \ + --without-java \ + --without-erlang \ + --without-lua \ + --without-python \ + --without-perl \ + --without-php \ + --without-php_extension \ + --without-qt4 \ + --without-qt5 \ + --without-dart \ + --without-ruby \ + --without-haskell \ + --without-go \ + --without-nodejs \ + --without-rs \ + --without-haxe \ + --without-dotnetcore \ + --without-d + with_pushd >&2 "$source_extracted_abs" make clean + with_pushd >&2 "$source_extracted_abs" make LDFLAGS="-all-static" + + echo "$source_extracted_abs/compiler/cpp/thrift" +} + +## Interpret arguments and execute build. + +readonly THRIFT_VERSION="$1" +readonly BISON_VERSION="$2" +readonly BYACC_VERSION="$3" +readonly INSTALL_PREFIX=install_dir + +case "$(uname)" in + Darwin) + with_pushd "$(mkdirp_absolute_path "bison-${BISON_VERSION}-osx")" build_bison + with_pushd "$(mkdirp_absolute_path "byacc-${BYACC_VERSION}-osx")" build_byacc + with_pushd "$(mkdirp_absolute_path "thrift-${THRIFT_VERSION}-osx")" build_thrift + ;; + Linux) + with_pushd "$(mkdirp_absolute_path "bison-${BISON_VERSION}-linux")" build_bison + with_pushd "$(mkdirp_absolute_path "byacc-${BYACC_VERSION}-linux")" build_byacc + with_pushd "$(mkdirp_absolute_path "thrift-${THRIFT_VERSION}-linux")" build_thrift + ;; + *) + die "make does not support building for '$(uname)'" + ;; +esac diff --git a/build-support/bin/thrift/mac/10.12/0.11.0/build.sh b/build-support/bin/thrift/mac/10.12/0.11.0/build.sh new file mode 100755 index 0000000..3202639 --- /dev/null +++ b/build-support/bin/thrift/mac/10.12/0.11.0/build.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +readonly result="$(./build-thrift.sh 0.11.0 2.5.1 20140715)" +cp "$result" ./thrift diff --git a/build-support/bin/thrift/mac/10.13/0.11.0 b/build-support/bin/thrift/mac/10.13/0.11.0 new file mode 120000 index 0000000..adeceac --- /dev/null +++ b/build-support/bin/thrift/mac/10.13/0.11.0 @@ -0,0 +1 @@ +../10.12/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.8/0.11.0 b/build-support/bin/thrift/mac/10.8/0.11.0 new file mode 120000 index 0000000..adeceac --- /dev/null +++ b/build-support/bin/thrift/mac/10.8/0.11.0 @@ -0,0 +1 @@ +../10.12/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.9/0.11.0 b/build-support/bin/thrift/mac/10.9/0.11.0 new file mode 120000 index 0000000..adeceac --- /dev/null +++ b/build-support/bin/thrift/mac/10.9/0.11.0 @@ -0,0 +1 @@ +../10.12/0.11.0 \ No newline at end of file diff --git a/build-thrift-0.11.0.sh b/build-thrift-0.11.0.sh deleted file mode 100755 index 2e832af..0000000 --- a/build-thrift-0.11.0.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -root=$(pwd -P) -INSTALL_PREFIX=install_dir - -# NB: The custom bison/yacc setup works around old versions in Centos 6, -# OSX Yosemite, and OSX Sierra which are too old for Thrift 0.11. -# -# On OSX we also boostrap a custom flex. On Centos you will need to install -# it manually via: -# yum install -y flex flex-devel - -curl -O http://ftp.gnu.org/gnu/bison/bison-2.5.1.tar.gz && \ -rm -rf bison-2.5.1 && \ -tar -xzf bison-2.5.1.tar.gz && ( - cd bison-2.5.1 && \ - sh ./configure --prefix="$(pwd -P)/$INSTALL_PREFIX" && \ - make install -) - -curl -O ftp://ftp.invisible-island.net/byacc/byacc-20140715.tgz && \ -rm -rf byacc-20140715 && \ -tar -xzf byacc-20140715.tgz && ( - cd byacc-20140715 && \ - sh ./configure --prefix="$(pwd -P)/$INSTALL_PREFIX" && \ - make install -) - -export PATH=$(pwd -P)/bison-2.5.1/$INSTALL_PREFIX/bin:$(pwd -P)/byacc-20140715/$INSTALL_PREFIX/bin:$PATH - -if [[ "`uname`" == "Darwin"* ]]; then - # Upgraded to 2.6.0 to pick up OSX linker fix: https://sourceforge.net/p/flex/bugs/182/ - curl -L -O http://sourceforge.mirrorservice.org/f/fl/flex/flex-2.6.0.tar.gz && \ - rm -rf flex-2.6.0 && \ - tar -xzf flex-2.6.0.tar.gz && ( - cd flex-2.6.0 && \ - ./autogen.sh - sh ./configure --prefix="$(pwd -P)/$INSTALL_PREFIX" && \ - make install - ) - - export PATH=$(pwd -P)/flex-2.6.0/$INSTALL_PREFIX/bin:$PATH - LDFLAGS="-L$(pwd -P)/flex-2.6.0/$INSTALL_PREFIX/lib" -fi - -# NB: The configure --wthout-* flags just disable building any runtime libs -# for the generated code. We only want the codegen side of things. -curl -O http://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz && \ -rm -rf thrift-0.11.0 && \ -tar -xzf thrift-0.11.0.tar.gz && \ -LDFLAGS="-all-static $LDFLAGS" && \ -cd thrift-0.11.0 && \ -sh ./configure \ - --disable-shared \ - --without-cpp \ - --without-c_glib \ - --without-csharp \ - --without-erlang \ - --without-java \ - --without-erlang \ - --without-lua \ - --without-python \ - --without-perl \ - --without-php \ - --without-php_extension \ - --without-qt4 \ - --without-qt5 \ - --without-dart \ - --without-ruby \ - --without-haskell \ - --without-go \ - --without-nodejs \ - --without-rs \ - --without-haxe \ - --without-dotnetcore \ - --without-d && \ -make clean && \ -make LDFLAGS="$LDFLAGS" -mv compiler/cpp/thrift ${root}/thrift-0.11.0.binary From e6ff366b7489c1b028dcb96db76e79ed894c5bbc Mon Sep 17 00:00:00 2001 From: Danny McClanahan <1305167+cosmicexplorer@users.noreply.github.com> Date: Sat, 27 Oct 2018 22:53:27 +0200 Subject: [PATCH 5/7] Fix typo in thrift comment Co-Authored-By: StephanErb --- build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh b/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh index 1ccae29..46c421a 100755 --- a/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh +++ b/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh @@ -40,7 +40,7 @@ function build_thrift { local -r downloaded_archive="$(curl_file_with_fail "$release_url" "$archive_filename")" local -r source_extracted_abs="$(extract_for "$downloaded_archive" "$extracted_dirname")" - # NB: The configure --wthout-* flags just disable building any runtime libs + # NB: The configure --without-* flags just disable building any runtime libs # for the generated code. We only want the codegen side of things. with_pushd >&2 "$source_extracted_abs" \ sh ./configure \ From b1c38a719c9795ab373b88b810de26a1d1cd2415 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Tue, 6 Nov 2018 18:56:49 +0100 Subject: [PATCH 6/7] Build Thrift with bison 3.2 Successfully tested on macOS Sierra and Mojave. --- build-support/bin/thrift/mac/10.12/0.11.0/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-support/bin/thrift/mac/10.12/0.11.0/build.sh b/build-support/bin/thrift/mac/10.12/0.11.0/build.sh index 3202639..a9eeb9d 100755 --- a/build-support/bin/thrift/mac/10.12/0.11.0/build.sh +++ b/build-support/bin/thrift/mac/10.12/0.11.0/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -readonly result="$(./build-thrift.sh 0.11.0 2.5.1 20140715)" +readonly result="$(./build-thrift.sh 0.11.0 3.2 20140715)" cp "$result" ./thrift From fc20e9dec33f8fbb9ab7ff74ab3b73e3372aba76 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Tue, 6 Nov 2018 23:09:45 +0100 Subject: [PATCH 7/7] Make MacOS 10.14 the canonical Thrift 0.11 build script location --- build-support/bin/thrift/mac/10.10/0.11.0 | 2 +- build-support/bin/thrift/mac/10.11/0.11.0 | 2 +- build-support/bin/thrift/mac/10.12/0.11.0 | 1 + build-support/bin/thrift/mac/10.13/0.11.0 | 2 +- .../bin/thrift/mac/{10.12 => 10.14}/0.11.0/build-thrift.sh | 0 build-support/bin/thrift/mac/{10.12 => 10.14}/0.11.0/build.sh | 0 build-support/bin/thrift/mac/10.8/0.11.0 | 2 +- build-support/bin/thrift/mac/10.9/0.11.0 | 2 +- 8 files changed, 6 insertions(+), 5 deletions(-) create mode 120000 build-support/bin/thrift/mac/10.12/0.11.0 rename build-support/bin/thrift/mac/{10.12 => 10.14}/0.11.0/build-thrift.sh (100%) rename build-support/bin/thrift/mac/{10.12 => 10.14}/0.11.0/build.sh (100%) diff --git a/build-support/bin/thrift/mac/10.10/0.11.0 b/build-support/bin/thrift/mac/10.10/0.11.0 index adeceac..e4b7137 120000 --- a/build-support/bin/thrift/mac/10.10/0.11.0 +++ b/build-support/bin/thrift/mac/10.10/0.11.0 @@ -1 +1 @@ -../10.12/0.11.0 \ No newline at end of file +../10.14/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.11/0.11.0 b/build-support/bin/thrift/mac/10.11/0.11.0 index adeceac..e4b7137 120000 --- a/build-support/bin/thrift/mac/10.11/0.11.0 +++ b/build-support/bin/thrift/mac/10.11/0.11.0 @@ -1 +1 @@ -../10.12/0.11.0 \ No newline at end of file +../10.14/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.12/0.11.0 b/build-support/bin/thrift/mac/10.12/0.11.0 new file mode 120000 index 0000000..e4b7137 --- /dev/null +++ b/build-support/bin/thrift/mac/10.12/0.11.0 @@ -0,0 +1 @@ +../10.14/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.13/0.11.0 b/build-support/bin/thrift/mac/10.13/0.11.0 index adeceac..e4b7137 120000 --- a/build-support/bin/thrift/mac/10.13/0.11.0 +++ b/build-support/bin/thrift/mac/10.13/0.11.0 @@ -1 +1 @@ -../10.12/0.11.0 \ No newline at end of file +../10.14/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh b/build-support/bin/thrift/mac/10.14/0.11.0/build-thrift.sh similarity index 100% rename from build-support/bin/thrift/mac/10.12/0.11.0/build-thrift.sh rename to build-support/bin/thrift/mac/10.14/0.11.0/build-thrift.sh diff --git a/build-support/bin/thrift/mac/10.12/0.11.0/build.sh b/build-support/bin/thrift/mac/10.14/0.11.0/build.sh similarity index 100% rename from build-support/bin/thrift/mac/10.12/0.11.0/build.sh rename to build-support/bin/thrift/mac/10.14/0.11.0/build.sh diff --git a/build-support/bin/thrift/mac/10.8/0.11.0 b/build-support/bin/thrift/mac/10.8/0.11.0 index adeceac..e4b7137 120000 --- a/build-support/bin/thrift/mac/10.8/0.11.0 +++ b/build-support/bin/thrift/mac/10.8/0.11.0 @@ -1 +1 @@ -../10.12/0.11.0 \ No newline at end of file +../10.14/0.11.0 \ No newline at end of file diff --git a/build-support/bin/thrift/mac/10.9/0.11.0 b/build-support/bin/thrift/mac/10.9/0.11.0 index adeceac..e4b7137 120000 --- a/build-support/bin/thrift/mac/10.9/0.11.0 +++ b/build-support/bin/thrift/mac/10.9/0.11.0 @@ -1 +1 @@ -../10.12/0.11.0 \ No newline at end of file +../10.14/0.11.0 \ No newline at end of file