Merge pull request #3565 from pherl/fixdist

Add mising cmake files in dist
pull/3576/head
Jisi Liu 7 years ago committed by GitHub
commit 21b2372331
  1. 2
      Makefile.am
  2. 1
      tests.sh

@ -982,8 +982,10 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
cmake/libprotoc.cmake \ cmake/libprotoc.cmake \
cmake/protobuf-config-version.cmake.in \ cmake/protobuf-config-version.cmake.in \
cmake/protobuf-config.cmake.in \ cmake/protobuf-config.cmake.in \
cmake/protobuf-lite.pc.cmake \
cmake/protobuf-module.cmake.in \ cmake/protobuf-module.cmake.in \
cmake/protobuf-options.cmake \ cmake/protobuf-options.cmake \
cmake/protobuf.pc.cmake \
cmake/protoc.cmake \ cmake/protoc.cmake \
cmake/tests.cmake \ cmake/tests.cmake \
editors/README.txt \ editors/README.txt \

@ -63,7 +63,6 @@ build_cpp_distcheck() {
# List all files that should be included in the distribution package. # List all files that should be included in the distribution package.
git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|php\|cmake\|examples\|src/google/protobuf/.*\.proto\)" |\ git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|php\|cmake\|examples\|src/google/protobuf/.*\.proto\)" |\
grep -v ".gitignore" | grep -v "java/compatibility_tests" |\ grep -v ".gitignore" | grep -v "java/compatibility_tests" |\
grep -v "cmake/protobuf.*\.pc\.cmake" |\
grep -v "python/compatibility_tests" | grep -v "csharp/compatibility_tests" > dist.lst grep -v "python/compatibility_tests" | grep -v "csharp/compatibility_tests" > dist.lst
# Unzip the dist tar file. # Unzip the dist tar file.
DIST=`ls *.tar.gz` DIST=`ls *.tar.gz`

Loading…
Cancel
Save