Skip to content

Generate separate HTML page per proto under networking #811

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
rshriram merged 14 commits into from
Feb 22, 2019
Merged

Generate separate HTML page per proto under networking #811

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5424864
Generate separate pages for each networking proto
Feb 22, 2019
dce652d
update
Feb 22, 2019
38010d8
tweaks
Feb 22, 2019
d00bc8b
Fix interdoc references
frankbu Feb 22, 2019
96dddba
separate doc and go gen
frankbu Feb 22, 2019
7fbced6
change dash to underscore
frankbu Feb 22, 2019
f94a737
fix
Feb 22, 2019
7c25acd
Merge branch 'separate_html' of ssh://github.com/rshriram/api into se…
Feb 22, 2019
df92345
Merge branch 'release-1.1' of https://github.com/istio/api into separ…
Feb 22, 2019
3e9020b
more fixes
Feb 22, 2019
8a4c114
makefile fix
Feb 22, 2019
35ae03d
remove bad target
Feb 22, 2019
91f7872
Revert "change dash to underscore"
Feb 22, 2019
5b71237
final update
Feb 22, 2019
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
19 changes: 14 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ generate: \
generate-mixer-go \
generate-mixer-python \
generate-routing-go \
generate-routing-doc \
generate-routing-python \
generate-rbac-go \
generate-rbac-python \
Expand Down Expand Up @@ -239,14 +240,22 @@ routing_v1alpha3_path := networking/v1alpha3
routing_v1alpha3_protos := $(shell find networking/v1alpha3 -type f -name '*.proto' | sort)
routing_v1alpha3_pb_gos := $(routing_v1alpha3_protos:.proto=.pb.go)
routing_v1alpha3_pb_pythons := $(routing_v1alpha3_protos:.proto=_pb2.py)
routing_v1alpha3_pb_doc := $(routing_v1alpha3_path)/istio.routing.v1alpha3.pb.html
routing_v1alpha3_pb_docs := $(routing_v1alpha3_protos:.proto=.pb.html)
routing_v1alpha3_pb_docs_options := ",per_file=true"

generate-routing-go: $(routing_v1alpha3_pb_gos) $(routing_v1alpha3_pb_doc)
generate-routing-go: $(routing_v1alpha3_pb_gos)

$(routing_v1alpha3_pb_gos) $(routing_v1alpha3_pb_doc): $(routing_v1alpha3_protos)
$(routing_v1alpha3_pb_gos): $(routing_v1alpha3_protos)
## Generate networking/v1alpha3/*.pb.go
@$(docker_lock) status
@$(docker_gen) $(gogofast_plugin) $(protoc_gen_docs_plugin)$(routing_v1alpha3_path) $^
@$(docker_gen) $(gogofast_plugin) $^

generate-routing-doc: $(routing_v1alpha3_pb_docs)

$(routing_v1alpha3_pb_docs): $(routing_v1alpha3_protos)
## Generate networking/v1alpha3/*.pb.html
@$(docker_lock) status
@$(docker_gen) $(protoc_gen_docs_plugin)$(routing_v1alpha3_path)$(routing_v1alpha3_pb_docs_options) $^

generate-routing-python: $(routing_v1alpha3_pb_pythons)

Expand All @@ -257,7 +266,7 @@ $(routing_v1alpha3_pb_pythons): $(routing_v1alpha3_protos)

clean-routing:
rm -f $(routing_v1alpha3_pb_gos)
rm -f $(routing_v1alpha3_pb_doc)
rm -f $(routing_v1alpha3_pb_docs)

#####################
# rbac/...
Expand Down
4 changes: 2 additions & 2 deletions mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

141 changes: 71 additions & 70 deletions networking/v1alpha3/destination_rule.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading