Auto-generate files after cl/564810016
diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 69544b7..9cb9f63 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c
@@ -8,17 +8,17 @@ * * The correct usage is: * - * #include "upb/foobar.h" - * #include "upb/baz.h" + * #include "upb/upb/foobar.h" + * #include "upb/upb/baz.h" * * // MUST be last included header. - * #include "upb/port/def.inc" + * #include "upb/upb/port/def.inc" * * // Code for this file. * // <...> * * // Can be omitted for .c files, required for .h. - * #include "upb/port/undef.inc" + * #include "upb/upb/port/undef.inc" * * This file is private and must not be included by users! */
diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 4cb47cc..b19a285 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h
@@ -7,17 +7,17 @@ * * The correct usage is: * - * #include "upb/foobar.h" - * #include "upb/baz.h" + * #include "upb/upb/foobar.h" + * #include "upb/upb/baz.h" * * // MUST be last included header. - * #include "upb/port/def.inc" + * #include "upb/upb/port/def.inc" * * // Code for this file. * // <...> * * // Can be omitted for .c files, required for .h. - * #include "upb/port/undef.inc" + * #include "upb/upb/port/undef.inc" * * This file is private and must not be included by users! */ @@ -447,7 +447,7 @@ #endif /* UPB_BASE_DESCRIPTOR_CONSTANTS_H_ */ // Users should include array.h or map.h instead. -// IWYU pragma: private, include "upb/collections/array.h" +// IWYU pragma: private, include "upb/upb/collections/array.h" #ifndef UPB_MESSAGE_VALUE_H_ #define UPB_MESSAGE_VALUE_H_ @@ -2210,13 +2210,13 @@ // IWYU pragma: begin_exports -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_DEF_POOL_H_ #define UPB_REFLECTION_DEF_POOL_H_ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" // Declarations common to all public def types. @@ -10407,7 +10407,7 @@ #endif /* UPB_REFLECTION_DEF_POOL_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ENUM_DEF_H_ #define UPB_REFLECTION_ENUM_DEF_H_ @@ -10457,7 +10457,7 @@ #endif /* UPB_REFLECTION_ENUM_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ENUM_VALUE_DEF_H_ #define UPB_REFLECTION_ENUM_VALUE_DEF_H_ @@ -10485,7 +10485,7 @@ #endif /* UPB_REFLECTION_ENUM_VALUE_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_EXTENSION_RANGE_H_ #define UPB_REFLECTION_EXTENSION_RANGE_H_ @@ -10511,7 +10511,7 @@ #endif /* UPB_REFLECTION_EXTENSION_RANGE_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_FIELD_DEF_H_ #define UPB_REFLECTION_FIELD_DEF_H_ @@ -10574,7 +10574,7 @@ #endif /* UPB_REFLECTION_FIELD_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_FILE_DEF_H_ #define UPB_REFLECTION_FILE_DEF_H_ @@ -10622,7 +10622,7 @@ #endif /* UPB_REFLECTION_FILE_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_MESSAGE_DEF_H_ #define UPB_REFLECTION_MESSAGE_DEF_H_ @@ -10768,7 +10768,7 @@ #endif /* UPB_REFLECTION_MESSAGE_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_METHOD_DEF_H_ #define UPB_REFLECTION_METHOD_DEF_H_ @@ -10798,7 +10798,7 @@ #endif /* UPB_REFLECTION_METHOD_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ONEOF_DEF_H_ #define UPB_REFLECTION_ONEOF_DEF_H_ @@ -10836,7 +10836,7 @@ #endif /* UPB_REFLECTION_ONEOF_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_SERVICE_DEF_H_ #define UPB_REFLECTION_SERVICE_DEF_H_ @@ -12861,7 +12861,7 @@ #define UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_H_ #define UPB_REFLECTION_ENUM_RESERVED_RANGE_H_ @@ -12962,7 +12962,7 @@ #define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_ #define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index fb6f8fd..a0b5682 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -8,17 +8,17 @@ * * The correct usage is: * - * #include "upb/foobar.h" - * #include "upb/baz.h" + * #include "upb/upb/foobar.h" + * #include "upb/upb/baz.h" * * // MUST be last included header. - * #include "upb/port/def.inc" + * #include "upb/upb/port/def.inc" * * // Code for this file. * // <...> * * // Can be omitted for .c files, required for .h. - * #include "upb/port/undef.inc" + * #include "upb/upb/port/undef.inc" * * This file is private and must not be included by users! */
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index a36377f..653f35f 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -9,17 +9,17 @@ * * The correct usage is: * - * #include "upb/foobar.h" - * #include "upb/baz.h" + * #include "upb/upb/foobar.h" + * #include "upb/upb/baz.h" * * // MUST be last included header. - * #include "upb/port/def.inc" + * #include "upb/upb/port/def.inc" * * // Code for this file. * // <...> * * // Can be omitted for .c files, required for .h. - * #include "upb/port/undef.inc" + * #include "upb/upb/port/undef.inc" * * This file is private and must not be included by users! */ @@ -449,7 +449,7 @@ #endif /* UPB_BASE_DESCRIPTOR_CONSTANTS_H_ */ // Users should include array.h or map.h instead. -// IWYU pragma: private, include "upb/collections/array.h" +// IWYU pragma: private, include "upb/upb/collections/array.h" #ifndef UPB_MESSAGE_VALUE_H_ #define UPB_MESSAGE_VALUE_H_ @@ -10711,13 +10711,13 @@ // IWYU pragma: begin_exports -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_DEF_POOL_H_ #define UPB_REFLECTION_DEF_POOL_H_ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" // Declarations common to all public def types. @@ -10882,7 +10882,7 @@ #endif /* UPB_REFLECTION_DEF_POOL_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ENUM_DEF_H_ #define UPB_REFLECTION_ENUM_DEF_H_ @@ -10932,7 +10932,7 @@ #endif /* UPB_REFLECTION_ENUM_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ENUM_VALUE_DEF_H_ #define UPB_REFLECTION_ENUM_VALUE_DEF_H_ @@ -10960,7 +10960,7 @@ #endif /* UPB_REFLECTION_ENUM_VALUE_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_EXTENSION_RANGE_H_ #define UPB_REFLECTION_EXTENSION_RANGE_H_ @@ -10986,7 +10986,7 @@ #endif /* UPB_REFLECTION_EXTENSION_RANGE_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_FIELD_DEF_H_ #define UPB_REFLECTION_FIELD_DEF_H_ @@ -11049,7 +11049,7 @@ #endif /* UPB_REFLECTION_FIELD_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_FILE_DEF_H_ #define UPB_REFLECTION_FILE_DEF_H_ @@ -11097,7 +11097,7 @@ #endif /* UPB_REFLECTION_FILE_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_MESSAGE_DEF_H_ #define UPB_REFLECTION_MESSAGE_DEF_H_ @@ -11243,7 +11243,7 @@ #endif /* UPB_REFLECTION_MESSAGE_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_METHOD_DEF_H_ #define UPB_REFLECTION_METHOD_DEF_H_ @@ -11273,7 +11273,7 @@ #endif /* UPB_REFLECTION_METHOD_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ONEOF_DEF_H_ #define UPB_REFLECTION_ONEOF_DEF_H_ @@ -11311,7 +11311,7 @@ #endif /* UPB_REFLECTION_ONEOF_DEF_H_ */ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_SERVICE_DEF_H_ #define UPB_REFLECTION_SERVICE_DEF_H_ @@ -12678,7 +12678,7 @@ #define UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_H_ #define UPB_REFLECTION_ENUM_RESERVED_RANGE_H_ @@ -12779,7 +12779,7 @@ #define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_ -// IWYU pragma: private, include "upb/reflection/def.h" +// IWYU pragma: private, include "upb/upb/reflection/def.h" #ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_ #define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_
diff --git a/upb/cmake/CMakeLists.txt b/upb/cmake/CMakeLists.txt index 1952dc3..aaee1f0 100644 --- a/upb/cmake/CMakeLists.txt +++ b/upb/cmake/CMakeLists.txt
@@ -5,7 +5,6 @@ project(upb) set(CMAKE_C_STANDARD 99) - # Prevent CMake from setting -rdynamic on Linux (!!). SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") @@ -41,7 +40,7 @@ endif() if(NOT TARGET utf8_range) - if(EXISTS ../external/utf8_range) + if(EXISTS ../../external/utf8_range) # utf8_range is already installed include_directories(../external/utf8_range) elseif(EXISTS ../../utf8_range) @@ -51,7 +50,7 @@ FetchContent_Declare( utf8_range GIT_REPOSITORY "https://github.com/protocolbuffers/utf8_range.git" - GIT_TAG "de0b4a8ff9b5d4c98108bdfe723291a33c52c54f" + GIT_TAG "d863bc33e15cba6d873c878dcca9e6fe52b2f8cb" ) FetchContent_GetProperties(utf8_range) if(NOT utf8_range_POPULATED)
diff --git a/upb/cmake/google/protobuf/descriptor.upb.c b/upb/cmake/google/protobuf/descriptor.upb.c index 5efcc28..521ced7 100644 --- a/upb/cmake/google/protobuf/descriptor.upb.c +++ b/upb/cmake/google/protobuf/descriptor.upb.c
@@ -7,11 +7,11 @@ * regenerated. */ #include <stddef.h> -#include "upb/generated_code_support.h" +#include "upb/upb/generated_code_support.h" #include "google/protobuf/descriptor.upb.h" // Must be last. -#include "upb/port/def.inc" +#include "upb/upb/port/def.inc" static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = { {.submsg = &google_protobuf_FileDescriptorProto_msg_init}, @@ -1347,5 +1347,5 @@ 0, }; -#include "upb/port/undef.inc" +#include "upb/upb/port/undef.inc"
diff --git a/upb/cmake/google/protobuf/descriptor.upb.h b/upb/cmake/google/protobuf/descriptor.upb.h index d938317..c5b7d43 100644 --- a/upb/cmake/google/protobuf/descriptor.upb.h +++ b/upb/cmake/google/protobuf/descriptor.upb.h
@@ -9,9 +9,9 @@ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ -#include "upb/generated_code_support.h" +#include "upb/upb/generated_code_support.h" // Must be last. -#include "upb/port/def.inc" +#include "upb/upb/port/def.inc" #ifdef __cplusplus extern "C" { @@ -6508,6 +6508,6 @@ } /* extern "C" */ #endif -#include "upb/port/undef.inc" +#include "upb/upb/port/undef.inc" #endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */