Updates open-source build to generate frameworks for "make dist", instead of just libraries.

PiperOrigin-RevId: 441596919

Author: tomball

Makefile

@@ -133,5 +133,5 @@ print_environment:
 	@echo `xcodebuild -version`
 	@echo `xcrun cc -v`
 	@echo Environment:
-	@env | grep -v '^_' | sort
+	@env | grep -v '^_' | grep -v '^[ }]' | grep -v '^rvm_' | sort
 	@echo

guava/Makefile

@@ -23,7 +23,9 @@ clean_jre:
 clean_android:
 	@$(MAKE) -C android -f android.mk clean
 
-dist: dist_jre dist_android
+dist: framework
+
+lib: dist_jre dist_android
 	@:
 
 dist_jre:

guava/common.mk

@@ -83,7 +83,7 @@ DIST_GUAVA_INCLUDE_DIR = $(GUAVA_INCLUDE_DIR)
 DIST_HEADERS = $(JAVA_SOURCES:$(JAVA_SRC_DIR)/%.java=$(DIST_GUAVA_INCLUDE_DIR)/%.h)
 DIST_JAR = $(GUAVA_DIST_JAR)
 
-dist: $(FAT_LIBS_DIST) $(DIST_JAR) $(DIST_HEADERS)
+lib: $(FAT_LIBS_DIST) $(DIST_JAR) $(DIST_HEADERS)
 
 clean:
 	@rm -rf $(BUILD_DIR) $(FAT_LIBS_DIST) $(DIST_GUAVA_INCLUDE_DIR) $(DIST_JAR)

inject/javax_inject/Makefile

@@ -53,13 +53,11 @@ include $(J2OBJC_ROOT)/make/framework.mk
 JSR330_LICENSE = LICENSE
 JSR330_LICENSE_DIST = $(DIST_LICENSE_DIR)/jsr330_license.txt
 
-default: lib
+default: $(FAT_LIBS)
+	@:
 
 java: jar
 
-lib: $(FAT_LIBS)
-	@:
-
 $(BUILD_DIR)/.extracted: $(INJECT_SRC_JAR) | $(BUILD_DIR)
 	@mkdir -p $(JAVA_SRC_DIR)
 	@unzip -q -o -d $(JAVA_SRC_DIR) $(INJECT_SRC_JAR) $(JAVA_SOURCES)
@@ -103,4 +101,6 @@ clean:
 	@rm -rf $(ARCH_INCLUDE_DIR)/javax/inject
 	@rm -rf $(FRAMEWORK_DIR)
 
-dist: $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(JSR330_LICENSE_DIST)
+dist: framework
+
+lib: $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(JSR330_LICENSE_DIST)

jre_emul/Makefile

@@ -189,7 +189,9 @@ clean:
 	@rm -rf $(FRAMEWORK_DIR)
 	@$(MAKE) -f java.mk clean
 
-dist: jre_emul_jars_dist libs_dist $(DIST_DIR)/j2objcc licenses
+dist: framework
+
+lib: jre_emul_jars_dist libs_dist $(DIST_DIR)/j2objcc licenses
 
 jars_dist: jre_emul_jars_dist
 

jsr305/Makefile

@@ -137,4 +137,6 @@ clean:
 	@rm -rf $(JSR305_LICENSE_DIST) $(ARCH_INCLUDE_DIR)/javax/annotation
 	@rm -rf $(FRAMEWORK_DIR)
 
-dist: $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(JSR305_LICENSE_DIST)
+dist: framework
+
+lib: $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(JSR305_LICENSE_DIST)

junit/Makefile

@@ -58,9 +58,6 @@ fat_lib_dependencies: jre_emul_dist
 java: $(JUNIT_DIST_JAR)
 	@:
 
-lib: $(FAT_LIBS)
-	@:
-
 $(BUILD_DIR)/.extracted: $(JUNIT_SRC_JAR) $(JUNIT_DATAPROVIDER_SRC_JAR) $(HAMCREST_SRC_JAR)
 	@echo extracting sources
 	@mkdir -p $(JAVA_SRC_DIR)
@@ -110,7 +107,9 @@ clean:
 	@rm -rf $(ARCH_INCLUDE_DIR)/junit $(ARCH_INCLUDE_DIR)/org/junit
 	@rm -rf $(FRAMEWORK_DIR)
 
-dist: lib $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(JUNIT_LICENSE_DIST)
+dist: framework
+
+lib: $(FAT_LIBS) $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(JUNIT_LICENSE_DIST)
 
 # This is currently broken. The hamcrest source can't compile with 1.8 and the included JRE sources
 # can't compile with < 1.8.

make/framework.mk

