From e0aadfec09f7c47c197fd5972157d2f269fdb28b Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Thu, 19 Nov 2020 22:32:23 +0100 Subject: [PATCH] Bump Protobuf 3.13.0 -> 3.14.0 --- Dependencies.txt | 2 +- WORKSPACE | 2 +- cmake/dependencies/CMakeLists.txt | 8 +++--- makefiles/Makefile.third_party.unix.mk | 2 +- makefiles/Makefile.third_party.win.mk | 2 +- .../Google.OrTools/Google.OrTools.csproj.in | 2 +- ortools/java/pom-local.xml.in | 2 +- ortools/java/pom.xml.in | 2 +- ...f-v3.13.0.patch => protobuf-v3.14.0.patch} | 25 +++++++++++++------ 9 files changed, 28 insertions(+), 19 deletions(-) rename patches/{protobuf-v3.13.0.patch => protobuf-v3.14.0.patch} (86%) diff --git a/Dependencies.txt b/Dependencies.txt index 429c8c536b..7b28beb896 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,4 +1,4 @@ -Protobuf=3.13.0 +Protobuf=3.14.0 abseil-cpp=20200923.2 Cbc=2.10.5 Cgl=0.60.3 diff --git a/WORKSPACE b/WORKSPACE index 0c3c923d8f..b0cc6acbf8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -29,7 +29,7 @@ http_archive( # Protobuf git_repository( name = "com_google_protobuf", - commit = "fde7cf7", # release v3.13.0 + commit = "2514f0b", # release v3.14.0 remote = "https://github.com/protocolbuffers/protobuf.git", ) diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 19998798cf..387b0b6268 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -114,17 +114,17 @@ if(BUILD_Protobuf) FetchContent_Declare( protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v3.13.0" + GIT_TAG "v3.14.0" GIT_SUBMODULES "" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.13.0.patch" + PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.14.0.patch" SOURCE_SUBDIR cmake) FetchContent_MakeAvailable(protobuf) else() fetch_git_dependency( NAME Protobuf REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - TAG "v3.13.0" - PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.13.0.patch\"" + TAG "v3.14.0" + PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.14.0.patch\"" SOURCE_SUBDIR cmake ) endif() diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk index a3bf99be40..08d7f3b73a 100644 --- a/makefiles/Makefile.third_party.unix.mk +++ b/makefiles/Makefile.third_party.unix.mk @@ -20,7 +20,7 @@ UNIX_SWIG_BINARY ?= swig PROTOC_BINARY := $(shell $(WHICH) ${UNIX_PROTOC_BINARY}) # Tags of dependencies to checkout. -PROTOBUF_TAG = v3.13.0 +PROTOBUF_TAG = v3.14.0 ABSL_TAG = 20200923.2 CBC_TAG = 2.10.5 CGL_TAG = 0.60.3 diff --git a/makefiles/Makefile.third_party.win.mk b/makefiles/Makefile.third_party.win.mk index c2078acc88..a7a954483a 100644 --- a/makefiles/Makefile.third_party.win.mk +++ b/makefiles/Makefile.third_party.win.mk @@ -35,7 +35,7 @@ SWIG_BINARY = $(WINDOWS_SWIG_BINARY) # tags of dependencies to checkout. ZLIB_TAG = 1.2.11 ZLIB_ARCHIVE_TAG = 1211 -PROTOBUF_TAG = v3.13.0 +PROTOBUF_TAG = v3.14.0 ABSL_TAG = 20200923.2 # We are using a CBC archive containing all coin-or project # since Clp 2.17.5+ is broken we need to stick with Cbc 2.10.4 diff --git a/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in b/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in index 64bc6bc94e..fd136a8385 100644 --- a/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in +++ b/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in @@ -137,7 +137,7 @@ - + diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index 843d8a7377..aa6e9f2c43 100644 --- a/ortools/java/pom-local.xml.in +++ b/ortools/java/pom-local.xml.in @@ -70,7 +70,7 @@ com.google.protobuf protobuf-java - 3.13.0 + 3.14.0 diff --git a/ortools/java/pom.xml.in b/ortools/java/pom.xml.in index 008329e216..34e50ec43e 100644 --- a/ortools/java/pom.xml.in +++ b/ortools/java/pom.xml.in @@ -58,7 +58,7 @@ com.google.protobuf protobuf-java - 3.13.0 + 3.14.0 junit diff --git a/patches/protobuf-v3.13.0.patch b/patches/protobuf-v3.14.0.patch similarity index 86% rename from patches/protobuf-v3.13.0.patch rename to patches/protobuf-v3.14.0.patch index 470b028643..afdb01c448 100644 --- a/patches/protobuf-v3.13.0.patch +++ b/patches/protobuf-v3.14.0.patch @@ -1,5 +1,5 @@ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 9ca31ac0b..0a1b5353e 100644 +index 52661f522..79aea8b4d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -16,6 +16,16 @@ if(POLICY CMP0048) @@ -19,15 +19,15 @@ index 9ca31ac0b..0a1b5353e 100644 # Project project(protobuf C CXX) -@@ -44,6 +54,7 @@ option(protobuf_BUILD_TESTS "Build tests" ON) - option(protobuf_BUILD_CONFORMANCE "Build conformance tests" OFF) +@@ -45,6 +55,7 @@ option(protobuf_BUILD_CONFORMANCE "Build conformance tests" OFF) option(protobuf_BUILD_EXAMPLES "Build examples" OFF) option(protobuf_BUILD_PROTOC_BINARIES "Build libprotoc and protoc compiler" ON) + option(protobuf_BUILD_LIBPROTOC "Build libprotoc" OFF) +option(protobuf_BUILD_EXPORT "Build export to use build directory" ON) if (BUILD_SHARED_LIBS) set(protobuf_BUILD_SHARED_LIBS_DEFAULT ON) else (BUILD_SHARED_LIBS) -@@ -51,7 +62,7 @@ else (BUILD_SHARED_LIBS) +@@ -52,7 +63,7 @@ else (BUILD_SHARED_LIBS) endif (BUILD_SHARED_LIBS) option(protobuf_BUILD_SHARED_LIBS "Build Shared Libraries" ${protobuf_BUILD_SHARED_LIBS_DEFAULT}) include(CMakeDependentOption) @@ -36,7 +36,16 @@ index 9ca31ac0b..0a1b5353e 100644 "NOT protobuf_BUILD_SHARED_LIBS" OFF) set(protobuf_WITH_ZLIB_DEFAULT ON) option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT}) -@@ -125,24 +136,12 @@ endif (CMAKE_USE_PTHREADS_INIT) +@@ -65,6 +76,8 @@ include(protobuf-options.cmake) + # Overrides for option dependencies + if (protobuf_BUILD_PROTOC_BINARIES OR protobuf_BUILD_TESTS) + set(protobuf_BUILD_LIBPROTOC ON) ++else() ++ set(protobuf_BUILD_LIBPROTOC OFF) + endif () + # Path to main configure script + set(protobuf_CONFIGURE_SCRIPT "../configure.ac") +@@ -124,24 +137,12 @@ endif (CMAKE_USE_PTHREADS_INIT) set(_protobuf_FIND_ZLIB) if (protobuf_WITH_ZLIB) @@ -67,7 +76,7 @@ index 9ca31ac0b..0a1b5353e 100644 endif (protobuf_WITH_ZLIB) if (HAVE_ZLIB) -@@ -232,7 +231,6 @@ endif (MSVC) +@@ -231,7 +232,6 @@ endif (MSVC) get_filename_component(protobuf_source_dir ${protobuf_SOURCE_DIR} PATH) include_directories( @@ -76,7 +85,7 @@ index 9ca31ac0b..0a1b5353e 100644 ${protobuf_source_dir}/src) diff --git a/cmake/install.cmake b/cmake/install.cmake -index be47c54a1..846e6dd60 100644 +index 4091bc8af..587d6d15a 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -119,18 +119,19 @@ configure_file(protobuf-options.cmake @@ -112,7 +121,7 @@ index be47c54a1..846e6dd60 100644 install(EXPORT protobuf-targets DESTINATION "${CMAKE_INSTALL_CMAKEDIR}" diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake -index 0c12596c2..ac119a84d 100644 +index a5be494fb..9934e6e8a 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -116,7 +116,7 @@ add_library(libprotobuf ${protobuf_SHARED_OR_STATIC}