diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-06-17 13:31:26 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-06-17 13:31:26 -0700 |
| commit | 1c42a8b3363fde6eb919aa6e91cdc87ca3dca8cd (patch) | |
| tree | f583474697708d47929f0f9773c95127f2ffabdc | |
| parent | b36395b2bac88f70070544c325bc09234cb1f1a6 (diff) | |
Move cmake/update_file_lists.sh preparing for bazel support.
Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
| -rw-r--r-- | cmake/extract_includes.bat.in | 2 | ||||
| -rwxr-xr-x | update_file_lists.sh (renamed from cmake/update_file_lists.sh) | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index b2e9444d..0661ac4c 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -88,6 +88,7 @@ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\common.h include copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\fastmem.h include\google\protobuf\stubs\fastmem.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\hash.h include\google\protobuf\stubs\hash.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\once.h include\google\protobuf\stubs\once.h +copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\pbconfig.h include\google\protobuf\stubs\pbconfig.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\platform_macros.h include\google\protobuf\stubs\platform_macros.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\shared_ptr.h include\google\protobuf\stubs\shared_ptr.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\singleton.h include\google\protobuf\stubs\singleton.h @@ -102,4 +103,3 @@ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wire_format.h include\ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wire_format_lite.h include\google\protobuf\wire_format_lite.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wire_format_lite_inl.h include\google\protobuf\wire_format_lite_inl.h copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wrappers.pb.h include\google\protobuf\wrappers.pb.h -copy ${PROTOBUF_BINARY_WIN32_PATH}\google\protobuf\stubs\pbconfig.h include\google\protobuf\stubs\pbconfig.h diff --git a/cmake/update_file_lists.sh b/update_file_lists.sh index 4466c021..7202650f 100755 --- a/cmake/update_file_lists.sh +++ b/update_file_lists.sh @@ -61,9 +61,9 @@ sort_files() { done | LC_ALL=C sort | uniq } -MAKEFILE=../src/Makefile.am -CMAKE_DIR=. -EXTRACT_INCLUDES_BAT=extract_includes.bat.in +MAKEFILE=src/Makefile.am +CMAKE_DIR=cmake +EXTRACT_INCLUDES_BAT=cmake/extract_includes.bat.in [ -f "$MAKEFILE" ] || { echo "Cannot find: $MAKEFILE" @@ -117,5 +117,3 @@ for HEADER in $PUBLIC_HEADERS; do WINPATH=$(echo $HEADER | sed 's;/;\\;g') echo "copy \${PROTOBUF_SOURCE_WIN32_PATH}\\..\\src\\$WINPATH include\\$WINPATH" >> $EXTRACT_INCLUDES_BAT done -# Add pbconfig.h. -echo "copy \${PROTOBUF_BINARY_WIN32_PATH}\\google\\protobuf\\stubs\\pbconfig.h include\\google\\protobuf\\stubs\\pbconfig.h" >> $EXTRACT_INCLUDES_BAT |