Remove java/lite/proguard.pgcfg from EXTRA_DIST since it's not part of

protoc.
protocolbuffers · Nov 12, 2019 · 9b0fa3e · 9b0fa3e
1 parent df71972
commit 9b0fa3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
@@ -203,9 +203,7 @@ EXTRA_DIST =                  \
   failure_list_python-post26.txt \
   failure_list_ruby.txt       \
   failure_list_php.txt        \
-  failure_list_php_c.txt      \
-  java/lite/proguard.pgcfg
-
+  failure_list_php_c.txt
 
 conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la
 conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \

diff --git a/tests.sh b/tests.sh
@@ -62,7 +62,7 @@ build_cpp_distcheck() {
 
   # 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\)" |\
-    grep -v ".gitignore" | grep -v "java/compatibility_tests" |\
+    grep -v ".gitignore" | grep -v "java/compatibility_tests" | grep -v "java/lite/proguard.pgcfg" |\
     grep -v "python/compatibility_tests" | grep -v "csharp/compatibility_tests" > dist.lst
   # Unzip the dist tar file.
   DIST=`ls *.tar.gz`