Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing 
into lp:zorba.

Requested reviews:
  William Candillon (wcandillon)
  Markos Zaharioudakis (markos-za)
Related bugs:
  Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX"
  https://bugs.launchpad.net/zorba/+bug/867133

For more details, see:
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347

- cleanup
- ChangeLog preparations for 2.1 release
- fix for bug #867133 (SWIG PHP build failure on Mac OSX ). With this fix, the 
PHP binding for Mac is re-enabled.
-- 
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2011-11-15 08:23:20 +0000
+++ ChangeLog	2011-11-16 04:14:32 +0000
@@ -1,11 +1,10 @@
 Zorba - The XQuery Processor
 
-version 2.x
+version 2.1
 
   * Modified C++ API to add isSequential, getExternalVariables, and 
     isBoundExternalVariable Functions
   * Custom Full-text thesaurus using Zorba URI resolver mechanism.
-  * Fixed bug #3401971 (node-by-reference on dynamic collections)
   * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a
   sequence of integers)
   * documentation improvements
@@ -17,7 +16,6 @@
   * Fixed bug #3404689 (assignment problem in flwor)
   * Fix for bug #3404450 (testdriver_mt problem: caching and validation of docs)
   * Fixed installation bug to not install the .so for test modules
-  * Fix for running ctest on Windows
   * Fixed bug #3390410 (Adding a node to a collection causes out of bound in vector)
   * Fixed bug #3406200 (node types were not being moved to new tree during node detach)
   * Fixed bug #3406191 (Namespace bindings lost after update due to bug in node detach)
@@ -44,7 +42,6 @@
   * Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
   * Implemented the probe-index-range-value for general indexes
   * Removed ZSTR0005 and ZSTR0006 error codes
-  * Fixed bug #867662 ("nullptr" warning)
   * Fixed bug #868258 (Assertion failure with two delete collection)
   * Fixed bug #871623 and #871629 (assertion failures with insertions in dynamic collections)
   * Fixed bug #867262 (allow reuse of iterator over ExtFuncArgItemSequence)
@@ -57,6 +54,7 @@
     xs:anyAtomicType or xs:untypedAtomic.
   * Added undo for node revalidation
   * Optimization for count(collection()) expressions
+  * Fixed bug #867133 (SWIG PHP build failure on Mac OSX)
   * Fixed bug #872796  (validate-in-place can interfere with other update primitives)
   * Fixed bug #872799 (validate-in-place can set incorrect types)
   * Fixed bug #855715 (Invalid escaped characters in regex not caught)
@@ -67,6 +65,18 @@
   * Fixed bug #872502 (validation of the JSON module xqdoc fails)
   * Fixed bug #867107 (xqdoc dependency to zorba is wrong)
 
+version 2.0.3
+  * Fixed bug #867662 ("nullptr" warning)
+  * documentation improvements
+
+version 2.0.2
+  * Fixed bug #3401971 (node-by-reference on dynamic collections)
+  * documentation improvements
+  * installer improvements
+  * Fixed bug #3403291 (build for Fedora 15)
+  * Don't install the .so for test modules
+  * Fix for running ctest on Windows
+
 version 2.0.1
 
   * Custom Full-text stemming.

=== modified file 'cmake_modules/FindPHP5.cmake'
--- cmake_modules/FindPHP5.cmake	2011-08-19 00:03:31 +0000
+++ cmake_modules/FindPHP5.cmake	2011-11-16 04:14:32 +0000
@@ -97,6 +97,11 @@
     _zend_rsrc_list_get_rsrc_type
     _zend_wrong_param_count
     _zval_used_for_init
+    _zval_is_true
+    _zend_lookup_class
+    __object_init
+    __zend_hash_add_or_update
+    _php_strtolower
     )
     SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
       "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS},-U,${symbol}")

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2011-11-15 08:23:20 +0000
+++ src/compiler/translator/translator.cpp	2011-11-16 04:14:32 +0000
@@ -2154,7 +2154,8 @@
 {
   TRACE_VISIT();
 
-  if (!utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$"))
+  if (v.get_encoding().length() != 0 &&
+      !utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$"))
     RAISE_ERROR(err::XQST0087, loc, ERROR_PARAMS(v.get_encoding()));
 
   std::string versionStr = v.get_version().str();

=== modified file 'src/store/naive/nsbindings.h'
--- src/store/naive/nsbindings.h	2011-06-14 17:26:33 +0000
+++ src/store/naive/nsbindings.h	2011-11-16 04:14:32 +0000
@@ -18,8 +18,9 @@
 
 #include <vector>
 
+#include "zorbatypes/rchandle.h"
 #include "zorbamisc/config/platform.h"
-#include "store/api/item.h"
+#include "store/api/shared_types.h"
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/pul_primitives.h'
--- src/store/naive/pul_primitives.h	2011-10-13 19:44:33 +0000
+++ src/store/naive/pul_primitives.h	2011-11-16 04:14:32 +0000
@@ -29,7 +29,11 @@
 #include "store/api/index.h" // for index spec obj
 #include "store/api/ic.h" // for index spec obj
 
-namespace zorba { namespace simplestore {
+namespace zorba {
+
+class QueryLoc;
+  
+namespace simplestore {
 
 
 class PULImpl;

=== modified file 'src/store/naive/simple_store.h'
--- src/store/naive/simple_store.h	2011-11-02 17:19:09 +0000
+++ src/store/naive/simple_store.h	2011-11-16 04:14:32 +0000
@@ -270,18 +270,6 @@
         const zstring& baseUri,
         const zstring& docUri,
         std::istream& stream,
-        bool storeDocument);
-
-  store::Item_t loadDocument(
-        const zstring& baseUri,
-        const zstring& docUri,
-        std::istream* stream,
-        bool storeDocument);
-
-  store::Item_t loadDocument(
-        const zstring& baseUri,
-        const zstring& docUri,
-        std::istream& stream,
         const store::LoadProperties& loadProperties);
 
   store::Item_t loadDocument(

=== modified file 'swig/CMakeLists.txt'
--- swig/CMakeLists.txt	2011-10-12 20:56:27 +0000
+++ swig/CMakeLists.txt	2011-11-16 04:14:32 +0000
@@ -34,13 +34,7 @@
   ENDIF (APPLE AND CMAKE_MINOR_VERSION GREATER 6)
 
   ADD_SUBDIRECTORY (python)
-
-  IF (APPLE)
-    # the php binding is not supported on Mac (see bug #3371525)
-  ELSE (APPLE)
-    ADD_SUBDIRECTORY (php)
-  ENDIF (APPLE)
-
+  ADD_SUBDIRECTORY (php)
   ADD_SUBDIRECTORY (java)
   
   IF (APPLE AND UNIVERSAL)

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to