Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Remove descriptorset steps
  • Loading branch information
Steve Ayers committed May 4, 2023
commit 2f6c9e4d246e65f567c3cf9ed6706f02acceb1f6
1 change: 1 addition & 0 deletions packages/plugin-framework/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/build/**/*.js
/build/**/*.ts.map
/build/**/*.js.map
*.codegenreq
14 changes: 1 addition & 13 deletions packages/plugin-framework/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ build:
clean:
@find build \( -name '*.js' -or -name '*.map' -or -name '*.ts' \) -delete;
@find build -type d ! -path build -delete
@rm -f all.descriptorset
@rm -f all.codegenreq
@echo "'${@}' done"

test: all.descriptorset
test:
@echo "'${@}' ..."
@./node_modules/.bin/ts-node \
--project tsconfig.test.json \
Expand All @@ -39,17 +38,6 @@ bootstrap:
google/protobuf/descriptor.proto \
google/protobuf/compiler/plugin.proto

all.descriptorset: $(PROTOS)
@protoc \
--descriptor_set_out=${@} \
--proto_path=${PROTO_PATH} \
--proto_path ../plugin/ \
--include_source_info \
--include_imports \
--experimental_allow_proto3_optional \
$^
@echo "'${@}' done"

all.codegenreq: $(PROTOS)
@protoc \
--dump_out=. \
Expand Down
3 changes: 3 additions & 0 deletions packages/plugin/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
/build/**/*.js
/build/**/*.ts.map
/build/**/*.js.map
*.descriptorset
*.codegenreq

2 changes: 0 additions & 2 deletions packages/proto/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
*.codegenreq
*.descriptorset
/node_modules
12 changes: 0 additions & 12 deletions packages/test-generated/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,3 @@ generate-speed-bigint: $(PROTOS)
--experimental_allow_proto3_optional \
$^
@echo "'${@}' done"


all.descriptorset: $(PROTOS)
@npx protoc \
--descriptor_set_out ${@} \
--proto_path $(PROTO_PATH) \
--proto_path ../plugin/ \
--include_source_info \
--include_imports \
--experimental_allow_proto3_optional \
$^
@echo "'${@}' done"