From cbfe56d39a59c6d1513013c532ba1578875ae53f Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Apr 2020 11:47:49 +0800 Subject: [PATCH 1/7] Fix documentation building --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 51fcab76da6..8ab6f3df8cf 100644 --- a/Makefile +++ b/Makefile @@ -149,6 +149,6 @@ clean-html: build-html: clean-html mkdir -p $(ROOT_DIR)/dist/python mkdir -p $(ROOT_DIR)/dist/grpc - cd $(ROOT_DIR)/protos && $(MAKE) gen-docs + $(MAKE) compile-protos-docs cd $(ROOT_DIR)/sdk/python/docs && $(MAKE) html cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python From 43a73a4f7c9fbba73fcf6908f47190b5a72d5548 Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Apr 2020 12:06:44 +0800 Subject: [PATCH 2/7] Add comments to documentation building --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 8ab6f3df8cf..344beb5b28e 100644 --- a/Makefile +++ b/Makefile @@ -149,6 +149,10 @@ clean-html: build-html: clean-html mkdir -p $(ROOT_DIR)/dist/python mkdir -p $(ROOT_DIR)/dist/grpc + + # Build Protobuf documentation $(MAKE) compile-protos-docs + + # Build Python SDK documentation cd $(ROOT_DIR)/sdk/python/docs && $(MAKE) html cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python From e0e4b53417aab1143a8b3be2d52b5e54fd5ccca6 Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Apr 2020 12:13:03 +0800 Subject: [PATCH 3/7] Test protoc build --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 344beb5b28e..58202ed4659 100644 --- a/Makefile +++ b/Makefile @@ -151,6 +151,7 @@ build-html: clean-html mkdir -p $(ROOT_DIR)/dist/grpc # Build Protobuf documentation + $(MAKE) install-dependencies-proto-docs $(MAKE) compile-protos-docs # Build Python SDK documentation From aed22ec4b036a99f17e4048f5b0559defa2c41d7 Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Apr 2020 12:22:05 +0800 Subject: [PATCH 4/7] Add protoc building --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 58202ed4659..e0f25040c90 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,8 @@ install-dependencies-proto-docs: mv protoc3/include/* $$HOME/include compile-protos-docs: - cd ${ROOT_DIR}/protos; protoc --docs_out=../dist/grpc feast/*/*.proto + cd ${ROOT_DIR}/protos; protoc --docs_out=../dist/grpc feast/*/*.proto || \ + $(MAKE) install-dependencies-proto-docs && PATH=$$HOME/bin:$$PATH protoc -I $$HOME/include/ -I . --docs_out=../dist/grpc feast/*/*.proto clean-html: rm -rf $(ROOT_DIR)/dist @@ -151,9 +152,8 @@ build-html: clean-html mkdir -p $(ROOT_DIR)/dist/grpc # Build Protobuf documentation - $(MAKE) install-dependencies-proto-docs $(MAKE) compile-protos-docs # Build Python SDK documentation cd $(ROOT_DIR)/sdk/python/docs && $(MAKE) html - cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python + cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python \ No newline at end of file From bc6ace00fc0876acf4b535255707c3200b46d9df Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Apr 2020 12:26:11 +0800 Subject: [PATCH 5/7] Add path to protoc building --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0f25040c90..222c273214c 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ install-dependencies-proto-docs: compile-protos-docs: cd ${ROOT_DIR}/protos; protoc --docs_out=../dist/grpc feast/*/*.proto || \ - $(MAKE) install-dependencies-proto-docs && PATH=$$HOME/bin:$$PATH protoc -I $$HOME/include/ -I . --docs_out=../dist/grpc feast/*/*.proto + $(MAKE) install-dependencies-proto-docs && cd ${ROOT_DIR}/protos; PATH=$$HOME/bin:$$PATH protoc -I $$HOME/include/ -I . --docs_out=../dist/grpc feast/*/*.proto clean-html: rm -rf $(ROOT_DIR)/dist From ba5f2f6f3d6e723fd067fcbfdb91e84047eb9a09 Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Apr 2020 12:33:22 +0800 Subject: [PATCH 6/7] Add path to protoc building --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 222c273214c..7559fa4e2d6 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ install-dependencies-proto-docs: compile-protos-docs: cd ${ROOT_DIR}/protos; protoc --docs_out=../dist/grpc feast/*/*.proto || \ - $(MAKE) install-dependencies-proto-docs && cd ${ROOT_DIR}/protos; PATH=$$HOME/bin:$$PATH protoc -I $$HOME/include/ -I . --docs_out=../dist/grpc feast/*/*.proto + cd ${ROOT_DIR}; $(MAKE) install-dependencies-proto-docs && cd ${ROOT_DIR}/protos; PATH=$$HOME/bin:$$PATH protoc -I $$HOME/include/ -I . --docs_out=../dist/grpc feast/*/*.proto clean-html: rm -rf $(ROOT_DIR)/dist From 2b489b49830eef6f4a0459a70a6ae4b8d00d7080 Mon Sep 17 00:00:00 2001 From: Willem Pienaar Date: Sat, 4 Apr 2020 12:46:56 +0800 Subject: [PATCH 7/7] Build Python Protos --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 7559fa4e2d6..e780864ddca 100644 --- a/Makefile +++ b/Makefile @@ -155,5 +155,6 @@ build-html: clean-html $(MAKE) compile-protos-docs # Build Python SDK documentation + $(MAKE) compile-protos-python cd $(ROOT_DIR)/sdk/python/docs && $(MAKE) html cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python \ No newline at end of file