Makefile - Issue 128003003: Fix issue with importing packages where the package name included a dot

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Makefile

Issue 128003003: Fix issue with importing packages where the package name included a dot (Closed) Base URL: https://github.com/dart-lang/dart-protoc-plugin.git@master

Patch Set: Update pubspec version Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 PLUGIN_SRC = \	1 PLUGIN_SRC = \

2 prepend.dart \	2 prepend.dart \

3 bin/protoc_plugin.dart \	3 bin/protoc_plugin.dart \

4 lib/code_generator.dart \	4 lib/code_generator.dart \

5 lib/enum_generator.dart \	5 lib/enum_generator.dart \

6 lib/exceptions.dart \	6 lib/exceptions.dart \

7 lib/extension_generator.dart \	7 lib/extension_generator.dart \

8 lib/file_generator.dart \	8 lib/file_generator.dart \

9 lib/indenting_writer.dart \	9 lib/indenting_writer.dart \

10 lib/message_generator.dart \	10 lib/message_generator.dart \

11 lib/protobuf_field.dart \	11 lib/protobuf_field.dart \

12 lib/protoc.dart \	12 lib/protoc.dart \

13 lib/src/descriptor.pb.dart \	13 lib/src/descriptor.pb.dart \

14 lib/src/plugin.pb.dart \	14 lib/src/plugin.pb.dart \

15 lib/writer.dart	15 lib/writer.dart

16	16

17 OUTPUT_DIR=out	17 OUTPUT_DIR=out

18 PLUGIN_NAME=protoc-gen-dart	18 PLUGIN_NAME=protoc-gen-dart

19 PLUGIN_PATH=$(OUTPUT_DIR)/$(PLUGIN_NAME)	19 PLUGIN_PATH=$(OUTPUT_DIR)/$(PLUGIN_NAME)

20	20

21 TEST_PROTO_LIST = \	21 TEST_PROTO_LIST = \

22 google/protobuf/unittest_import \	22 google/protobuf/unittest_import \

23 google/protobuf/unittest_optimi ze_for \	23 google/protobuf/unittest_optimi ze_for \

24 google/protobuf/unittest \	24 google/protobuf/unittest \

25 multiple_files_test \	25 multiple_files_test \

26 nested_extension \	26 nested_extension \

27 non_nested_extension \	27 non_nested_extension \

28 » » » » » » reserved_names	28 » » » » » » reserved_names \

	29 » » » » » » duplicate_names_import \

	30 » » » » » » package1 \

	31 » » » » » » package2 \

	32 » » » » » » package3

29 TEST_PROTO_DIR=$(OUTPUT_DIR)/protos	33 TEST_PROTO_DIR=$(OUTPUT_DIR)/protos

30 TEST_PROTO_LIBS=$(foreach proto, $(TEST_PROTO_LIST), $(TEST_PROTO_DIR)/$(proto). pb.dart)	34 TEST_PROTO_LIBS=$(foreach proto, $(TEST_PROTO_LIST), $(TEST_PROTO_DIR)/$(proto). pb.dart)

31 TEST_PROTO_SRC_DIR=test/protos	35 TEST_PROTO_SRC_DIR=test/protos

32 TEST_PROTO_SRCS=$(foreach proto, $(TEST_PROTO_LIST), $(TEST_PROTO_SRC_DIR)/$(pro to).proto)	36 TEST_PROTO_SRCS=$(foreach proto, $(TEST_PROTO_LIST), $(TEST_PROTO_SRC_DIR)/$(pro to).proto)

33	37

34 PREGENERATED_SRCS=lib/descriptor.proto lib/plugin.proto	38 PREGENERATED_SRCS=lib/descriptor.proto lib/plugin.proto

35	39

36	40

37 $(PLUGIN_PATH): $(PLUGIN_SRC)	41 $(PLUGIN_PATH): $(PLUGIN_SRC)

38 [ -d $(OUTPUT_DIR) ] \|\| mkdir $(OUTPUT_DIR)	42 [ -d $(OUTPUT_DIR) ] \|\| mkdir $(OUTPUT_DIR)

(...skipping 17 matching lines...) Expand all Loading...
56 update-pregenerated: $(PLUGIN_PATH) $(PREGENERATED_SRCS)	60 update-pregenerated: $(PLUGIN_PATH) $(PREGENERATED_SRCS)

57 protoc --dart_out=lib/src -Ilib --plugin=protoc-gen-dart=$(realpath $(PL UGIN_PATH)) $(PREGENERATED_SRCS)	61 protoc --dart_out=lib/src -Ilib --plugin=protoc-gen-dart=$(realpath $(PL UGIN_PATH)) $(PREGENERATED_SRCS)

58	62

59 build-test-protos: $(TEST_PROTO_LIBS)	63 build-test-protos: $(TEST_PROTO_LIBS)

60	64

61 run-tests: build-test-protos	65 run-tests: build-test-protos

62 dart --checked --package-root=packages/ test/all_tests.dart	66 dart --checked --package-root=packages/ test/all_tests.dart

63	67

64 clean:	68 clean:

65 rm -rf $(OUTPUT_DIR)	69 rm -rf $(OUTPUT_DIR)

OLD	NEW

« no previous file with comments | « no previous file | lib/code_generator.dart » ('j') | no next file with comments »