Fixing tests.sh to work on mac

Author: mkruskal-google

BUILD.bazel

@@ -481,7 +481,7 @@ java_lite_proto_library(
 
 objc_proto_library(
     name = "test_messages_proto2_objc_proto",
-    srcs = ["test_messages_proto2.proto"],
+    srcs = [":test_messages_proto2_proto_srcs"],
     includes = ["src/google/protobuf"],
     testonly = 1,
     visibility = [
@@ -492,7 +492,7 @@ objc_proto_library(
 
 objc_proto_library(
     name = "test_messages_proto3_objc_proto",
-    srcs = ["test_messages_proto3.proto"],
+    srcs = [":test_messages_proto3_proto_srcs"],
     proto_deps = [":well_known_protos"],
     includes = ["src/google/protobuf", "src"],
     testonly = 1,

generate_descriptor_proto.sh

@@ -7,7 +7,7 @@
 # generate.
 #
 # HINT:  Flags passed to generate_descriptor_proto.sh will be passed directly
-#   to make when building protoc.  This is particularly useful for passing
+#   to bazel when building protoc.  This is particularly useful for passing
 #   -j4 to run 4 jobs simultaneously.
 
 if test ! -e src/google/protobuf/stubs/common.h; then
@@ -62,12 +62,12 @@ do
     PROTOC=$BOOTSTRAP_PROTOC
     BOOTSTRAP_PROTOC=""
   else
-    make -j$(nproc) $@ protoc
+    bazel build -j$(nproc) $@ //:protoc
     if test $? -ne 0; then
       echo "Failed to build protoc."
       exit 1
     fi
-    PROTOC="./protoc"
+    PROTOC="../bazel-bin/protoc"
   fi
 
   $PROTOC --cpp_out=dllexport_decl=PROTOBUF_EXPORT:$TMP ${RUNTIME_PROTO_FILES[@]} && \

objectivec/DevTools/full_mac_build.sh

@@ -24,8 +24,6 @@ OPTIONS:
          Show this message
    -c, --clean
          Issue a clean before the normal build.
-   -a, --autogen
-         Start by rerunning autogen & configure.
    -r, --regenerate-descriptors
          Run generate_descriptor_proto.sh to regenerate all the checked in
          proto sources.
@@ -60,25 +58,7 @@ header() {
   echo "========================================================================"
 }
 
-# Thanks to libtool, builds can fail in odd ways and since it eats some output
-# it can be hard to spot, so force error output if make exits with a non zero.
-wrapped_make() {
-  set +e  # Don't stop if the command fails.
-  make $*
-  MAKE_EXIT_STATUS=$?
-  if [ ${MAKE_EXIT_STATUS} -ne 0 ]; then
-    echo "Error: 'make $*' exited with status ${MAKE_EXIT_STATUS}"
-    exit ${MAKE_EXIT_STATUS}
-  fi
-  set -e
-}
-
-NUM_MAKE_JOBS=$(/usr/sbin/sysctl -n hw.ncpu)
-if [[ "${NUM_MAKE_JOBS}" -lt 2 ]] ; then
-  NUM_MAKE_JOBS=2
-fi
-
-DO_AUTOGEN=no
+NUM_JOBS=auto
 DO_CLEAN=no
 REGEN_DESCRIPTORS=no
 CORE_ONLY=no
@@ -98,15 +78,12 @@ while [[ $# != 0 ]]; do
     -c | --clean )
       DO_CLEAN=yes
       ;;
-    -a | --autogen )
-      DO_AUTOGEN=yes
-      ;;
     -r | --regenerate-descriptors )
       REGEN_DESCRIPTORS=yes
       ;;
     -j | --jobs )
       shift
-      NUM_MAKE_JOBS="${1}"
+      NUM_JOBS="${1}"
       ;;
     --core-only )
       CORE_ONLY=yes
@@ -154,21 +131,9 @@ done
 # Into the proto dir.
 cd "${ProtoRootDir}"
 
-# if no Makefile, force the autogen.
-if [[ ! -f Makefile ]] ; then
-  DO_AUTOGEN=yes
-fi
-
-if [[ "${DO_AUTOGEN}" == "yes" ]] ; then
-  header "Running autogen & configure"
-  ./autogen.sh
-  ./configure \
-    CPPFLAGS="-mmacosx-version-min=10.9 -Wunused-const-variable -Wunused-function"
-fi
-
 if [[ "${DO_CLEAN}" == "yes" ]] ; then
   header "Cleaning"
-  wrapped_make clean
+  bazel clean
   if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
     XCODEBUILD_CLEAN_BASE_IOS=(
       xcodebuild
@@ -212,24 +177,23 @@ fi
 
 if [[ "${REGEN_DESCRIPTORS}" == "yes" ]] ; then
   header "Regenerating the descriptor sources."
-  ./generate_descriptor_proto.sh -j "${NUM_MAKE_JOBS}"
+  ./generate_descriptor_proto.sh -j "${NUM_JOBS}"
 fi
 
 if [[ "${CORE_ONLY}" == "yes" ]] ; then
   header "Building core Only"
-  wrapped_make -j "${NUM_MAKE_JOBS}"
+  bazel build //:protoc //:protobuf //:protobuf_lite -j "${NUM_JOBS}"
 else
   header "Building"
   # Can't issue these together, when fully parallel, something sometimes chokes
   # at random.
-  wrapped_make -j "${NUM_MAKE_JOBS}" all
-  wrapped_make -j "${NUM_MAKE_JOBS}" check
+  bazel test //src/...
   # Fire off the conformance tests also.
   bazel test //conformance:objc
 fi
 
 # Ensure the WKT sources checked in are current.
-objectivec/generate_well_known_types.sh --check-only -j "${NUM_MAKE_JOBS}"
+objectivec/generate_well_known_types.sh --check-only -j "${NUM_JOBS}"
 
 header "Checking on the ObjC Runtime Code"
 # Some of the kokoro machines don't have python3 yet, so fall back to python if need be.
@@ -293,7 +257,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
           -disable-concurrent-destination-testing
       )
       ;;
-    11.* | 12.* | 13.*)
+    11.* | 12.* | 13.* | 14.*)
       # Dropped 32bit as Apple doesn't seem support the simulators either.
       XCODEBUILD_TEST_BASE_IOS+=(
           -destination "platform=iOS Simulator,name=iPhone 8,OS=latest" # 64bit

objectivec/generate_well_known_types.sh

@@ -4,7 +4,7 @@
 # the protocol compiler changes.
 
 # HINT:  Flags passed to generate_well_known_types.sh will be passed directly
-#   to make when building protoc.  This is particularly useful for passing
+#   to bazel when building protoc.  This is particularly useful for passing
 #   -j4 to run 4 jobs simultaneously.
 
 set -eu
@@ -30,18 +30,10 @@ __EOF__
   exit 1
 fi
 
-if [[ ! -e src/Makefile ]]; then
-  cat >&2 << __EOF__
-Could not find src/Makefile.  You must run ./configure (and perhaps
-./autogen.sh) first.
-__EOF__
-  exit 1
-fi
-
 # Make sure the compiler is current.
-cd src
-make $@ protoc
+bazel build $@ //:protoc
 
+cd src
 declare -a RUNTIME_PROTO_FILES=( \
   google/protobuf/any.proto \
   google/protobuf/api.proto \
@@ -59,7 +51,7 @@ declare -a OBJC_EXTENSIONS=( .pbobjc.h .pbobjc.m )
 # Generate to a temp directory to see if they match.
 TMP_DIR=$(mktemp -d)
 trap "rm -rf ${TMP_DIR}" EXIT
-./protoc --objc_out="${TMP_DIR}" ${RUNTIME_PROTO_FILES[@]}
+${ProtoRootDir}/bazel-bin/protoc --objc_out="${TMP_DIR}" ${RUNTIME_PROTO_FILES[@]}
 
 DID_COPY=0
 for PROTO_FILE in "${RUNTIME_PROTO_FILES[@]}"; do

php/generate_descriptor_protos.sh

@@ -13,17 +13,16 @@ __EOF__
   exit 1
 fi
 
-pushd src
-./protoc --php_out=internal:../php/src google/protobuf/descriptor.proto
-./protoc --php_out=internal_generate_c_wkt:../php/src \
-  google/protobuf/any.proto \
-  google/protobuf/api.proto \
-  google/protobuf/duration.proto \
-  google/protobuf/empty.proto \
-  google/protobuf/field_mask.proto \
-  google/protobuf/source_context.proto \
-  google/protobuf/struct.proto \
-  google/protobuf/type.proto \
-  google/protobuf/timestamp.proto \
-  google/protobuf/wrappers.proto
+bazel-bin/protoc --php_out=internal:php/src google/protobuf/descriptor.proto
+bazel-bin/protoc --php_out=internal_generate_c_wkt:php/src \
+  src/google/protobuf/any.proto \
+  src/google/protobuf/api.proto \
+  src/google/protobuf/duration.proto \
+  src/google/protobuf/empty.proto \
+  src/google/protobuf/field_mask.proto \
+  src/google/protobuf/source_context.proto \
+  src/google/protobuf/struct.proto \
+  src/google/protobuf/type.proto \
+  src/google/protobuf/timestamp.proto \
+  src/google/protobuf/wrappers.proto
 popd

php/generate_test_protos.sh

@@ -2,19 +2,12 @@
 
 set -ex
 
-cd `dirname $0`
-
-if ../src/protoc --help > /dev/null; then
-  PROTOC=src/protoc
-else
-  # Bazel seems to be creating a problematic symlink in
-  # _build/out/external/com_google_protobuf, so we remove the _build directory
-  # before building protoc.
-  (cd .. && bazel build -c opt :protoc)
-  PROTOC=bazel-bin/protoc
-fi
+cd `dirname $0`/..
+
+bazel build -c opt //:protoc
+PROTOC=bazel-bin/protoc
 
-if [[ -d tmp && -z $(find tests/proto ../$PROTOC -newer tmp) ]]; then
+if [[ -d php/tmp && -z $(find php/tests/proto $PROTOC -newer php/tmp) ]]; then
   # Generated protos are already present and up to date, so we can skip protoc.
   #
   # Protoc is very fast, but sometimes it is not available (like if we haven't
@@ -23,10 +16,9 @@ if [[ -d tmp && -z $(find tests/proto ../$PROTOC -newer tmp) ]]; then
   exit 0
 fi
 
-rm -rf tmp
-mkdir -p tmp
+rm -rf php/tmp
+mkdir -p php/tmp
 
-cd ..
 find php/tests/proto -type f -name "*.proto"| xargs $PROTOC --php_out=php/tmp -Isrc -Iphp/tests
 
 if [ "$1" = "--aggregate_metadata" ]; then

python/setup.py

@@ -290,7 +290,7 @@ def HasLibraryDirsOpt():
       library_dirs = None
       if not HasStaticLibprotobufOpt():
         extra_objects = ['../bazel-bin/src/google/protobuf/libprotobuf.a',
-                         '../bazel-bin/src/google/protobuf/libprotobuf-lite.a']
+                         '../bazel-bin/src/google/protobuf/libprotobuf_lite.a']
     else:
       libraries = ['protobuf']
       if HasLibraryDirsOpt():
@@ -361,6 +361,11 @@ def HasLibraryDirsOpt():
       sys.argv.remove(warnings_as_errors)
 
     # C++ implementation extension
+    print(libraries)
+    print(extra_objects)
+    print(message_extra_link_args)
+    print(library_dirs)
+    print(extra_compile_args)
     ext_module_list.extend([
         Extension(
             'google.protobuf.pyext._message',

third_party/utf8_range/BUILD.bazel

@@ -14,7 +14,10 @@ cc_library(
 
 filegroup(
     name = "all_files",
-    srcs = glob(["*"]),
+    srcs = glob([
+        "*.h",
+        "*.c",
+    ]),
     visibility = [
         "//cmake:__pkg__",
         "//php:__pkg__",