[Zorba-coders] [Merge] lp:~zorba-coders/zorba/read-pdf-installer-changes into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/read-pdf-installer-changes into lp:zorba/read-pdf-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/read-pdf-installer-changes/+merge/149359 -- https://code.launchpad.net/~zorba-coders/zorba/read-pdf-installer-changes/+merge/149359 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/read-pdf-installer-changes into lp:zorba/read-pdf-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/read-pdf-installer-changes-2013-05-28T07-27-44.096Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/read-pdf-installer-changes/+merge/149359 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
Whoops, never mind - this one is for lp:zorba, the other proposal is for zorba-2.9. -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba has been updated. Status: Rejected = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9. Commit message: Bump certain non-core modules to zorba-2.9.1 tag. Requested reviews: Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2013-05-22 07:01:40 + +++ modules/ExternalModules.conf 2013-05-28 07:44:25 + @@ -29,7 +29,7 @@ archive bzr lp:zorba/archive-module zorba-2.9 csv bzr lp:zorba/csv-module zorba-2.9 data-cleaning bzr lp:zorba/data-cleaning-modulezorba-2.9 -data-formatting bzr lp:zorba/data-formatting-module zorba-2.9 +data-formatting bzr lp:zorba/data-formatting-module zorba-2.9.1 excel bzr lp:zorba/excel-modulezorba-2.9 info-extraction bzr lp:zorba/info-extraction-module zorba-2.9 geo bzr lp:zorba/geo-module zorba-2.9 @@ -43,15 +43,13 @@ oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module zorba-2.9 oauth bzr lp:zorba/oauth-modulezorba-2.9 process bzr lp:zorba/process-module zorba-2.9 -read-pdfbzr lp:zorba/read-pdf-module zorba-2.9 +read-pdfbzr lp:zorba/read-pdf-module zorba-2.9.1 securitybzr lp:zorba/security-module zorba-2.9 system bzr lp:zorba/system-module zorba-2.9 email bzr lp:zorba/email-modulezorba-2.9 -util-jvmbzr lp:zorba/util-jvm-module zorba-2.9 -schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9 +util-jvmbzr lp:zorba/util-jvm-module zorba-2.9.1 +schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9.1 stack bzr lp:zorba/stack-modulezorba-2.9 queue bzr lp:zorba/queue-modulezorba-2.9 couchbase bzr lp:zorba/couchbase-modulezorba-2.9 sqlite bzr lp:zorba/sqlite-module zorba-2.9 - - -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Commit Message changed to: Bump certain non-core modules to zorba-2.9.1 tag. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bump-module-versions
into lp:zorba.
Commit message:
Bump certain non-core modules to zorba-2.9.1 tag.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978
--
https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-05-07 08:39:33 +
+++ CMakeLists.txt 2013-05-28 07:47:28 +
@@ -479,7 +479,7 @@
# zorba versioning
SET(ZORBA_MAJOR_NUMBER 2)
SET(ZORBA_MINOR_NUMBER 9)
-SET(ZORBA_PATCH_NUMBER 0)
+SET(ZORBA_PATCH_NUMBER 1)
SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
MESSAGE(STATUS Zorba version number: ${ZORBA_VERSION})
=== modified file 'NOTICE.txt'
--- NOTICE.txt 2013-05-07 08:39:33 +
+++ NOTICE.txt 2013-05-28 07:47:28 +
@@ -1,5 +1,5 @@
---
-Zorba 2.9.0
+Zorba 2.9.1
---
(Note: This file is generated automatically from NOTICE.xml.
=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf 2013-05-22 07:01:40 +
+++ modules/ExternalModules.conf 2013-05-28 07:47:28 +
@@ -29,7 +29,7 @@
archive bzr lp:zorba/archive-module zorba-2.9
csv bzr lp:zorba/csv-module zorba-2.9
data-cleaning bzr lp:zorba/data-cleaning-modulezorba-2.9
-data-formatting bzr lp:zorba/data-formatting-module zorba-2.9
+data-formatting bzr lp:zorba/data-formatting-module zorba-2.9.1
excel bzr lp:zorba/excel-modulezorba-2.9
info-extraction bzr lp:zorba/info-extraction-module zorba-2.9
geo bzr lp:zorba/geo-module zorba-2.9
@@ -43,15 +43,13 @@
oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module zorba-2.9
oauth bzr lp:zorba/oauth-modulezorba-2.9
process bzr lp:zorba/process-module zorba-2.9
-read-pdfbzr lp:zorba/read-pdf-module zorba-2.9
+read-pdfbzr lp:zorba/read-pdf-module zorba-2.9.1
securitybzr lp:zorba/security-module zorba-2.9
system bzr lp:zorba/system-module zorba-2.9
email bzr lp:zorba/email-modulezorba-2.9
-util-jvmbzr lp:zorba/util-jvm-module zorba-2.9
-schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9
+util-jvmbzr lp:zorba/util-jvm-module zorba-2.9.1
+schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9.1
stack bzr lp:zorba/stack-modulezorba-2.9
queue bzr lp:zorba/queue-modulezorba-2.9
couchbase bzr lp:zorba/couchbase-modulezorba-2.9
sqlite bzr lp:zorba/sqlite-module zorba-2.9
-
-
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-05-25 15:15:30 +
+++ src/compiler/translator/translator.cpp 2013-05-28 07:47:28 +
@@ -12655,6 +12655,7 @@
break;
}
+ TREE
case FunctionConsts::FN_MAP_2:
case FunctionConsts::FN_FILTER_2:
{
@@ -12668,6 +12669,21 @@
body = flworBody;
break;
}
+===
+ case FunctionConsts::FN_MAP_2:
+ case FunctionConsts::FN_FILTER_2:
+ {
+flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc, false);
+
+let_clause* lc = wrap_in_letclause(foArgs[0]);
+flworBody-add_clause(lc);
+foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc-get_var());
+
+flworBody-set_return_expr(generate_fn_body(f, foArgs, loc));
+body = flworBody;
+break;
+ }
+ MERGE-SOURCE
case FunctionConsts::FN_FUNCTION_LOOKUP_2:
{
bool varAdded = false;
=== modified file 'src/runtime/api/plan_iterator_wrapper.cpp'
=== modified file 'src/runtime/api/plan_iterator_wrapper.h'
--
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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Commit Message changed to: Bump certain non-core modules to zorba-2.9.1 tag. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/read-pdf-installer-changes into lp:zorba/read-pdf-module
The attempt to merge lp:~zorba-coders/zorba/read-pdf-installer-changes into lp:zorba/read-pdf-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job read-pdf-installer-changes-2013-05-28T07-27-44.096Z is finished. The final status was: 15 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/read-pdf-installer-changes/+merge/149359 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/schema-tools-errcode-2013-05-28T13-35-42.049Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
The attempt to merge lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job schema-tools-errcode-2013-05-28T13-35-42.049Z is finished. The final status was: 15 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/nullcasts into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/nullcasts-2013-05-28T16-46-13.059Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/pdf-installer-fix
into lp:zorba/read-pdf-module.
Commit message:
Fixes for Ubuntu Packages.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107
Fixes for Ubuntu Packages.
--
https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107
Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-09-28 19:38:29 +
+++ CMakeLists.txt 2013-05-28 17:07:53 +
@@ -21,8 +21,16 @@
# variables will be set. util-jvm also caches Java_FOUND and JNI_FOUND
# for us.
FIND_PACKAGE (zorba_util-jvm_module QUIET)
+INCLUDE (${zorba_util-jvm_module_USE_FILE})
IF (zorba_util-jvm_module_FOUND)
+ FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
+ INCLUDE (${Zorba_USE_FILE})
+
+ SET_CMAKE_MODULE_PATH ()
+ FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java)
+
IF (JNI_FOUND)
INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
@@ -43,6 +51,11 @@
ZORBA_FIND_JAR( JEMPBOX_JAR NAMES jempbox PATHS ${PDFBOX_PATH} )
ZORBA_FIND_JAR( COMMLOG_JAR NAMES commons-logging PATHS ${PDFBOX_PATH} )
+MESSAGE(STATUS commons-logging.jar Found in: ${COMMLOG_JAR})
+MESSAGE(STATUS jempbox.jar Found in: ${JEMPBOX_JAR})
+MESSAGE(STATUS fontbox.jar Found in: ${FONTBOX_JAR})
+MESSAGE(STATUS pdfbox.jar Found in: ${PDFBOX_JAR})
+
SET(ALL_PDFBOX_JARS FALSE)
IF(EXISTS ${PDFBOX_JAR})
IF(EXISTS ${FONTBOX_JAR})
@@ -64,11 +77,6 @@
ENABLE_TESTING ()
INCLUDE (CTest)
- SET_CMAKE_MODULE_PATH ()
-
- FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
- INCLUDE (${Zorba_USE_FILE})
-
ADD_SUBDIRECTORY (src)
ADD_SUBDIRECTORY (srcJava)
ADD_TEST_DIRECTORY(${PROJECT_SOURCE_DIR}/test)
@@ -86,4 +94,4 @@
MESSAGE (STATUS Zorba's util-jvm module not found; skipping read-pdf module.)
ENDIF (zorba_util-jvm_module_FOUND)
-MESSAGE (STATUS --- End module: read-pdf---)
\ No newline at end of file
+MESSAGE (STATUS --- End module: read-pdf---)
=== modified file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 2012-09-17 19:26:21 +
+++ cmake_modules/FindJNI.cmake 2013-05-28 17:07:53 +
@@ -14,17 +14,35 @@
#
#=
-# Copyright 2001-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the License);
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
+# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# * Neither the names of Kitware, Inc., the Insight Software Consortium, nor
+# the names of their contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
#=
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
MACRO(java_append_library_directories _var)
@@ -101,6 +119,18 @@
${_JAVA_HOME}/jre/lib
${_JAVA_HOME}/lib
${_JAVA_HOME}
+ /usr/lib/jvm/java-6-openjdk/jre/lib
+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib
+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib
+
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Removed unncessary (and now wrong) cast.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109
Removed unncessary (and now wrong) cast.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/time.h'
--- include/zorba/time.h 2013-03-13 16:17:38 +
+++ include/zorba/time.h 2013-05-28 17:09:36 +
@@ -57,7 +57,6 @@
VE, /// Vikrama Era
VS/// Vikrama Samvat Era
};
-
} // namespace calendar
///
=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp 2013-05-24 22:52:47 +
+++ src/store/naive/atomic_items.cpp 2013-05-28 17:09:36 +
@@ -150,10 +150,9 @@
case store::XS_NON_NEGATIVE_INTEGER:
case store::XS_POSITIVE_INTEGER:
{
-const IntegerItem* item = static_castconst IntegerItem*(item1);
try
{
- longValue = item-getLongValue();
+ longValue = item1-getLongValue();
GET_FACTORY().createLong(result, longValue);
}
catch (std::range_error const)
--
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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/nullcasts into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job nullcasts-2013-05-28T16-46-13.059Z is finished. The final status was: 15 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/nullcasts into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pdf-installer-fix-2013-05-28T17-10-42.014Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-28T17-34-44.172Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/nullcasts into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job pjl-misc-2013-05-28T17-34-44.172Z is finished. The final status was: 15 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/nullcasts-2013-05-28T18-03-57.078Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/no-batching into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/no-batching
into lp:zorba.
Commit message:
Removed the Batcher class from the runtime (saves 10% off the size of the zorba
library)
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/no-batching/+merge/166118
Removed the Batcher class from the runtime (saves 10% off the size of the zorba
library)
--
https://code.launchpad.net/~zorba-coders/zorba/no-batching/+merge/166118
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake 2013-02-07 17:24:36 +
+++ include/zorba/config.h.cmake 2013-05-28 18:20:34 +
@@ -194,8 +194,6 @@
#cmakedefine ZORBA_DEBUG_STRING
// Zorba runtime configuration parameters
-#define ZORBA_BATCHING_TYPE ${ZORBA_BATCHING_TYPE}
-#define ZORBA_BATCHING_BATCHSIZE${ZORBA_BATCHING_BATCHSIZE}
#define ZORBA_FLOAT_POINT_PRECISION ${ZORBA_FLOAT_POINT_PRECISION}
// Zorba threading mechanism
=== modified file 'src/runtime/base/binarybase.h'
--- src/runtime/base/binarybase.h 2013-02-07 17:24:36 +
+++ src/runtime/base/binarybase.h 2013-05-28 18:20:34 +
@@ -31,7 +31,7 @@
data members.
/
template class IterType, class StateType
-class BinaryBaseIterator : public BatcherIterType
+class BinaryBaseIterator : public PlanIterator
{
protected:
PlanIter_t theChild0;
@@ -39,10 +39,10 @@
public:
SERIALIZABLE_ABSTRACT_CLASS(BinaryBaseIterator)
- SERIALIZABLE_CLASS_CONSTRUCTOR2(BinaryBaseIterator, BatcherIterType)
+ SERIALIZABLE_CLASS_CONSTRUCTOR2(BinaryBaseIterator, PlanIterator)
void serialize(::zorba::serialization::Archiver ar)
{
-serialize_baseclass(ar, (BatcherIterType*)this);
+serialize_baseclass(ar, (PlanIterator*)this);
ar theChild0;
ar theChild1;
}
@@ -54,7 +54,7 @@
PlanIter_t child0,
PlanIter_t child1)
:
-BatcherIterType(sctx, loc),
+PlanIterator(sctx, loc),
theChild0(child0),
theChild1(child1)
{
=== modified file 'src/runtime/base/narybase.h'
--- src/runtime/base/narybase.h 2013-02-07 17:24:36 +
+++ src/runtime/base/narybase.h 2013-05-28 18:20:34 +
@@ -34,17 +34,17 @@
data members.
/
template class IterType, class StateType
-class NaryBaseIterator : public BatcherIterType
+class NaryBaseIterator : public PlanIterator
{
protected:
std::vectorPlanIter_t theChildren;
public:
SERIALIZABLE_ABSTRACT_CLASS(NaryBaseIterator)
- SERIALIZABLE_CLASS_CONSTRUCTOR2(NaryBaseIterator, BatcherIterType)
+ SERIALIZABLE_CLASS_CONSTRUCTOR2(NaryBaseIterator, PlanIterator)
void serialize(::zorba::serialization::Archiver ar)
{
-serialize_baseclass(ar, (BatcherIterType*)this);
+serialize_baseclass(ar, (PlanIterator*)this);
ar theChildren;
}
@@ -80,18 +80,17 @@
NaryBaseIteratorIterType, StateType::NaryBaseIterator(
static_context* sctx,
const QueryLoc loc,
-std::vectorPlanIter_t aChildren)
+std::vectorPlanIter_t children)
:
- BatcherIterType(sctx, loc),
- theChildren(aChildren)
+ PlanIterator(sctx, loc),
+ theChildren(children)
{
#ifndef NDEBUG
- std::vectorPlanIter_t::const_iterator lEnd = aChildren.end();
- for(std::vectorPlanIter_t::const_iterator lIter = aChildren.begin();
- lIter != lEnd;
- ++lIter)
+ std::vectorPlanIter_t::const_iterator end = children.end();
+ std::vectorPlanIter_t::const_iterator ite = children.begin();
+ for(; ite != end; ++ite)
{
-assert(*lIter != 0);
+assert(*ite != 0);
}
#endif
}
@@ -114,11 +113,11 @@
{
uint32_t size = 0;
- std::vectorPlanIter_t::const_iterator lIter = theChildren.begin();
- std::vectorPlanIter_t::const_iterator lEnd = theChildren.end();
- for (; lIter != lEnd; ++lIter )
+ std::vectorPlanIter_t::const_iterator ite = theChildren.begin();
+ std::vectorPlanIter_t::const_iterator end = theChildren.end();
+ for (; ite != end; ++ite)
{
-size += (*lIter)-getStateSizeOfSubtree();
+size += (*ite)-getStateSizeOfSubtree();
}
return this-getStateSize() + size;
@@ -126,47 +125,44 @@
template class IterType, class StateType
-void
-NaryBaseIteratorIterType, StateType::openImpl(
+void NaryBaseIteratorIterType, StateType::openImpl(
PlanState planState,
uint32_t offset)
{
StateTraitsImplStateType::createState(planState, this-theStateOffset, offset);
StateTraitsImplStateType::initState(planState, this-theStateOffset);
- std::vectorPlanIter_t::iterator lIter = theChildren.begin();
- std::vectorPlanIter_t::iterator lEnd = theChildren.end();
- for ( ; lIter != lEnd; ++lIter )
+ std::vectorPlanIter_t::iterator ite = theChildren.begin();
+ std::vectorPlanIter_t::iterator end = theChildren.end();
+ for (; ite != end; ++ite)
{
-
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/no-batching into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/no-batching/+merge/166118 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/nullcasts into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job nullcasts-2013-05-28T18-03-57.078Z is finished. The final status was: 15 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/nullcasts into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/nullcasts into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 -- https://code.launchpad.net/~zorba-coders/zorba/nullcasts/+merge/166094 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/language-bindings-install-fix-2013-05-28T19-44-04.031Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
The proposal to merge lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
disabled throwing of error XPST0005 for path exprs (also fixes bug #1090514)
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132
disabled throwing of error XPST0005 for path exprs (also fixes bug #1090514)
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp 2013-05-24 16:34:11 +
+++ src/compiler/expression/expr_type.cpp 2013-05-28 19:59:31 +
@@ -42,6 +42,8 @@
#include types/root_typemanager.h
#include types/typeops.h
+//#define THROW_XPST0005
+
namespace zorba
{
@@ -842,20 +844,16 @@
RootTypeManager RTM = GENV_TYPESYSTEM;
TypeManager* tm = sctx-get_typemanager();
- const QueryLoc loc = axisStep-get_loc();
-
axis_kind_t axisKind = axisStep-getAxis();
match_expr* nodeTest = axisStep-getTest();
match_test_t testKind = nodeTest-getTestKind();
store::StoreConsts::NodeKind testNodeKind = nodeTest-getNodeKind();
- store::Item* testSchemaType = nodeTest-getTypeName();
store::Item* testNodeName = nodeTest-getQName();
match_wild_t wildKind = nodeTest-getWildKind();
TypeConstants::quantifier_t inQuant = inputType-get_quantifier();
store::StoreConsts::NodeKind inNodeKind = inputType-get_node_kind();
- store::Item* inNodeName = inputType-get_node_name();
xqtref_t inContentType = inputType-get_content_type();
TypeConstants::quantifier_t star = TypeConstants::QUANT_STAR;
@@ -877,6 +875,11 @@
}
}
+#ifdef THROW_XPST0005
+ const QueryLoc loc = axisStep-get_loc();
+ store::Item* testSchemaType = nodeTest-getTypeName();
+ store::Item* inNodeName = inputType-get_node_name();
+
if (inUntyped
(axisKind == axis_kind_self ||
axisKind == axis_kind_descendant_or_self ||
@@ -897,11 +900,13 @@
throw XQUERY_EXCEPTION(err::XPST0005, ERROR_LOC(loc));
}
}
+#endif
switch (axisKind)
{
case axis_kind_parent:
{
+#ifdef THROW_XPST0005
// Doc nodes do not have parent
if (inNodeKind == store::StoreConsts::documentNode)
{
@@ -922,6 +927,7 @@
{
throw XQUERY_EXCEPTION(err::XPST0005, ERROR_LOC(loc));
}
+#endif
return create_axis_step_type(tm, testNodeKind, testNodeName, inQuant, false);
@@ -930,6 +936,7 @@
case axis_kind_ancestor:
{
+#ifdef THROW_XPST0005
// Doc nodes do not have ancestors
if (inNodeKind == store::StoreConsts::documentNode)
{
@@ -943,6 +950,7 @@
{
throw XQUERY_EXCEPTION(err::XPST0005, ERROR_LOC(loc));
}
+#endif
if (testNodeKind == store::StoreConsts::elementNode)
{
@@ -988,6 +996,7 @@
case axis_kind_self:
{
self:
+#ifdef THROW_XPST0005
// The node kind of the self node must be compatible with the NodeTest.
if (testNodeKind != store::StoreConsts::anyNode
inNodeKind != store::StoreConsts::anyNode
@@ -1003,6 +1012,7 @@
{
throw XQUERY_EXCEPTION(err::XPST0005, ERROR_LOC(loc));
}
+#endif
switch (inNodeKind)
{
@@ -1095,6 +1105,7 @@
case axis_kind_descendant:
case axis_kind_child:
{
+#ifdef THROW_XPST0005
if (inNodeKind == store::StoreConsts::attributeNode ||
inNodeKind == store::StoreConsts::textNode ||
inNodeKind == store::StoreConsts::piNode ||
@@ -1108,6 +1119,7 @@
{
throw XQUERY_EXCEPTION(err::XPST0005, ERROR_LOC(loc));
}
+#endif
switch (testNodeKind)
{
@@ -1135,6 +1147,7 @@
case axis_kind_attribute:
{
+#ifdef THROW_XPST0005
// only element nodes have attributes.
if (inNodeKind != store::StoreConsts::elementNode
inNodeKind != store::StoreConsts::anyNode)
@@ -1150,6 +1163,7 @@
{
throw XQUERY_EXCEPTION(err::XPST0005, ERROR_LOC(loc));
}
+#endif
if ((testKind == match_name_test wildKind == match_no_wild) ||
testKind == match_xs_attr_test)
@@ -1177,11 +1191,13 @@
case axis_kind_following:
case axis_kind_preceding:
{
+#ifdef THROW_XPST0005
if (inNodeKind == store::StoreConsts::documentNode ||
testNodeKind == store::StoreConsts::documentNode)
{
throw XQUERY_EXCEPTION(err::XPST0005, ERROR_LOC(loc));
}
+#endif
if ((axisKind == axis_kind_following_sibling ||
axisKind == axis_kind_preceding_sibling)
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-05-27 08:39:12 +
+++ test/fots/CMakeLists.txt 2013-05-28 19:59:31 +
@@ -184,8 +184,6 @@
EXPECTED_FOTS_FAILURE (fn-format-number numberformat83 1167643)
EXPECTED_FOTS_FAILURE (fn-format-number numberformat87 1167641)
EXPECTED_FOTS_FAILURE (fn-format-number numberformat88 1167641)
-EXPECTED_FOTS_FAILURE (fn-generate-id
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The attempt to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job language-bindings-install-fix-2013-05-28T19-44-04.031Z is finished. The final status was: 12 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/language-bindings-install-fix-2013-05-28T20-09-05.944Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job language-bindings-install-fix-2013-05-28T20-09-05.944Z is finished. The final status was: 13 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/schema-tools-errcode-2013-05-28T20-33-46.632Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-errcode into lp:zorba/schema-tools-module
Validation queue job schema-tools-errcode-2013-05-28T20-33-46.632Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-errcode/+merge/165958 Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/language-bindings-install-fix-2013-05-28T20-58-51.841Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The attempt to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job language-bindings-install-fix-2013-05-28T20-58-51.841Z is finished. The final status was: 12 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pdf-installer-fix-2013-05-28T21-22-42.261Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
Validation queue job pdf-installer-fix-2013-05-28T21-22-42.261Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module
The proposal to merge lp:~zorba-coders/zorba/pdf-installer-fix into lp:zorba/read-pdf-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 -- https://code.launchpad.net/~zorba-coders/zorba/pdf-installer-fix/+merge/166107 Your team Zorba Coders is subscribed to branch lp:zorba/read-pdf-module. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bump-module-versions-2013-05-28T22-13-41.937Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
Validation queue job bump-module-versions-2013-05-28T22-13-41.937Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165976 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/lang-bindings-install-fix into
lp:~zorba-coders/zorba/zorba-2.9.
Commit message:
Fixes for php in Ubuntu Packages.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151
Fixes for php in Ubuntu Packages.
--
https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151
Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2013-03-28 01:00:17 +
+++ cmake_modules/ZorbaModule.cmake 2013-05-28 23:06:29 +
@@ -519,7 +519,7 @@
# Copy jar to jars/ directory and add relative path to classpath file
GET_FILENAME_COMPONENT (_output_filename ${_jar_file} NAME)
ADD_COPY_RULE (LIB ${_jar_file} jars/${_output_filename}
- ${JAR_TARGET} 1 ${JAR_TEST_ONLY})
+${JAR_TARGET} 1 ${JAR_TEST_ONLY})
FILE (APPEND ${_CP_FILE} ${_output_filename}\n)
ENDIF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt 2013-04-17 18:27:03 +
+++ swig/php/CMakeLists.txt 2013-05-28 23:06:29 +
@@ -56,12 +56,6 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../${ZORBA_API_HEADER} ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_API_HEADER})
ENDFOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
- # The following fix was added because of the changes in CMake 2.8, which have the
- # result of naming the java binding library liblibzorba_api.so instead of libzorba_api.so
- IF (LINUX OR CYGWIN OR APPLE)
-SET_TARGET_PROPERTIES (${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PREFIX )
- ENDIF (LINUX OR CYGWIN OR APPLE)
-
#set project folder location for IDEs
SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL PHP FOLDER APIs)
@@ -75,7 +69,7 @@
FILES
${CMAKE_CURRENT_BINARY_DIR}/Zorba/XQueryProcessor.php
${CMAKE_CURRENT_BINARY_DIR}/Zorba/zorba_api_wrapper.php
-${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.so
+${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so
DESTINATION ${PHP5_INSTALL_PATH}
)
ELSE (NOT WIN32 OR CYGWIN)
--
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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 -- https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/lang-bindings-install-fix-2013-05-28T23-11-48.161Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
Validation queue job lang-bindings-install-fix-2013-05-28T23-11-48.161Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9 has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 -- https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-05-28T23-35-52.117Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message): Validation queue job markos-scratch-2013-05-28T23-35-52.117Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-29T00-12-41.575Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-05-29T00-12-41.575Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-05-29T00-36-43.132Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 -- https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
Review: Disapprove The merge got mangled somehow, I will try again. -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions into lp:zorba has been updated. Status: Needs review = Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165978 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions-2.9.1 into lp:zorba
Chris Hillery has proposed merging
lp:~zorba-coders/zorba/bump-module-versions-2.9.1 into lp:zorba.
Commit message:
Bump certain non-core modules to zorba-2.9.1 tag.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions-2.9.1/+merge/166162
--
https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions-2.9.1/+merge/166162
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-05-07 08:39:33 +
+++ CMakeLists.txt 2013-05-29 00:54:29 +
@@ -479,7 +479,7 @@
# zorba versioning
SET(ZORBA_MAJOR_NUMBER 2)
SET(ZORBA_MINOR_NUMBER 9)
-SET(ZORBA_PATCH_NUMBER 0)
+SET(ZORBA_PATCH_NUMBER 1)
SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
MESSAGE(STATUS Zorba version number: ${ZORBA_VERSION})
=== modified file 'NOTICE.txt'
--- NOTICE.txt 2013-05-07 08:39:33 +
+++ NOTICE.txt 2013-05-29 00:54:29 +
@@ -1,5 +1,5 @@
---
-Zorba 2.9.0
+Zorba 2.9.1
---
(Note: This file is generated automatically from NOTICE.xml.
=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf 2013-05-22 07:01:40 +
+++ modules/ExternalModules.conf 2013-05-29 00:54:29 +
@@ -29,7 +29,7 @@
archive bzr lp:zorba/archive-module zorba-2.9
csv bzr lp:zorba/csv-module zorba-2.9
data-cleaning bzr lp:zorba/data-cleaning-modulezorba-2.9
-data-formatting bzr lp:zorba/data-formatting-module zorba-2.9
+data-formatting bzr lp:zorba/data-formatting-module zorba-2.9.1
excel bzr lp:zorba/excel-modulezorba-2.9
info-extraction bzr lp:zorba/info-extraction-module zorba-2.9
geo bzr lp:zorba/geo-module zorba-2.9
@@ -43,15 +43,13 @@
oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module zorba-2.9
oauth bzr lp:zorba/oauth-modulezorba-2.9
process bzr lp:zorba/process-module zorba-2.9
-read-pdfbzr lp:zorba/read-pdf-module zorba-2.9
+read-pdfbzr lp:zorba/read-pdf-module zorba-2.9.1
securitybzr lp:zorba/security-module zorba-2.9
system bzr lp:zorba/system-module zorba-2.9
email bzr lp:zorba/email-modulezorba-2.9
-util-jvmbzr lp:zorba/util-jvm-module zorba-2.9
-schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9
+util-jvmbzr lp:zorba/util-jvm-module zorba-2.9.1
+schema-toolsbzr lp:zorba/schema-tools-module zorba-2.9.1
stack bzr lp:zorba/stack-modulezorba-2.9
queue bzr lp:zorba/queue-modulezorba-2.9
couchbase bzr lp:zorba/couchbase-modulezorba-2.9
sqlite bzr lp:zorba/sqlite-module zorba-2.9
-
-
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-05-25 15:15:30 +
+++ src/compiler/translator/translator.cpp 2013-05-29 00:54:29 +
@@ -12655,6 +12655,7 @@
break;
}
+ TREE
case FunctionConsts::FN_MAP_2:
case FunctionConsts::FN_FILTER_2:
{
@@ -12668,6 +12669,21 @@
body = flworBody;
break;
}
+===
+ case FunctionConsts::FN_MAP_2:
+ case FunctionConsts::FN_FILTER_2:
+ {
+flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc, false);
+
+let_clause* lc = wrap_in_letclause(foArgs[0]);
+flworBody-add_clause(lc);
+foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc-get_var());
+
+flworBody-set_return_expr(generate_fn_body(f, foArgs, loc));
+body = flworBody;
+break;
+ }
+ MERGE-SOURCE
case FunctionConsts::FN_FUNCTION_LOOKUP_2:
{
bool varAdded = false;
=== modified file 'src/runtime/api/plan_iterator_wrapper.cpp'
=== modified file 'src/runtime/api/plan_iterator_wrapper.h'
--
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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions-2.9.1 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions-2.9.1/+merge/166162 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-module-versions-2.9.1 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-module-versions-2.9.1 into lp:zorba has been updated. Commit Message changed to: Bump certain non-core modules to zorba-2.9.1 tag. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions-2.9.1/+merge/166162 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions-2.9.1/+merge/166162 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-05-29T00-36-43.132Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166132 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-29T01-02-27.358Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-05-29T01-02-27.358Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166109 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