@@ -74,42 +74,36 @@ RESOURCE_FILES = $(FRAMEWORK_RESOURCE_FILES:%=$(FRAMEWORK_RESOURCES_DIR)/%)
 # reserved-id-macro: external headers (Apple, ICU) have header guards with leading underscores.
 # super-class-method-mismatch: overridden methods with parameters with type variables are valid.
 DISALLOWED_WARNINGS = \
-  -Wno-c++98-compat \
-  -Wno-c++98-compat-pedantic \
-  -Wno-direct-ivar-access \
-  -Wno-documentation \
-  -Wno-documentation-unknown-command \
-  -Wno-dollar-in-identifier-extension \
-  -Wno-objc-interface-ivars \
-  -Wno-old-style-cast \
-  -Wno-overriding-method-mismatch \
-  -Wno-reserved-id-macro \
-  -Wno-super-class-method-mismatch
+	-Wno-c++98-compat \
+	-Wno-c++98-compat-pedantic \
+	-Wno-direct-ivar-access \
+	-Wno-documentation \
+	-Wno-documentation-unknown-command \
+	-Wno-dollar-in-identifier-extension \
+	-Wno-objc-interface-ivars \
+	-Wno-old-style-cast \
+	-Wno-overriding-method-mismatch \
+	-Wno-reserved-id-macro \
+	-Wno-super-class-method-mismatch
 
 # Check that headers compile with most compiler flags.
 VERIFY_FLAGS := -I$(FRAMEWORK_DIR)/Headers -I$(DIST_INCLUDE_DIR) \
-  -Werror -Weverything $(DISALLOWED_WARNINGS)
+	-Werror -Weverything $(DISALLOWED_WARNINGS)
 
-# As of Xcode 12, xcframeworks need a fat libraries for most platforms
-FAT_PLATFORMS = iphone simulator macosx maccatalyst watchos watchsimulator
-SINGLE_PLATFORMS = appletvos appletvsimulator
-framework_libraries = \
-  $(foreach platform,$(FAT_PLATFORMS),$(wildcard $(BUILD_DIR)/$(platform)/lib$(1).a)) \
-  $(foreach platform,$(SINGLE_PLATFORMS),$(wildcard $(BUILD_DIR)/objs-$(platform)/lib$(1).a)) \
-
-framework: dist $(FRAMEWORK_DIR) resources
+framework: lib $(FRAMEWORK_DIR) resources
 	@:
 
 # Create an xcframework from all appletv, iphone, maccatalyst, macosx, simulator and watchos libs.
-$(FRAMEWORK_DIR): $(FRAMEWORK_HEADER) $(MODULE_MAP)
+$(FRAMEWORK_DIR): lib $(FRAMEWORK_HEADER) $(MODULE_MAP) | $(DIST_FRAMEWORK_DIR)
 	@echo building $(FRAMEWORK_NAME) framework
+	@mkdir -p $(FRAMEWORK_DIR)
 	@$(J2OBJC_ROOT)/scripts/gen_xcframework.sh $(FRAMEWORK_DIR) \
-			$(call framework_libraries,$(STATIC_LIBRARY_NAME))
+			$(BUILD_DIR)/objs-*/lib$(STATIC_LIBRARY_NAME).a
 	@mkdir -p $(FRAMEWORK_DIR)/Versions/A/Headers
 	@/bin/ln -sfh A $(FRAMEWORK_DIR)/Versions/Current
 	@/bin/ln -sfh Versions/Current/Headers $(FRAMEWORK_DIR)/Headers
 	@tar cf - -C $(STATIC_HEADERS_DIR) $(FRAMEWORK_HEADERS:$(STATIC_HEADERS_DIR)/%=%) \
-	    | tar xfp - -C $(FRAMEWORK_DIR)/Versions/A/Headers
+			| tar xfp - -C $(FRAMEWORK_DIR)/Versions/A/Headers
 	@install -m 0644 $(FRAMEWORK_HEADER) $(FRAMEWORK_DIR)/Versions/A/Headers
 	@install -m 0644 $(MODULE_MAP) $(FRAMEWORK_DIR)/Versions/A/Headers/
 	@touch $@
@@ -120,18 +114,18 @@ $(FRAMEWORK_DIR): $(FRAMEWORK_HEADER) $(MODULE_MAP)
 $(FRAMEWORK_HEADER):
 	@echo "//\n// $(FRAMEWORK_NAME).h\n//\n" > $@
 	@for f in $(FRAMEWORK_PUBLIC_HEADERS:$(STATIC_HEADERS_DIR)/%=%); do\
-	    echo '#include <'$${f}'>'; done >> $@
+			echo '#include <'$${f}'>'; done >> $@
 
 test_warnings: $(FRAMEWORK_HEADER)
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c $@
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c \
-	    -fobjc-arc -fobjc-arc-exceptions $@
+			-fobjc-arc -fobjc-arc-exceptions $@
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c -fno-objc-arc $@
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c++ $@
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c++ \
-	    -fobjc-arc -fobjc-arc-exceptions $@
+			-fobjc-arc -fobjc-arc-exceptions $@
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c++ \
-	    -fno-objc-arc $@
+			-fno-objc-arc $@
 	@rm $(FRAMEWORK_HEADER:%.h=%.o)
 
 $(MODULE_MAP):
