aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2016-09-23 18:37:37 -0700
committerBo Yang <teboring@google.com>2016-10-10 11:44:21 -0700
commite0a6e52023797c605fff2df108dedc4b34ef34b8 (patch)
tree5475a1dd087cb9870ca13881c3e9a3e00f787cfe
parent17cc42a45aeab0f78a137fa6be6c36095db32e58 (diff)
downloadprotobuf-e0a6e52023797c605fff2df108dedc4b34ef34b8.tar.gz
protobuf-e0a6e52023797c605fff2df108dedc4b34ef34b8.tar.bz2
protobuf-e0a6e52023797c605fff2df108dedc4b34ef34b8.zip
Add php files for make dist.
-rw-r--r--Makefile.am53
-rw-r--r--configure.ac2
-rwxr-xr-xpost_process_dist.sh2
-rwxr-xr-xtests.sh2
4 files changed, 55 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 61f65b2f..17a7a953 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -571,6 +571,57 @@ objectivec_EXTRA_DIST= \
objectivec/Tests/UnitTests-Info.plist \
Protobuf.podspec
+php_EXTRA_DIST= \
+ php/src/phpdoc.dist.xml \
+ php/src/Google/Protobuf/Internal/DescriptorPool.php \
+ php/src/Google/Protobuf/Internal/OneofField.php \
+ php/src/Google/Protobuf/Internal/MapEntry.php \
+ php/src/Google/Protobuf/Internal/Type.php \
+ php/src/Google/Protobuf/Internal/InputStream.php \
+ php/src/Google/Protobuf/Internal/OutputStream.php \
+ php/src/Google/Protobuf/Internal/MessageBuilderContext.php \
+ php/src/Google/Protobuf/Internal/MapField.php \
+ php/src/Google/Protobuf/Internal/RepeatedField.php \
+ php/src/Google/Protobuf/Internal/Message.php \
+ php/src/Google/Protobuf/Internal/GPBWire.php \
+ php/src/Google/Protobuf/Internal/GPBType.php \
+ php/src/Google/Protobuf/Internal/GPBLabel.php \
+ php/src/Google/Protobuf/Internal/EnumBuilderContext.php \
+ php/src/Google/Protobuf/Internal/GPBUtil.php \
+ php/src/Google/Protobuf/descriptor_internal.pb.php \
+ php/src/Google/Protobuf/descriptor.php \
+ php/tests/encode_decode_test.php \
+ php/tests/test.sh \
+ php/tests/generated_class_test.php \
+ php/tests/array_test.php \
+ php/tests/php_implementation_test.php \
+ php/tests/test_include.proto \
+ php/tests/test_include.pb.php \
+ php/tests/map_field_test.php \
+ php/tests/test_base.php \
+ php/tests/test_util.php \
+ php/tests/test.proto \
+ php/tests/test.pb.php \
+ php/tests/memory_leak_test.php \
+ php/README.md \
+ php/ext/google/protobuf/utf8.h \
+ php/ext/google/protobuf/message.c \
+ php/ext/google/protobuf/utf8.c \
+ php/ext/google/protobuf/package.xml \
+ php/ext/google/protobuf/upb.h \
+ php/ext/google/protobuf/array.c \
+ php/ext/google/protobuf/encode_decode.c \
+ php/ext/google/protobuf/protobuf.h \
+ php/ext/google/protobuf/type_check.c \
+ php/ext/google/protobuf/def.c \
+ php/ext/google/protobuf/storage.c \
+ php/ext/google/protobuf/map.c \
+ php/ext/google/protobuf/config.m4 \
+ php/ext/google/protobuf/upb.c \
+ php/ext/google/protobuf/protobuf.c \
+ phpunit.xml \
+ composer.json
+
python_EXTRA_DIST= \
python/MANIFEST.in \
python/google/__init__.py \
@@ -767,7 +818,7 @@ js_EXTRA_DIST= \
js/testbinary.proto \
js/testempty.proto
-all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) $(js_EXTRA_DIST)
+all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(php_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) $(js_EXTRA_DIST)
EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
autogen.sh \
diff --git a/configure.ac b/configure.ac
index a454bbe0..896f3471 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., make dist)])
case "$DIST_LANG" in
"") DIST_LANG=all ;;
- all | cpp | csharp | java | python | javanano | objectivec | ruby | js) ;;
+ all | cpp | csharp | java | python | javanano | objectivec | ruby | js | php) ;;
*) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;;
esac
AC_SUBST(DIST_LANG)
diff --git a/post_process_dist.sh b/post_process_dist.sh
index 82736bd0..a5f95800 100755
--- a/post_process_dist.sh
+++ b/post_process_dist.sh
@@ -27,7 +27,7 @@ fi
set -ex
-LANGUAGES="cpp csharp java javanano js objectivec python ruby"
+LANGUAGES="cpp csharp java javanano js objectivec python ruby php"
BASENAME=`basename $1 .tar.gz`
VERSION=${BASENAME:9}
diff --git a/tests.sh b/tests.sh
index 71fd9706..a39448ac 100755
--- a/tests.sh
+++ b/tests.sh
@@ -52,7 +52,7 @@ build_cpp_distcheck() {
make dist
# List all files that should be included in the distribution package.
- git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|cmake\|examples\)" |\
+ git ls-files | grep "^\(java\|python\|objectivec\|csharp\|js\|ruby\|php\|cmake\|examples\)" |\
grep -v ".gitignore" | grep -v "java/compatibility_tests" > dist.lst
# Unzip the dist tar file.
DIST=`ls *.tar.gz`