Commit 8e142680 authored by Feng Xiao's avatar Feng Xiao

Replace the check of "../.git"

Checking the existence of ".git" is not the right way to check whether we
are in develop environment because we distribute source tar-balls where
such a ".git" directory does not exist. Replaced it with checking .proto
files.
parent 0ac523bf
...@@ -58,11 +58,14 @@ def GetVersion(): ...@@ -58,11 +58,14 @@ def GetVersion():
return __version__ return __version__
def generate_proto(source): def generate_proto(source, require = True):
"""Invokes the Protocol Compiler to generate a _pb2.py from the given """Invokes the Protocol Compiler to generate a _pb2.py from the given
.proto file. Does nothing if the output already exists and is newer than .proto file. Does nothing if the output already exists and is newer than
the input.""" the input."""
if not require and not os.path.exists(source):
return
output = source.replace(".proto", "_pb2.py").replace("../src/", "") output = source.replace(".proto", "_pb2.py").replace("../src/", "")
if (not os.path.exists(output) or if (not os.path.exists(output) or
...@@ -87,30 +90,26 @@ def generate_proto(source): ...@@ -87,30 +90,26 @@ def generate_proto(source):
def GenerateUnittestProtos(): def GenerateUnittestProtos():
# Unittest protos are only needed for development. generate_proto("../src/google/protobuf/map_unittest.proto", False)
if not os.path.exists("../.git"): generate_proto("../src/google/protobuf/unittest.proto", False)
return generate_proto("../src/google/protobuf/unittest_custom_options.proto", False)
generate_proto("../src/google/protobuf/unittest_import.proto", False)
generate_proto("../src/google/protobuf/map_unittest.proto") generate_proto("../src/google/protobuf/unittest_import_public.proto", False)
generate_proto("../src/google/protobuf/unittest.proto") generate_proto("../src/google/protobuf/unittest_mset.proto", False)
generate_proto("../src/google/protobuf/unittest_custom_options.proto") generate_proto("../src/google/protobuf/unittest_no_generic_services.proto", False)
generate_proto("../src/google/protobuf/unittest_import.proto") generate_proto("../src/google/protobuf/unittest_proto3_arena.proto", False)
generate_proto("../src/google/protobuf/unittest_import_public.proto") generate_proto("google/protobuf/internal/descriptor_pool_test1.proto", False)
generate_proto("../src/google/protobuf/unittest_mset.proto") generate_proto("google/protobuf/internal/descriptor_pool_test2.proto", False)
generate_proto("../src/google/protobuf/unittest_no_generic_services.proto") generate_proto("google/protobuf/internal/factory_test1.proto", False)
generate_proto("../src/google/protobuf/unittest_proto3_arena.proto") generate_proto("google/protobuf/internal/factory_test2.proto", False)
generate_proto("google/protobuf/internal/descriptor_pool_test1.proto") generate_proto("google/protobuf/internal/import_test_package/inner.proto", False)
generate_proto("google/protobuf/internal/descriptor_pool_test2.proto") generate_proto("google/protobuf/internal/import_test_package/outer.proto", False)
generate_proto("google/protobuf/internal/factory_test1.proto") generate_proto("google/protobuf/internal/missing_enum_values.proto", False)
generate_proto("google/protobuf/internal/factory_test2.proto") generate_proto("google/protobuf/internal/more_extensions.proto", False)
generate_proto("google/protobuf/internal/import_test_package/inner.proto") generate_proto("google/protobuf/internal/more_extensions_dynamic.proto", False)
generate_proto("google/protobuf/internal/import_test_package/outer.proto") generate_proto("google/protobuf/internal/more_messages.proto", False)
generate_proto("google/protobuf/internal/missing_enum_values.proto") generate_proto("google/protobuf/internal/test_bad_identifiers.proto", False)
generate_proto("google/protobuf/internal/more_extensions.proto") generate_proto("google/protobuf/pyext/python.proto", False)
generate_proto("google/protobuf/internal/more_extensions_dynamic.proto")
generate_proto("google/protobuf/internal/more_messages.proto")
generate_proto("google/protobuf/internal/test_bad_identifiers.proto")
generate_proto("google/protobuf/pyext/python.proto")
class clean(_clean): class clean(_clean):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment