You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2010/08/30 18:51:53 UTC
svn commit: r990861 - in /avro/branches/branch-1.4: ./ lang/php/
lang/php/examples/ lang/php/lib/ lang/php/lib/avro/ lang/php/test/
Author: cutting
Date: Mon Aug 30 16:51:52 2010
New Revision: 990861
URL: http://svn.apache.org/viewvc?rev=990861&view=rev
Log:
Merge r990860 from trunk to 1.4 branch. Fixes: AVRO-627.
Added:
avro/branches/branch-1.4/lang/php/ (props changed)
- copied from r990860, avro/trunk/lang/php/
avro/branches/branch-1.4/lang/php/README.txt
- copied unchanged from r990860, avro/trunk/lang/php/README.txt
avro/branches/branch-1.4/lang/php/build.sh
- copied unchanged from r990860, avro/trunk/lang/php/build.sh
avro/branches/branch-1.4/lang/php/examples/
- copied from r990860, avro/trunk/lang/php/examples/
avro/branches/branch-1.4/lang/php/examples/write_read.php
- copied unchanged from r990860, avro/trunk/lang/php/examples/write_read.php
avro/branches/branch-1.4/lang/php/lib/
- copied from r990860, avro/trunk/lang/php/lib/
avro/branches/branch-1.4/lang/php/lib/avro/
- copied from r990860, avro/trunk/lang/php/lib/avro/
avro/branches/branch-1.4/lang/php/lib/avro.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro.php
avro/branches/branch-1.4/lang/php/lib/avro/data_file.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro/data_file.php
avro/branches/branch-1.4/lang/php/lib/avro/datum.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro/datum.php
avro/branches/branch-1.4/lang/php/lib/avro/debug.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro/debug.php
avro/branches/branch-1.4/lang/php/lib/avro/gmp.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro/gmp.php
avro/branches/branch-1.4/lang/php/lib/avro/io.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro/io.php
avro/branches/branch-1.4/lang/php/lib/avro/schema.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro/schema.php
avro/branches/branch-1.4/lang/php/lib/avro/util.php
- copied unchanged from r990860, avro/trunk/lang/php/lib/avro/util.php
avro/branches/branch-1.4/lang/php/test/ (props changed)
- copied from r990860, avro/trunk/lang/php/test/
avro/branches/branch-1.4/lang/php/test/AllTests.php
- copied unchanged from r990860, avro/trunk/lang/php/test/AllTests.php
avro/branches/branch-1.4/lang/php/test/DataFileTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/DataFileTest.php
avro/branches/branch-1.4/lang/php/test/DatumIOTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/DatumIOTest.php
avro/branches/branch-1.4/lang/php/test/FloatIntEncodingTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/FloatIntEncodingTest.php
avro/branches/branch-1.4/lang/php/test/IODatumReaderTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/IODatumReaderTest.php
avro/branches/branch-1.4/lang/php/test/InterOpTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/InterOpTest.php
avro/branches/branch-1.4/lang/php/test/LongEncodingTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/LongEncodingTest.php
avro/branches/branch-1.4/lang/php/test/NameTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/NameTest.php
avro/branches/branch-1.4/lang/php/test/SchemaTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/SchemaTest.php
avro/branches/branch-1.4/lang/php/test/StringIOTest.php
- copied unchanged from r990860, avro/trunk/lang/php/test/StringIOTest.php
avro/branches/branch-1.4/lang/php/test/generate_interop_data.php
- copied unchanged from r990860, avro/trunk/lang/php/test/generate_interop_data.php
avro/branches/branch-1.4/lang/php/test/test_helper.php
- copied unchanged from r990860, avro/trunk/lang/php/test/test_helper.php
Modified:
avro/branches/branch-1.4/ (props changed)
avro/branches/branch-1.4/BUILD.txt
avro/branches/branch-1.4/CHANGES.txt
avro/branches/branch-1.4/build.sh
Propchange: avro/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 30 16:51:52 2010
@@ -1 +1 @@
-/avro/trunk:990852
+/avro/trunk:990852,990860
Modified: avro/branches/branch-1.4/BUILD.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/BUILD.txt?rev=990861&r1=990860&r2=990861&view=diff
==============================================================================
--- avro/branches/branch-1.4/BUILD.txt (original)
+++ avro/branches/branch-1.4/BUILD.txt Mon Aug 30 16:51:52 2010
@@ -5,6 +5,7 @@ REQUIREMENTS
The following packages must be installed before Avro can be built:
- Java: JDK 1.6 and 1.5 (for Forrest docs)
+ - PHP: php5, phpunit, php5-gmp
- Python: 2.5 or greater, python-setuptools for dist target
- C: gcc, autoconf, automake, libtool, asciidoc, source-highlight
- C++: g++, flex, bison, libboost-dev
Modified: avro/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/CHANGES.txt?rev=990861&r1=990860&r2=990861&view=diff
==============================================================================
--- avro/branches/branch-1.4/CHANGES.txt (original)
+++ avro/branches/branch-1.4/CHANGES.txt Mon Aug 30 16:51:52 2010
@@ -26,6 +26,8 @@ Avro 1.4.0 (31 August 2010)
NEW FEATURES
+ AVRO-627. Add PHP implementation. (Michael Glaesemann)
+
AVRO-613. Create basic frontend to view trace results.
(Patrick Wendell via philz)
Modified: avro/branches/branch-1.4/build.sh
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/build.sh?rev=990861&r1=990860&r2=990861&view=diff
==============================================================================
--- avro/branches/branch-1.4/build.sh (original)
+++ avro/branches/branch-1.4/build.sh Mon Aug 30 16:51:52 2010
@@ -45,6 +45,7 @@ case "$target" in
(cd lang/c; ./build.sh test)
(cd lang/c++; ./build.sh test)
(cd lang/ruby; rake test)
+ (cd lang/php; ./build.sh test)
# create interop test data
(cd lang/java; ant interop-data-generate)
@@ -52,6 +53,7 @@ case "$target" in
(cd lang/c; ./build.sh interop-data-generate)
#(cd lang/c++; make interop-data-generate)
(cd lang/ruby; rake generate_interop)
+ (cd lang/php; ./build.sh interop-data-generate)
# run interop data tests
(cd lang/java; ant interop-data-test)
@@ -59,6 +61,7 @@ case "$target" in
(cd lang/c; ./build.sh interop-data-test)
#(cd lang/c++; make interop-data-test)
(cd lang/ruby; rake interop)
+ (cd lang/php; ./build.sh test-interop)
# run interop rpc tests
/bin/bash share/test/interop/bin/test_rpc_interop.sh
@@ -86,6 +89,8 @@ case "$target" in
(cd lang/ruby; rake dist)
+ (cd lang/php; ./build.sh dist)
+
# build docs
(cd doc; ant)
(cd build; tar czf ../dist/avro-doc-$VERSION.tar.gz avro-doc-$VERSION)
@@ -127,6 +132,7 @@ case "$target" in
(cd lang/ruby; rake clean)
+ (cd lang/php; ./build.sh clean)
;;
*)
Propchange: avro/branches/branch-1.4/lang/php/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 30 16:51:52 2010
@@ -0,0 +1 @@
+pkg
Propchange: avro/branches/branch-1.4/lang/php/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 30 16:51:52 2010
@@ -0,0 +1 @@
+tmp