Merge pull request #2452 from dhermes/update-autogen-makefiles

Updating Bigtable and Datastore autogenerate makefiles.
googleapis · Sep 27, 2016 · fdbd094 · fdbd094
2 parents 4395b35 + b3a5557
commit fdbd094
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/Makefile.bigtable_v2 b/Makefile.bigtable_v2
@@ -1,15 +1,15 @@
 GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
 GENERATED_DIR=$(shell pwd)/generated_python
 GENERATED_SUBDIR=_generated
-BIGTABLE_DIR=$(shell pwd)/google/cloud/bigtable/$(GENERATED_SUBDIR)
+BIGTABLE_DIR=$(shell pwd)/bigtable/google/cloud/bigtable/$(GENERATED_SUBDIR)
 PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
 GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb
 
 help:
-	@echo 'Makefile for google-cloud-python Bigtable protos                      '
-	@echo '                                                                '
-	@echo '   make generate                 Generates the protobuf modules '
-	@echo '   make clean                    Clean generated files          '
+	@echo 'Makefile for google-cloud-python Bigtable protos      '
+	@echo '                                                      '
+	@echo '   make generate        Generates the protobuf modules'
+	@echo '   make clean           Clean generated files         '
 
 generate:
 	# Ensure we have a virtualenv w/ up-to-date grpcio/grpcio-tools

diff --git a/Makefile.datastore b/Makefile.datastore
@@ -1,14 +1,14 @@
 GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
 GENERATED_DIR=$(shell pwd)/generated_python
-DATASTORE_DIR=$(shell pwd)/google/cloud/datastore/_generated
+DATASTORE_DIR=$(shell pwd)/datastore/google/cloud/datastore/_generated
 PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
 GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb
 
 help:
-	@echo 'Makefile for google-cloud-python Bigtable protos                      '
-	@echo '                                                                '
-	@echo '   make generate                 Generates the protobuf modules '
-	@echo '   make clean                    Clean generated files          '
+	@echo 'Makefile for google-cloud-python Datastore protos     '
+	@echo '                                                      '
+	@echo '   make generate        Generates the protobuf modules'
+	@echo '   make clean           Clean generated files         '
 
 generate:
 	# Ensure we have a virtualenv w/ up-to-date grpcio/grpcio-tools

diff --git a/bigtable/google/cloud/bigtable/_generated/bigtable_instance_admin_pb2.py b/bigtable/google/cloud/bigtable/_generated/bigtable_instance_admin_pb2.py
diff --git a/bigtable/google/cloud/bigtable/_generated/bigtable_pb2.py b/bigtable/google/cloud/bigtable/_generated/bigtable_pb2.py
diff --git a/bigtable/google/cloud/bigtable/_generated/bigtable_table_admin_pb2.py b/bigtable/google/cloud/bigtable/_generated/bigtable_table_admin_pb2.py
diff --git a/scripts/make_datastore_grpc.py b/scripts/make_datastore_grpc.py
@@ -26,7 +26,8 @@
 PROTOS_DIR = os.path.join(ROOT_DIR, 'googleapis-pb')
 PROTO_PATH = os.path.join(PROTOS_DIR, 'google', 'datastore',
                           'v1', 'datastore.proto')
-GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'google', 'cloud', 'datastore',
+GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'datastore',
+                              'google', 'cloud', 'datastore',
                               '_generated', 'datastore_grpc_pb2.py')
 GRPCIO_VIRTUALENV = os.getenv('GRPCIO_VIRTUALENV')
 if GRPCIO_VIRTUALENV is None: