mirror of
https://github.com/apple/container.git
synced 2026-08-24 10:05:43 -05:00
Kathryn BaldaufandGitHub
f4757afa43
- The protobuf makefile relies on being able to find the built protoc dependencies under the build directory. Since we were not passing the build configuration to the swift command to build those dependencies, the built binaries were going into the debug build folder. If make protos was run when `BUILD_CONFIGURATION=release`, then we'd fail to find the dependencies since the build folder should now be the release build folder. This PR fixes that. Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
65 lines
2.5 KiB
Makefile
65 lines
2.5 KiB
Makefile
# Copyright © 2025-2026 Apple Inc. and the container project authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# https://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
ROOT_DIR := $(shell git rev-parse --show-toplevel)
|
|
LOCAL_DIR := $(ROOT_DIR)/.local
|
|
LOCAL_BIN_DIR := $(LOCAL_DIR)/bin
|
|
|
|
BUILDER_SHIM_REPO ?= https://github.com/apple/container-builder-shim.git
|
|
|
|
# Versions
|
|
BUILDER_SHIM_VERSION ?= $(shell sed -n 's/let builderShimVersion *= *"\(.*\)"/\1/p' Package.swift)
|
|
PROTOC_VERSION := 26.1
|
|
|
|
# Protoc binary installation
|
|
PROTOC_ZIP := protoc-$(PROTOC_VERSION)-osx-universal_binary.zip
|
|
PROTOC := $(LOCAL_BIN_DIR)/protoc@$(PROTOC_VERSION)/protoc
|
|
$(PROTOC):
|
|
@echo Downloading protocol buffers...
|
|
@mkdir -p $(LOCAL_DIR)
|
|
@curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/$(PROTOC_ZIP)
|
|
@mkdir -p $(dir $@)
|
|
@unzip -jo $(PROTOC_ZIP) bin/protoc -d $(dir $@)
|
|
@unzip -o $(PROTOC_ZIP) 'include/*' -d $(dir $@)
|
|
@rm -f $(PROTOC_ZIP)
|
|
|
|
.PHONY: protoc-gen-swift
|
|
protoc-gen-swift:
|
|
@$(SWIFT) build -c $(BUILD_CONFIGURATION) --product protoc-gen-swift
|
|
@$(SWIFT) build -c $(BUILD_CONFIGURATION) --product protoc-gen-grpc-swift-2
|
|
|
|
.PHONY: protos
|
|
protos: $(PROTOC) protoc-gen-swift
|
|
@echo Generating protocol buffers source code...
|
|
@mkdir -p $(LOCAL_DIR)
|
|
@if [ ! -d "$(LOCAL_DIR)/container-builder-shim" ]; then \
|
|
cd $(LOCAL_DIR) && git clone --branch $(BUILDER_SHIM_VERSION) --depth 1 $(BUILDER_SHIM_REPO); \
|
|
fi
|
|
@$(PROTOC) $(LOCAL_DIR)/container-builder-shim/pkg/api/Builder.proto \
|
|
--plugin=protoc-gen-grpc-swift=$(BUILD_BIN_DIR)/protoc-gen-grpc-swift-2 \
|
|
--plugin=protoc-gen-swift=$(BUILD_BIN_DIR)/protoc-gen-swift \
|
|
--proto_path=$(LOCAL_DIR)/container-builder-shim/pkg/api \
|
|
--grpc-swift_out="Sources/ContainerBuild" \
|
|
--grpc-swift_opt=Visibility=Public \
|
|
--swift_out="Sources/ContainerBuild" \
|
|
--swift_opt=Visibility=Public \
|
|
-I.
|
|
@"$(MAKE)" update-licenses
|
|
|
|
.PHONY: clean-proto-tools
|
|
clean-proto-tools:
|
|
@echo Cleaning proto tools...
|
|
@rm -rf $(LOCAL_DIR)/bin/protoc*
|
|
@rm -rf $(LOCAL_DIR)/container-builder-shim
|