Renaming Makefile dirs to be Bigtable specific.

dhermes · dhermes · commit 323eff891f97 · 2016-03-28T14:02:15.000-07:00
This is in advance of putting them side-by-side with datastore.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 GENERATED_DIR=$(shell pwd)/generated_python
-FINAL_DIR=$(shell pwd)/gcloud/bigtable/_generated
+BT_DIR=$(shell pwd)/gcloud/bigtable/_generated
 GRPC_PLUGIN=grpc_python_plugin
 PROTOC_CMD=protoc
-PROTOS_DIR=$(shell pwd)/cloud-bigtable-client/bigtable-protos/src/main/proto
+BT_PROTOS_DIR=$(shell pwd)/cloud-bigtable-client/bigtable-protos/src/main/proto
 
 help:
 	@echo 'Makefile for gcloud-python Bigtable protos                      '
@@ -17,37 +17,37 @@ generate:
 	mkdir -p $(GENERATED_DIR)
 	# Generate all *_pb2.py files that require gRPC.
 	$(PROTOC_CMD) \
-	    --proto_path=$(PROTOS_DIR) \
+	    --proto_path=$(BT_PROTOS_DIR) \
 	    --python_out=$(GENERATED_DIR) \
 	    --plugin=protoc-gen-grpc=$(GRPC_PLUGIN) \
 	    --grpc_out=$(GENERATED_DIR) \
-	    $(PROTOS_DIR)/google/bigtable/v1/bigtable_service.proto \
-	    $(PROTOS_DIR)/google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto \
-	    $(PROTOS_DIR)/google/bigtable/admin/table/v1/bigtable_table_service.proto
+	    $(BT_PROTOS_DIR)/google/bigtable/v1/bigtable_service.proto \
+	    $(BT_PROTOS_DIR)/google/bigtable/admin/cluster/v1/bigtable_cluster_service.proto \
+	    $(BT_PROTOS_DIR)/google/bigtable/admin/table/v1/bigtable_table_service.proto
 	# Generate all *_pb2.py files that do not require gRPC.
 	$(PROTOC_CMD) \
-	    --proto_path=$(PROTOS_DIR) \
+	    --proto_path=$(BT_PROTOS_DIR) \
 	    --python_out=$(GENERATED_DIR) \
-	    $(PROTOS_DIR)/google/bigtable/v1/bigtable_data.proto \
-	    $(PROTOS_DIR)/google/bigtable/v1/bigtable_service_messages.proto \
-	    $(PROTOS_DIR)/google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto \
-	    $(PROTOS_DIR)/google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto \
-	    $(PROTOS_DIR)/google/bigtable/admin/table/v1/bigtable_table_data.proto \
-	    $(PROTOS_DIR)/google/bigtable/admin/table/v1/bigtable_table_service_messages.proto
+	    $(BT_PROTOS_DIR)/google/bigtable/v1/bigtable_data.proto \
+	    $(BT_PROTOS_DIR)/google/bigtable/v1/bigtable_service_messages.proto \
+	    $(BT_PROTOS_DIR)/google/bigtable/admin/cluster/v1/bigtable_cluster_data.proto \
+	    $(BT_PROTOS_DIR)/google/bigtable/admin/cluster/v1/bigtable_cluster_service_messages.proto \
+	    $(BT_PROTOS_DIR)/google/bigtable/admin/table/v1/bigtable_table_data.proto \
+	    $(BT_PROTOS_DIR)/google/bigtable/admin/table/v1/bigtable_table_service_messages.proto
 	# Move the newly generated *_pb2.py files into our library.
-	mv $(GENERATED_DIR)/google/bigtable/v1/* $(FINAL_DIR)
-	mv $(GENERATED_DIR)/google/bigtable/admin/cluster/v1/* $(FINAL_DIR)
-	mv $(GENERATED_DIR)/google/bigtable/admin/table/v1/* $(FINAL_DIR)
+	mv $(GENERATED_DIR)/google/bigtable/v1/* $(BT_DIR)
+	mv $(GENERATED_DIR)/google/bigtable/admin/cluster/v1/* $(BT_DIR)
+	mv $(GENERATED_DIR)/google/bigtable/admin/table/v1/* $(BT_DIR)
 	# Remove all existing *.proto files before we replace
-	rm -f $(FINAL_DIR)/*.proto
+	rm -f $(BT_DIR)/*.proto
 	# Copy over the *.proto files into our library.
-	cp $(PROTOS_DIR)/google/bigtable/v1/*.proto $(FINAL_DIR)
-	cp $(PROTOS_DIR)/google/bigtable/admin/cluster/v1/*.proto $(FINAL_DIR)
-	cp $(PROTOS_DIR)/google/bigtable/admin/table/v1/*.proto $(FINAL_DIR)
-	cp $(PROTOS_DIR)/google/longrunning/operations.proto $(FINAL_DIR)
+	cp $(BT_PROTOS_DIR)/google/bigtable/v1/*.proto $(BT_DIR)
+	cp $(BT_PROTOS_DIR)/google/bigtable/admin/cluster/v1/*.proto $(BT_DIR)
+	cp $(BT_PROTOS_DIR)/google/bigtable/admin/table/v1/*.proto $(BT_DIR)
+	cp $(BT_PROTOS_DIR)/google/longrunning/operations.proto $(BT_DIR)
 	# Rename all *.proto files in our library with an
 	# underscore and remove executable bit.
-	cd $(FINAL_DIR) && \
+	cd $(BT_DIR) && \
 	    for filename in *.proto; do \
 	        chmod -x $$filename ; \
 	        mv $$filename _$$filename ; \
