[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-932374 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-932374 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 -- https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 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/bug-932374 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 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/bug-932374 into lp:zorba
Validation queue job bug-932374-2012-09-24T23-27-50.203Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 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/bug-932374 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-932374-2012-09-24T23-27-50.203Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 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/bug-932374 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 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/bug-932374 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-932374 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 -- https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127 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/bug-932374 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-932374 into
lp:zorba.
Commit message:
Now using \z instead of $ for ICU.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #932374 in Zorba: "FOTS fn:matches failing tests"
https://bugs.launchpad.net/zorba/+bug/932374
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127
Now using \z instead of $ for ICU.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-932374/+merge/126127
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/regex.cpp'
--- src/util/regex.cpp 2012-09-17 00:36:37 +
+++ src/util/regex.cpp 2012-09-24 23:22:36 +
@@ -93,6 +93,7 @@
char const *xq_flags ) {
icu_flags_t const icu_flags = convert_xquery_flags( xq_flags );
bool const i_flag = (icu_flags & UREGEX_CASE_INSENSITIVE) != 0;
+ bool const m_flag = (icu_flags & UREGEX_MULTILINE) != 0;
bool const q_flag = (icu_flags & UREGEX_LITERAL) != 0;
bool const x_flag = (icu_flags & UREGEX_COMMENTS) != 0;
@@ -235,6 +236,17 @@
case '\\':
got_backslash = true;
continue;
+case '$':
+ if ( q_flag )
+*icu_re += '\\';
+ else if ( !m_flag ) {
+zstring::const_iterator const temp = xq_c + 1;
+if ( temp == xq_re.end() ) {
+ icu_re->append( "\\z" );
+ continue;
+}
+ }
+ break;
case '(':
if ( q_flag )
*icu_re += '\\';
--
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/bug1001474 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1001474 into
lp:zorba.
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
Bug #1001474 in Zorba: "Need Windows validation queue"
https://bugs.launchpad.net/zorba/+bug/1001474
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116
--
https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/FindPHP5.cmake'
--- cmake_modules/FindPHP5.cmake 2012-09-17 00:36:37 +
+++ cmake_modules/FindPHP5.cmake 2012-09-24 22:22:23 +
@@ -58,6 +58,17 @@
)
MESSAGE(STATUS "Executable: " ${PHP5_EXECUTABLE})
+
+FIND_LIBRARY(PHP5_LIBRARY
+ NAMES php5ts php5
+ PATHS
+ /usr/bin
+ /usr/local/bin
+ ${PHP5_BINARY_DIR}
+ )
+
+MESSAGE(STATUS "Library: " ${PHP5_LIBRARY})
+
MARK_AS_ADVANCED(
PHP5_EXECUTABLE
PHP5_FOUND_INCLUDE_PATH
=== modified file 'modules/DownloadModules.cmake'
--- modules/DownloadModules.cmake 2012-09-17 00:36:37 +
+++ modules/DownloadModules.cmake 2012-09-24 22:22:23 +
@@ -24,7 +24,9 @@
# modules into (will be created if necessary)
# notags = if true: ignore tags, check out HEAD revision of module(s)
# (bzr only - svn uses different URLs for tags)
-
+# overwrite = if true: if module(s) is already in directory,
+# then erases first to create a new copy of module(s)
+#
# Figure out what directory we're running in - ExternalModules.txt is here too
get_filename_component (cwd ${CMAKE_CURRENT_LIST_FILE} PATH)
@@ -32,8 +34,7 @@
FIND_PROGRAM(svn svn DOC "subversion command line client")
# Find BZR
-FIND_PROGRAM(bzr bzr DOC "bazaar command line client")
-
+FIND_PROGRAM(bzr bzr DOC "bazaar command line client" PATH ${BZR_PATH})
# Check parameters
if (NOT outdir)
message (FATAL_ERROR "Please pass -Doutdir.")
@@ -78,10 +79,22 @@
if ("${_getmod}" EQUAL 1)
message ("Downloading module '${_modname}'...")
# We try three times, to account for network weirdnesses
- foreach (i 1 2 3)
- # First delete the output directory, in case there's a partial
- # download from a previous attempt
- file (REMOVE_RECURSE "${outdir}/${_modname}")
+ foreach (attempt 1 2 3)
+
+ #Initial directory status
+ if (${attempt} EQUAL 1)
+if (NOT EXISTS "${outdir}/${_modname}" OR overwrite)
+ MESSAGE (STATUS "Creating module..." )
+ set(overwrite TRUE)
+else (NOT EXISTS "${outdir}/${_modname}" OR overwrite)
+ MESSAGE (STATUS "Updating module..." )
+endif (NOT EXISTS "${outdir}/${_modname}" OR overwrite)
+ endif (${attempt} EQUAL 1)
+
+ # Deleting the output directory if indicated
+ if (overwrite)
+ file (REMOVE_RECURSE "${outdir}/${_modname}")
+ endif (overwrite)
set (_status)
@@ -90,8 +103,13 @@
message (FATAL_ERROR
"Subversion client not found - required for ${_modname} module!")
endif (NOT svn)
- execute_process (COMMAND "${svn}" checkout "${_modurl}" "${_modname}"
-WORKING_DIRECTORY "${outdir}" TIMEOUT 60 RESULT_VARIABLE _status)
+ if (overwrite)
+execute_process (COMMAND "${svn}" checkout "${_modurl}" "${_modname}"
+ WORKING_DIRECTORY "${outdir}" TIMEOUT 120 RESULT_VARIABLE _status)
+ else (overwrite)
+execute_process (COMMAND "${svn}" update "${_modurl}" "${_modname}"
+ WORKING_DIRECTORY "${outdir}" TIMEOUT 120 RESULT_VARIABLE _status)
+ endif (overwrite)
elseif (${_modvc} STREQUAL "bzr")
if (NOT bzr)
@@ -103,9 +121,16 @@
if (_modtag AND NOT notags)
set (_modtagargs "-r" "${_modtag}")
endif (_modtag AND NOT notags)
- execute_process (COMMAND "${bzr}" branch "${_modurl}" "${_modname}"
-${_modtagargs} WORKING_DIRECTORY "${outdir}" TIMEOUT 60
- RESULT_VARIABLE _status)
+ if (overwrite)
+execute_process (COMMAND "${bzr}" branch "${_modurl}" "${_modname}"
+ ${_modtagargs} WORKING_DIRECTORY "${outdir}" TIMEOUT 120
+ RESULT_VARIABLE _status)
+ else (overwrite)
+execute_process (COMMAND "${bzr}" pull
+ ${_modtagargs} WORKING_DIRECTORY "${outdir}/${_modname}" TIMEOUT 120
+ RESULT_VARIABLE _status)
+ endif (overwrite)
+
else (${_modvc} STREQUAL "svn")
message (FATAL_ERROR "Unknown vc-type '${_modvc}' for module "
@@ -117,10 +142,10 @@
# Success
break ()
else ("${_status}" EQUAL 0)
- message (WARNING "Attempt ${i}: Failed to download '${_modname}' (${_status})")
+ message (WARNING "Attempt ${attempt}: Failed to download '${_modname}' (${_status})")
endif ("${_status}" EQUAL 0)
- endforeach (i)
+ endforeach (attempt)
# Ensure we successfully downloaded something good
if (NOT EXISTS "${outdir}/${_modn
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/bug-950621 into lp:zorba
Validation queue job bug-950621-2012-09-24T21-02-24.705Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/bug-950621 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-950621-2012-09-24T21-02-24.705Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/bug-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/bug1053736 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 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/bug1053736 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1053736 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 -- https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 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/bug1053736 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 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/bug1053736 into lp:zorba
Validation queue job bug1053736-2012-09-24T20-25-31.284Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 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/bug1053736 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1053736-2012-09-24T20-25-31.284Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 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/bug1053736 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1053736 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 -- https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 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/bug1053736 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1053736 into lp:zorba has been updated. Commit Message changed to: Changing conditional, seems that this is an error on windows For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 -- https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088 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/bug1053736 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1053736 into
lp:zorba.
Commit message:
Changing conditional, seems that this is an error on windows
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
Bug #1053736 in Zorba: "JavaTest should be out if JDK is not installed"
https://bugs.launchpad.net/zorba/+bug/1053736
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088
Changing conditional, seems that this is an error on windows
--
https://code.launchpad.net/~zorba-coders/zorba/bug1053736/+merge/126088
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/rbkt/modules/java/CMakeLists.txt'
--- test/rbkt/modules/java/CMakeLists.txt 2012-09-17 00:36:37 +
+++ test/rbkt/modules/java/CMakeLists.txt 2012-09-24 20:22:20 +
@@ -19,7 +19,7 @@
COMPARE_VERSION_STRINGS (${CMAKE_VERSION} "2.8.6" RESULT)
IF (${RESULT} GREATER -1)
FIND_PACKAGE (Java COMPONENTS Development)
- IF (Java_Development_FOUND)
+ IF (Java_JAVAC_EXECUTABLE)
INCLUDE (UseJava)
# Declare two "different" jars, for testing
--
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/jsoniq-error-code-fixes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Validation queue job jsoniq-error-code-fixes-2012-09-24T17-47-49.386Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/bug-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/jsoniq-error-code-fixes into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-error-code-fixes-2012-09-24T17-47-49.386Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/bug-950621 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job bug-950621-2012-09-24T17-23-59.183Z 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/bug-950621/+merge/123655 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/jsoniq-error-code-fixes into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 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/jsoniq-error-code-fixes into lp:zorba
Till Westmann has proposed merging lp:~zorba-coders/zorba/jsoniq-error-code-fixes into lp:zorba. Commit message: s/JNTY0003/JNTY0024/ s/JSDY0040/JNDY0040/ s/JSDY0020/JNTY0020/ s/JSDY0021/JNDY0021/ doc fixes for jn:parse-json Requested reviews: Ghislain Fourny (gislenius) Till Westmann (tillw) Related bugs: Bug #1055596 in Zorba: "rename JNTY0003 to JNTY0024" https://bugs.launchpad.net/zorba/+bug/1055596 Bug #1055599 in Zorba: "rename JSDY0020 to JNTY0020" https://bugs.launchpad.net/zorba/+bug/1055599 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 s/JNTY0003/JNTY0024/ s/JSDY0040/JNDY0040/ s/JSDY0020/JNTY0020/ s/JSDY0021/JNDY0021/ doc fixes for jn:parse-json -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-error-code-fixes/+merge/126060 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'include/zorba/pregenerated/diagnostic_list.h' --- include/zorba/pregenerated/diagnostic_list.h 2012-09-20 18:20:33 + +++ include/zorba/pregenerated/diagnostic_list.h 2012-09-24 17:23:49 + @@ -851,13 +851,13 @@ extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0023; -extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0003; - -extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0040; - -extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0020; - -extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0021; +extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0024; + +extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNDY0040; + +extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0020; + +extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNDY0021; #endif } // namespace jerr === modified file 'modules/org/jsoniq/www/functions.xq' --- modules/org/jsoniq/www/functions.xq 2012-09-21 18:25:49 + +++ modules/org/jsoniq/www/functions.xq 2012-09-24 17:23:49 + @@ -157,7 +157,7 @@ : : @return A sequence of JSON Object or Array item. : - : @error jerr:JSDY0040 if the given string is not valid JSON. + : @error jerr:JNDY0040 if the given string is not valid JSON. :) declare function jn:parse-json($j as xs:string?) as json-item()* external; @@ -172,10 +172,10 @@ : jsoniq-multiple-top-level-items: allow parsing of sequences of JSON Objects and Arrays (boolean; default: true) : : - : @error jerr:JSDY0040 if the given string is not valid JSON or - : if jsoniq-multiple-top-level-items is false and there is additionalx + : @error jerr:JNDY0040 if the given string is not valid JSON or + : if jsoniq-multiple-top-level-items is false and there is additional : content after the first JSON Object or Array. - : @error jerr:JSDY0041 if the value for the option + : @error jerr:JNTY0020 if the value for the option : jsoniq-multiple-top-level-items is not of type xs:boolean. : : @return a sequence of JSON Object or Array item. === modified file 'modules/org/jsoniq/www/pregenerated/errors.xq' --- modules/org/jsoniq/www/pregenerated/errors.xq 2012-09-20 19:24:53 + +++ modules/org/jsoniq/www/pregenerated/errors.xq 2012-09-24 17:23:49 + @@ -141,19 +141,19 @@ (:~ :objects or arrays don't have a string value :) -declare variable $jerr:JNTY0003 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0003"); +declare variable $jerr:JNTY0024 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0024"); (:~ :parser errors raised by the JSONIQLoader :) -declare variable $jerr:JSDY0040 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0040"); +declare variable $jerr:JNDY0040 as xs:QName := fn:QName($jerr:NS, "jerr:JNDY0040"); (:~ :parser error for invalid option type :) -declare variable $jerr:JSDY0020 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0020"); +declare variable $jerr:JNTY0020 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0020"); (:~ :parser error raised by jn:parse-json :) -declare variable $jerr:JSDY0021 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0021"); \ No newline at end of file +declare variable $jerr:JNDY0021 as xs:QName := fn:QName($jerr:NS, "jerr:JNDY0021"); \ No newline at end of file === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2012-09-21 07:02:07 + +++ src/diagnostics/diagnostic_en.xml 2012-09-24 17:23:49 + @@ -2706,24 +2706,22 @@ - + objects or arrays don't have a string value - $1 items do not have string value - + parser errors raised by the JSONIQLoader $1 - + parser error for invalid option type $1: invalid option type for option $2 (expected $3) - - + parser error raised by jn:parse-json $1 === modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp' --- src/diagnostics/pregenerated/diagnostic_list.cpp 2012-09-20 18:20:33 + +++ src/diagnostics/pregenerated/diagnostic_list.cpp 2012-09-24 17:23:49 + @@ -1252,16 +1252,16 @@ JSONiqErrorCode JNTY0023( "JNTY0023" ); -JSONiqErrorCode JNTY0003( "JNTY0003" ); - - -JSONiqErrorCode JSDY0040( "JSDY004
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-950621 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-950621-2012-09-24T17-23-59.183Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/125880 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 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-2012-09-24T16-58-00.033Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 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/bug-950621 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-950621 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 -- https://code.launchpad.net/~zorba-coders/zorba/bug-950621/+merge/123655 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/zorba-bug1006311 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-bug1006311/+merge/118648 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-2012-09-24T16-58-00.033Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 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/125880 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 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
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Validation queue job objects-with-unordered-maps-and-const-char-star-2012-09-24T15-46-14.382Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/objects-with-unordered-maps-and-const-char-star-2012-09-24T15-46-14.382Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/xqdoc-extensions into lp:zorba
> - adjust date in the Copyright headers
done. Although it is a real pain. I even change the date in the automatic code
generation to 2012 (from 2008!). Thus, there are quite a lot of s/2008/2012
changes. Would be nice to implement a script to generate this thing
automatically. Year to put could be figured out by executing bzr log --limit 1.
>
> - defaults are not backwards compatible (e.g. functions are not included by
> default )
I do not understand. Can you give me an example?
>
> - fetch:content($module-uri) => fetch:content($module-uri, "MODULE")
done
>
> - we should mark the xqdoc:xqdoc function as deprecated (@deprecated tag)
done
>
> - we are getting more an more out of sync with the original xqdoc schema. Is
> there a way to extend the schema?
I started to create a zorba-xqdoc schema. But I gave up after some point. It
became too confused. For collections and indexes, it would make sense to create
an additional schema (except that we would have to deals which two different
namespaces). But they are many little changes which are not in the original
xqdoc. Mostly the annotation and custom element. Zorba should try to push them
into the original xqdoc. Afterwards, a separate schema for the collections and
indexes could be created.
>
> - in end_visit(const FunctionDecl& and end_visit(const GlobalVarDecl
>it would be nice if you could do the following check at the beginning and
> don't change the indentation of the remaining body of the function
> if (!(theOptions & xqdoc_component_functions/variables))
> {
> return
> }
>
> This would reduce the size of the diff significantly
done
>
> - a collection is output as
>
> foo:bar
>
>
> But foo:bar is the QName not the URI. We should either only include the
> localname or separate the two components in separate elements (although the ns
> will always be the module's namespace).
Implemented variant 1. But I am not so happy. Because variables and functions
should be cleaned up too. But I don't have the patience for this. Because it
will destroy the zorba module documentation generation. This needs to be fixed
by someone else.
>
> - The following index declarations leads to an empty sources element.
>
> declare index foo:index
> on nodes db:collection(xs:QName("foo:bar"))
> by xs:string(./@id) as xs:string;
>
> =>
> foo:index
>
>
>
> Also, there is the same problem with the uri element than for collections.
Should be fixed now.
Additionally, I fixed the following issues:
- xqdoc comment generation for indices and collections
- test for indexes and collections
- type into type element (and not custom element)
- removed sources element
--
https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662
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