@@ -152,3 +146,6 @@ $(FRAMEWORK_RESOURCES_DIR):
 $(FRAMEWORK_RESOURCES_DIR)/%: % | $(FRAMEWORK_RESOURCES_DIR)
 	@mkdir -p $$(dirname $@)
 	@install -m 0644 $< $@
+
+$(DIST_FRAMEWORK_DIR):
+	@mkdir -p $@

protobuf/runtime/Makefile

@@ -21,39 +21,39 @@ include $(J2OBJC_ROOT)/make/j2objc_deps.mk
 include $(J2OBJC_ROOT)/java_deps/jars.mk
 
 SRCS = \
-  com/google/protobuf/AbstractMessage.m \
-  com/google/protobuf/AbstractMessageLite.m \
-  com/google/protobuf/ByteString.m \
-  com/google/protobuf/CodedInputStream.mm \
-  com/google/protobuf/CodedOutputStream.mm \
-  com/google/protobuf/Descriptors.m \
-  com/google/protobuf/Extension.m \
-  com/google/protobuf/ExtensionLite.m \
-  com/google/protobuf/ExtensionRegistry.mm \
-  com/google/protobuf/ExtensionRegistryLite.mm \
-  com/google/protobuf/GeneratedMessage.mm \
-  com/google/protobuf/InvalidProtocolBufferException.m \
-  com/google/protobuf/MapEntry.m \
-  com/google/protobuf/MapField.m \
-  com/google/protobuf/ProtocolStringList.m \
-  com/google/protobuf/RepeatedField.m \
-  com/google/protobuf/WireFormat.mm
+	com/google/protobuf/AbstractMessage.m \
+	com/google/protobuf/AbstractMessageLite.m \
+	com/google/protobuf/ByteString.m \
+	com/google/protobuf/CodedInputStream.mm \
+	com/google/protobuf/CodedOutputStream.mm \
+	com/google/protobuf/Descriptors.m \
+	com/google/protobuf/Extension.m \
+	com/google/protobuf/ExtensionLite.m \
+	com/google/protobuf/ExtensionRegistry.mm \
+	com/google/protobuf/ExtensionRegistryLite.mm \
+	com/google/protobuf/GeneratedMessage.mm \
+	com/google/protobuf/InvalidProtocolBufferException.m \
+	com/google/protobuf/MapEntry.m \
+	com/google/protobuf/MapField.m \
+	com/google/protobuf/ProtocolStringList.m \
+	com/google/protobuf/RepeatedField.m \
+	com/google/protobuf/WireFormat.mm
 
 # This headers list defines those headers included by all client code
 # of the ProtobufRuntime framework.
 FRAMEWORK_PUBLIC_HEADERS = \
-  com/google/protobuf/AbstractMessage.h \
-  com/google/protobuf/AbstractMessageLite.h \
-  com/google/protobuf/ByteString.h \
-  com/google/protobuf/Descriptors.h \
-  com/google/protobuf/Extension.h \
-  com/google/protobuf/ExtensionLite.h \
-  com/google/protobuf/ExtensionRegistry.h \
-  com/google/protobuf/ExtensionRegistryLite.h \
-  com/google/protobuf/GeneratedMessage.h \
-  com/google/protobuf/InvalidProtocolBufferException.h \
-  com/google/protobuf/MapEntry.h \
-  com/google/protobuf/ProtocolStringList.h
+	com/google/protobuf/AbstractMessage.h \
+	com/google/protobuf/AbstractMessageLite.h \
+	com/google/protobuf/ByteString.h \
+	com/google/protobuf/Descriptors.h \
+	com/google/protobuf/Extension.h \
+	com/google/protobuf/ExtensionLite.h \
+	com/google/protobuf/ExtensionRegistry.h \
+	com/google/protobuf/ExtensionRegistryLite.h \
+	com/google/protobuf/GeneratedMessage.h \
+	com/google/protobuf/InvalidProtocolBufferException.h \
+	com/google/protobuf/MapEntry.h \
+	com/google/protobuf/ProtocolStringList.h
 
 SRC_DIR = $(CURDIR)/src
 
@@ -81,8 +81,8 @@ ALL_SOURCES_FULL = $(HEADERS) $(SOURCES_FULL)
 J2OBJCC = $(ARCH_BIN_DIR)/j2objcc
 
 C_FLAGS = $(DEBUGFLAGS) -Werror -Wobjc-missing-property-synthesis -Wshorten-64-to-32 \
