Whitespace fixes and an attempt at fix for Windows Python Release (CM…

…ake version < 3.13)

Makefile.am

@@ -1403,7 +1403,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)              \
   BUILD                                             \
   WORKSPACE                                         \
   CMakeLists.txt                                    \
-  cmake/abseil-cpp.cmake                           \
+  cmake/abseil-cpp.cmake                            \
   cmake/CMakeLists.txt                              \
   cmake/README.md                                   \
   cmake/conformance.cmake                           \

kokoro/release/python/linux/build_artifacts.sh

@@ -30,7 +30,7 @@ git clone https://github.com/matthew-brett/multibuild.git
 # silently creeping in (see https://github.com/protocolbuffers/protobuf/issues/9180).
 # IMPORTANT: always pin multibuild at the same commit for:
 # - linux/build_artifacts.sh
-# - linux/build_artifacts.sh
+# - macos/build_artifacts.sh
 # - windows/build_artifacts.bat
 (cd multibuild; git checkout b89bb903e94308be79abefa4f436bf123ebb1313)
 cp kokoro/release/python/linux/config.sh config.sh

kokoro/release/python/macos/build_artifacts.sh

@@ -30,7 +30,7 @@ git clone https://github.com/matthew-brett/multibuild.git
 # silently creeping in (see https://github.com/protocolbuffers/protobuf/issues/9180).
 # IMPORTANT: always pin multibuild at the same commit for:
 # - linux/build_artifacts.sh
-# - linux/build_artifacts.sh
+# - macos/build_artifacts.sh
 # - windows/build_artifacts.bat
 (cd multibuild; git checkout b89bb903e94308be79abefa4f436bf123ebb1313)
 cp kokoro/release/python/macos/config.sh config.sh

kokoro/release/python/windows/build_artifacts.bat

@@ -18,7 +18,7 @@ REM Pin multibuild scripts at a known commit to avoid potentially unwanted futur
 REM silently creeping in (see https://github.com/protocolbuffers/protobuf/issues/9180).
 REM IMPORTANT: always pin multibuild at the same commit for:
 REM - linux/build_artifacts.sh
-REM - linux/build_artifacts.sh
+REM - macos/build_artifacts.sh
 REM - windows/build_artifacts.bat
 cd multibuild
 git checkout b89bb903e94308be79abefa4f436bf123ebb1313
@@ -34,6 +34,11 @@ SET ZLIB_ROOT=%cd%\zlib
 del /Q zlib.zip
 del /Q zlib-src.zip
 
+REM Install Abseil
+mkdir absl
+git clone https://github.com/abseil/abseil-cpp.git
+SET ABSL_ROOT_DIR=%cd%\abseil-cpp
+
 REM Create directory for artifacts
 SET ARTIFACT_DIR=%cd%\artifacts
 mkdir %ARTIFACT_DIR%

src/google/protobuf/message.h

@@ -126,6 +126,7 @@
 #include <google/protobuf/map.h>  // TODO(b/211442718): cleanup
 #include <google/protobuf/message_lite.h>
 
+
 // Must be included last.
 #include <google/protobuf/port_def.inc>