@@ -66,7 +66,7 @@ all: build
6666# This also rebuilds LinuxMain.swift to include all of the test cases
6767# (The awk script is very fast, so re-running it on every build is reasonable.)
6868build :
69- ${AWK} -f CollectTests.awk Tests/ProtobufTests /Test_* .swift > Tests/LinuxMain.swift
69+ ${AWK} -f CollectTests.awk Tests/SwiftProtobufTests /Test_* .swift > Tests/LinuxMain.swift
7070 ${SWIFT} build
7171
7272check test : build
@@ -91,8 +91,8 @@ regenerate: regenerate-library-protos regenerate-test-protos
9191regenerate-library-protos :
9292 for t in ${GOOGLE_LIBRARY_PROTOS} ; do \
9393 echo google/protobuf/$$ t.proto; \
94- ${PROTOC} --swift_out=Sources/Protobuf -I Protos Protos/google/protobuf/$$ t.proto; \
95- sed -i~ -e ' s/^import Protobuf$$//' Sources/Protobuf /$$ t.pb.swift; \
94+ ${PROTOC} --swift_out=Sources/SwiftProtobuf -I Protos Protos/google/protobuf/$$ t.proto; \
95+ sed -i~ -e ' s/^import SwiftProtobuf$$// ' -e ' s/^import Protobuf$$//' Sources/SwiftProtobuf /$$ t.pb.swift; \
9696 done
9797
9898# Rebuild just the protos used by the test suite
@@ -102,14 +102,14 @@ regenerate-test-protos: regenerate-test-protos-google regenerate-test-protos-loc
102102regenerate-test-protos-google :
103103 for t in ${GOOGLE_TEST_PROTOS} ; do \
104104 echo google/protobuf/$$ t.proto; \
105- ${PROTOC} --swift_out=Tests/ProtobufTests -I Protos Protos/google/protobuf/$$ t.proto; \
105+ ${PROTOC} --swift_out=Tests/SwiftProtobufTests -I Protos Protos/google/protobuf/$$ t.proto; \
106106 done ; \
107107 echo conformance/conformance.proto; \
108- ${PROTOC} --swift_out=Tests/ProtobufTests -I Protos/conformance -I Protos Protos/conformance/conformance.proto; \
108+ ${PROTOC} --swift_out=Tests/SwiftProtobufTests -I Protos/conformance -I Protos Protos/conformance/conformance.proto; \
109109
110110# Rebuild just the protos used by the test suite that come from local sources
111111regenerate-test-protos-local :
112112 for t in Protos/* .proto; do \
113113 echo $$ t; \
114- ${PROTOC} --swift_out=Tests/ProtobufTests -IProtos $$ t; \
114+ ${PROTOC} --swift_out=Tests/SwiftProtobufTests -IProtos $$ t; \
115115 done
0 commit comments