-  -Wsign-compare -fobjc-abi-version=2 -fobjc-legacy-dispatch -stdlib=libc++ \
-  -Wno-nullability-completeness
+	-Wsign-compare -fobjc-abi-version=2 -fobjc-legacy-dispatch -stdlib=libc++ \
+	-Wno-nullability-completeness
 INCLUDE_DIRS = src $(GEN_OBJC_DIR)
 
 FAT_LIB_NAME = protobuf_runtime
@@ -105,36 +105,41 @@ PROTOC_PLUGIN = $(DIST_DIR)/j2objc_protoc_plugin
 $(PROTOC_PLUGIN): protobuf_compiler_dist
 	@:
 
-dist: $(DIST_JAR) $(FAT_LIBS_DIST) $(ARCH_BUILD_DIR)/.dist_headers $(PROTOBUF_LICENSE_DIST)
+dist: framework | $(BUILD_DIR)
+
+lib: $(DIST_JAR) $(FAT_LIBS_DIST) $(ARCH_BUILD_DIR)/.dist_headers $(PROTOBUF_LICENSE_DIST)
 	@:
 
 java: $(DIST_JAR)
 	@:
 
-generate: $(ALL_SOURCES_FULL)
+generate: $(ALL_SOURCES_FULL) | $(BUILD_DIR)
 
-objc_sources_manifest: $(OBJC_SOURCES_MANIFEST)
+objc_sources_manifest: $(OBJC_SOURCES_MANIFEST) | $(BUILD_DIR)
 	@:
 
-$(OBJC_SOURCES_MANIFEST):
+$(OBJC_SOURCES_MANIFEST): | $(BUILD_DIR)
 	@mkdir -p $(@D)
 	@echo "Building $$(basename $@)"
 	@if [ -e $@ ]; then rm $@; fi
 	@files='$(ALL_SOURCES_FULL)' && for i in $$files; do \
-	  echo $$i >> $@; \
+		echo $$i >> $@; \
 	done
 
 $(PROTOBUF_LICENSE_DIST): $(PROTOBUF_LICENSE)
 	@mkdir -p $(@D)
 	@install -m 0644 $< $@
 
+$(BUILD_DIR):
+	@mkdir -p $@
+
 clean:
 	@rm -rf $(BUILD_DIR) $(DIST_JAR) $(FAT_LIBS_DIST) $(DIST_HEADERS)
 	@rm -rf $(PROTOBUF_LICENSE_DIST)
 	@rm -rf $(FRAMEWORK_DIR)
 
 DESCRIPTOR_PROTO_M_CMD = $(PROTOBUF_PROTOC) --plugin=protoc-gen-j2objc=$(PROTOC_PLUGIN) \
-  --proto_path=$(PROTOBUF_INCLUDE_PATH) --j2objc_out=$(GEN_OBJC_DIR) $(DESCRIPTOR_PROTO)
+	--proto_path=$(PROTOBUF_INCLUDE_PATH) --j2objc_out=$(GEN_OBJC_DIR) $(DESCRIPTOR_PROTO)
 
 $(DESCRIPTOR_PROTO_M): $(DESCRIPTOR_PROTO) $(PROTOC_PLUGIN)
 	@mkdir -p $(@D)

testing/mockito/Makefile

@@ -493,4 +493,6 @@ clean:
 	@rm -rf $(ARCH_INCLUDE_DIR)/org/mockito
 	@rm -rf $(FRAMEWORK_DIR)
 
-dist: $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(MOCKITO_LICENSE_DIST)
+dist: framework
+
+lib: $(FAT_LIBS_DIST) $(ARCH_HEADERS) $(MOCKITO_LICENSE_DIST)

testing/truth/Makefile

@@ -159,4 +159,6 @@ $(BUILD_DIR):
 clean:
 	@rm -rf $(BUILD_DIR) $(FAT_LIBS_DIST)
 
-dist: $(FAT_LIBS_DIST) $(ARCH_HEADERS)
+dist: framework
+
+lib: $(FAT_LIBS_DIST) $(ARCH_HEADERS)

xalan/Makefile

@@ -67,7 +67,9 @@ MKTEMP_DIR = j2objc-xalan
 XALAN_LICENSE = NOTICE
 XALAN_LICENSE_DIST = $(DIST_LICENSE_DIR)/apache_xalan_license.txt
 
-dist: $(FAT_LIBS_DIST) $(DIST_JAR) $(XALAN_LICENSE_DIST)
+dist: framework
+
+lib: $(FAT_LIBS_DIST) $(DIST_JAR) $(XALAN_LICENSE_DIST)
 	@tar cf - -C $(GEN_OBJC_DIR) $(TRANSLATE_HEADERS:$(GEN_OBJC_DIR)/%=%) \
 	    | tar xfp - -C $(ARCH_INCLUDE_DIR)