diff options
| author |  Bo Yang <teboring@google.com> | 2015-08-23 10:45:14 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-08-25 17:58:48 -0700 |
| commit | ff7bdad231d037802fd457ee4fd65e0291d366d7 (patch) | |
| tree | 12f437b32201cdbbfade6d63193e15483640716d /update_file_lists.sh | |
| parent | 839b180dbae98adf6caa54d0fb87b8d0a43081dc (diff) | |
Fix bugs on windows
Diffstat (limited to 'update_file_lists.sh')
| -rwxr-xr-x | update_file_lists.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/update_file_lists.sh b/update_file_lists.sh index bc2911d2..d76a1610 100755 --- a/update_file_lists.sh +++ b/update_file_lists.sh @@ -27,6 +27,10 @@ get_source_files() { get_variable_value $@ | grep "cc$" } +get_proto_files_blacklisted() { + get_proto_files $@ | sed '/^google\/protobuf\/unittest_enormous_descriptor.proto$/d' +} + get_proto_files() { get_variable_value $@ | grep "pb.cc$" | sed "s/pb.cc/proto/" } @@ -53,6 +57,7 @@ LIBPROTOBUF_SOURCES=$(get_source_files $MAKEFILE libprotobuf_la_SOURCES) LIBPROTOC_SOURCES=$(get_source_files $MAKEFILE libprotoc_la_SOURCES) LITE_PROTOS=$(get_proto_files $MAKEFILE protoc_lite_outputs) PROTOS=$(get_proto_files $MAKEFILE protoc_outputs) +PROTOS_BLACKLISTED=$(get_proto_files_blacklisted $MAKEFILE protoc_outputs) WKT_PROTOS=$(get_variable_value $MAKEFILE nobase_dist_proto_DATA) COMMON_TEST_SOURCES=$(get_source_files $MAKEFILE COMMON_TEST_SOURCES) COMMON_LITE_TEST_SOURCES=$(get_source_files $MAKEFILE COMMON_LITE_TEST_SOURCES) @@ -112,7 +117,7 @@ set_cmake_value $CMAKE_DIR/libprotobuf-lite.cmake libprotobuf_lite_files $CMAKE_ set_cmake_value $CMAKE_DIR/libprotobuf.cmake libprotobuf_files $CMAKE_PREFIX $LIBPROTOBUF_SOURCES set_cmake_value $CMAKE_DIR/libprotoc.cmake libprotoc_files $CMAKE_PREFIX $LIBPROTOC_SOURCES set_cmake_value $CMAKE_DIR/tests.cmake lite_test_protos "" $LITE_PROTOS -set_cmake_value $CMAKE_DIR/tests.cmake tests_protos "" $PROTOS +set_cmake_value $CMAKE_DIR/tests.cmake tests_protos "" $PROTOS_BLACKLISTED set_cmake_value $CMAKE_DIR/tests.cmake common_test_files $CMAKE_PREFIX $COMMON_TEST_SOURCES set_cmake_value $CMAKE_DIR/tests.cmake common_lite_test_files $CMAKE_PREFIX $COMMON_LITE_TEST_SOURCES set_cmake_value $CMAKE_DIR/tests.cmake tests_files $CMAKE_PREFIX $TEST_SOURCES |