Skip to content

Fix a few Makefile references to be self consistent. #1892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomasvl merged 1 commit into from
Nov 3, 2025
Merged

Fix a few Makefile references to be self consistent. #1892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ install: build
${INSTALL} ${PROTOC_GEN_SWIFT} ${BINDIR}

clean:
swift package clean
${SWIFT} package clean
rm -rf .build _test ${PROTOC_GEN_SWIFT} *DescriptorTestData.bin \
Performance/_generated Performance/_results Protos/mined_words.txt \
docs build
Expand Down Expand Up @@ -476,7 +476,7 @@ Protos/Tests/SwiftProtobufTests/generated_swift_names_fields.proto: Protos/mined
@echo 'syntax = "proto3";' >> $@
@echo 'package swift_proto_testing.generated;' >> $@
@echo 'message GeneratedSwiftReservedFields {' >> $@
@cat Protos/mined_words.txt | awk 'BEGIN{n = 1} {print " int32 " $$1 " = " n ";"; n += 1 }' >> $@
@cat Protos/mined_words.txt | ${AWK} 'BEGIN{n = 1} {print " int32 " $$1 " = " n ";"; n += 1 }' >> $@
@echo '}' >> $@

Protos/Tests/SwiftProtobufTests/generated_swift_names_enum_cases.proto: Protos/mined_words.txt
Expand All @@ -489,7 +489,7 @@ Protos/Tests/SwiftProtobufTests/generated_swift_names_enum_cases.proto: Protos/m
@echo 'package swift_proto_testing.generated;' >> $@
@echo 'enum GeneratedSwiftReservedEnum {' >> $@
@echo ' NONE = 0;' >> $@
@cat Protos/mined_words.txt | awk 'BEGIN{n = 1} {print " " $$1 " = " n ";"; n += 1 }' >> $@
@cat Protos/mined_words.txt | ${AWK} 'BEGIN{n = 1} {print " " $$1 " = " n ";"; n += 1 }' >> $@
@echo '}' >> $@

Protos/Tests/SwiftProtobufTests/generated_swift_names_messages.proto: Protos/mined_words.txt
Expand All @@ -501,7 +501,7 @@ Protos/Tests/SwiftProtobufTests/generated_swift_names_messages.proto: Protos/min
@echo 'syntax = "proto3";' >> $@
@echo 'package swift_proto_testing.generated;' >> $@
@echo 'message GeneratedSwiftReservedMessages {' >> $@
@cat Protos/mined_words.txt | awk '{print " message " $$1 " { int32 " $$1 " = 1; }"}' >> $@
@cat Protos/mined_words.txt | ${AWK} '{print " message " $$1 " { int32 " $$1 " = 1; }"}' >> $@
@echo '}' >> $@

Protos/Tests/SwiftProtobufTests/generated_swift_names_enums.proto: Protos/mined_words.txt
Expand All @@ -513,7 +513,7 @@ Protos/Tests/SwiftProtobufTests/generated_swift_names_enums.proto: Protos/mined_
@echo 'syntax = "proto3";' >> $@
@echo 'package swift_proto_testing.generated;' >> $@
@echo 'message GeneratedSwiftReservedEnums {' >> $@
@cat Protos/mined_words.txt | awk '{print " enum " $$1 " { NONE_" $$1 " = 0; }"}' >> $@
@cat Protos/mined_words.txt | ${AWK} '{print " enum " $$1 " { NONE_" $$1 " = 0; }"}' >> $@
@echo '}' >> $@

# Rebuild just the protos used by the conformance test runner.
Expand Down