Merge branch 'master' into constructor_args

google · Jul 3, 2023 · 35401e8 · 35401e8
2 parents b45da9c + 7bebbc6
commit 35401e8
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/protoc_plugin/Makefile b/protoc_plugin/Makefile
@@ -1,9 +1,6 @@
 PLUGIN_SRC = \
-	prepend.dart \
 	bin/protoc_plugin.dart \
-	lib/*.dart \
-	lib/src/descriptor.pb.dart \
-	lib/src/plugin.pb.dart
+	lib/**/*.dart
 
 OUTPUT_DIR=out
 PLUGIN_NAME=protoc-gen-dart
@@ -79,8 +76,8 @@ TEST_PROTO_SRCS=$(foreach proto, $(TEST_PROTO_LIST), \
 
 PREGENERATED_SRCS=protos/descriptor.proto protos/plugin.proto protos/dart_options.proto
 
-$(TEST_PROTO_LIBS): $(PLUGIN_PATH) $(TEST_PROTO_SRCS)
-	[ -d $(TEST_PROTO_DIR) ] || mkdir -p $(TEST_PROTO_DIR)
+$(TEST_PROTO_LIBS): $(PLUGIN_SRC) $(TEST_PROTO_SRCS)
+	mkdir -p $(TEST_PROTO_DIR)
 	protoc\
 		--experimental_allow_proto3_optional\
 		--dart_out=$(TEST_PROTO_DIR)\
@@ -90,8 +87,6 @@ $(TEST_PROTO_LIBS): $(PLUGIN_PATH) $(TEST_PROTO_SRCS)
 		$(TEST_PROTO_SRCS)
 	dart format $(TEST_PROTO_DIR)
 
-build-plugin: $(PLUGIN_PATH)
-
 update-pregenerated: $(PLUGIN_PATH) $(PREGENERATED_SRCS)
 	protoc --dart_out=lib/src/generated -Iprotos --plugin=protoc-gen-dart=$(realpath $(PLUGIN_PATH)) $(PREGENERATED_SRCS)
 	rm lib/src/generated/descriptor.pb{json,server}.dart
@@ -109,5 +104,4 @@ update-goldens: protos
 	dart run test
 
 clean:
-	rm -rf benchmark/lib/generated
 	rm -rf $(OUTPUT_DIR)