Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_image-module into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Your team Zorba Coders is subscribed to branch lp:zorba/image-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/archive_windows_fix into lp:zorba/archive-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/archive_windows_fix
into lp:zorba/archive-module.
Commit message:
Changes for Windows Compilation
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
Changes for Windows Compilation
--
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.
=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp 2013-09-16 18:45:03 +
+++ src/archive_module.xq.src/archive_module.cpp 2013-10-22 21:40:37 +
@@ -30,6 +30,7 @@
#ifdef WIN32
# include strptime.h
#ifndef _WIN64
+# include Windows.h
# include MMSystem.h
#endif
#endif
@@ -168,7 +169,7 @@
}
}
- zorba::Item
+ zorba::Item
ArchiveModule::getGlobalItems(enum ArchiveModule::GLOBAL_ITEMS g)
{
switch(g)
=== modified file 'src/archive_module.xq.src/archive_module.h'
--- src/archive_module.xq.src/archive_module.h 2013-08-06 22:13:42 +
+++ src/archive_module.xq.src/archive_module.h 2013-10-22 21:40:37 +
@@ -107,7 +107,7 @@
static void
parseDateTimeItem(const zorba::Item i, time_t);
- static zorba::Item getGlobalItems(enum GLOBAL_ITEMS g);
+ static zorba::Item getGlobalItems(enum GLOBAL_ITEMS g);
};
--
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/process_windows_fix into lp:zorba/process-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/process_windows_fix
into lp:zorba/process-module.
Commit message:
Updated EXPECTED_FAILURES for windows
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/process_windows_fix/+merge/192252
Updated EXPECTED_FAILURES for windows
--
https://code.launchpad.net/~zorba-coders/zorba/process_windows_fix/+merge/192252
Your team Zorba Coders is subscribed to branch lp:zorba/process-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-04-17 09:36:10 +
+++ CMakeLists.txt 2013-10-22 21:41:31 +
@@ -28,7 +28,14 @@
ADD_TEST_DIRECTORY (${PROJECT_SOURCE_DIR}/test)
IF (WIN32)
- EXPECTED_FAILURE (zorba_process_module/process.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process1-01.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process2-01.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process2-02.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process2-03.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process2-04.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process2-05.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process2-06.xq 866979)
+ EXPECTED_FAILURE (zorba_process_module/process2-07.xq 866979)
ENDIF (WIN32)
DONE_DECLARING_ZORBA_URIS()
--
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/process_windows_fix into lp:zorba/process-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/process_windows_fix/+merge/192252 Your team Zorba Coders is subscribed to branch lp:zorba/process-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/archive_windows_fix into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251 Your team Zorba Coders is subscribed to branch lp:zorba/archive-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/php_windows_fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253 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/php_windows_fix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/php_windows_fix into
lp:zorba.
Commit message:
Solved Linker error when building the php bindings.
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253
Solved Linker error when building the php bindings.
--
https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/internal/diagnostic.h'
--- include/zorba/internal/diagnostic.h 2013-09-13 21:42:43 +
+++ include/zorba/internal/diagnostic.h 2013-10-22 21:42:17 +
@@ -262,9 +262,7 @@
* @param j The second location.
* @return Returns \c true only if the two locations are not equal.
*/
-inline bool operator!=( location const i, location const j ) {
- return !(i == j);
-}
+bool operator!=( location const i, location const j );
///
=== modified file 'src/diagnostics/diagnostic.cpp'
--- src/diagnostics/diagnostic.cpp 2013-09-13 21:43:08 +
+++ src/diagnostics/diagnostic.cpp 2013-10-22 21:42:17 +
@@ -66,6 +66,7 @@
ztd::equals( q1.ns(), q2.ns() );
}
+
bool operator==( QName const q1, char const *q2 ) {
if ( q2 ) {
if ( *q2 == '{' ) {
@@ -148,6 +149,10 @@
i.column_end_ == j.column_end_;
}
+bool operator!=( location const i, location const j ) {
+ return !(i == j);
+}
+
parameters const parameters::empty;
#define case_123456789 \
--
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/update3.0-xqdoc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0-xqdoc/+merge/189738 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/data-cleaning_reflection-changes into lp:zorba/data-cleaning-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/data-cleaning_reflection-changes into lp:zorba/data-cleaning-module. Commit message: Changed namespace of the reflection module used in conversion. Requested reviews: Juan Zacarias (juan457) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/data-cleaning_reflection-changes/+merge/191467 Changed namespace of the reflection module used in conversion. -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning_reflection-changes/+merge/191467 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. === modified file 'src/conversion.xq' --- src/conversion.xq 2013-08-09 09:37:05 + +++ src/conversion.xq 2013-10-16 17:06:59 + @@ -35,7 +35,7 @@ import module namespace http = http://www.zorba-xquery.com/modules/http-client;; -import module namespace reflection = http://www.zorba-xquery.com/modules/reflection;; +import module namespace reflection = http://zorba.io/modules/reflection;; declare namespace ver = http://zorba.io/options/versioning;; declare option ver:module-version 2.0; -- 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/data-cleaning_reflection-changes into lp:zorba/data-cleaning-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-cleaning_reflection-changes/+merge/191467 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-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/update3.0_reflection into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_reflection/+merge/189737 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-1192043-jqfiles into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-jqfiles/+merge/190751 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-1192043-image into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-image/+merge/190777 Your team Zorba Coders is subscribed to branch lp:zorba/image-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/update3.0_reflection into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0_reflection into lp:zorba. Commit message: Update reflection module to zorba 3.0 Requested reviews: Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0_reflection/+merge/189737 Update reflection module to zorba 3.0 -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_reflection/+merge/189737 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/xqdoc/images/modules.svg' --- doc/zorba/xqdoc/images/modules.svg 2013-09-30 19:49:06 + +++ doc/zorba/xqdoc/images/modules.svg 2013-10-07 23:27:33 + @@ -1096,14 +1096,14 @@ /g !-- 8 -- g id=node190 class=nodetitle8/title -a xlink:href=../www.zorba-xquery.com_modules_reflection.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/reflection; +a xlink:href=../www.zorba-xquery.com_modules_reflection.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/reflection; ellipse fill=white stroke=white cx=6175 cy=-385 rx=44.2946 ry=18/ text text-anchor=middle x=6175 y=-381.3 font-family=Times,serif font-size=14.00 fill=redreflection/text /a /g !-- 79#45;gt;8 -- g id=edge260 class=edgetitle79-gt;8/title -a xlink:title=FROM: http://zorba.io/modules/data-cleaning/conversion, TO: http://www.zorba-xquery.com/modules/reflection; +a xlink:title=FROM: http://zorba.io/modules/data-cleaning/conversion, TO: http://zorba.io/modules/reflection; path fill=none stroke=black d=M5340.25,-533.988C5441.03,-527.765 5681.28,-513.298 5883,-504 5895.22,-503.437 6092.35,-502.011 6103,-496 6135.08,-477.896 6155.33,-438.903 6165.91,-412.553/ polygon fill=black stroke=black points=6169.21,-413.733 6169.5,-403.142 6162.67,-411.239 6169.21,-413.733/ /a === modified file 'doc/zorba/xqdoc/images/modules_new.svg' --- doc/zorba/xqdoc/images/modules_new.svg 2013-10-06 23:04:13 + +++ doc/zorba/xqdoc/images/modules_new.svg 2013-10-07 23:27:33 + @@ -1102,16 +1102,30 @@ /g !-- 7 -- g id=node188 class=nodetitle7/title + TREE a xlink:href=../www.zorba-xquery.com_modules_reflection.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/reflection; ellipse fill=white stroke=white cx=7907 cy=-407 rx=57.9828 ry=18.3848/ text text-anchor=middle x=7907 y=-403.4 font-family=Times Roman,serif font-size=14.00 fill=redreflection/text +=== +a xlink:href=../www.zorba-xquery.com_modules_reflection.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/reflection; +ellipse fill=white stroke=white cx=7227 cy=-407 rx=57.9828 ry=18.3848/ +text text-anchor=middle x=7227 y=-403.4 font-family=Times Roman,serif font-size=14.00 fill=redreflection/text + MERGE-SOURCE /a /g + TREE !-- 60#45;gt;7 -- g id=edge239 class=edgetitle60-gt;7/title a xlink:title=FROM: http://zorba.io/modules/data-cleaning/conversion, TO: http://www.zorba-xquery.com/modules/reflection; path fill=none stroke=black d=M7401.6,-554.442C7415.44,-547.326 7432.58,-539.785 7449,-536 7469.14,-531.357 7802.73,-537.677 7821,-528 7858.44,-508.163 7883.26,-463.897 7896.23,-434.763/ polygon fill=black stroke=black points=7899.47,-436.091 7900.18,-425.52 7893.03,-433.343 7899.47,-436.091/ +=== +!-- 58#45;gt;7 -- +g id=edge233 class=edgetitle58-gt;7/title +a xlink:title=FROM: http://zorba.io/modules/data-cleaning/conversion, TO: http://zorba.io/modules/reflection; +path fill=none stroke=black d=M6220.2,-567.377C6342.92,-560.446 6622.03,-545.182 6857,-536 6872.77,-535.384 7127.08,-535.436 7141,-528 7178.38,-508.038 7203.22,-463.808 7216.21,-434.715/ +polygon fill=black stroke=black points=7219.44,-436.056 7220.16,-425.486 7213,-433.301 7219.44,-436.056/ + MERGE-SOURCE /a /g !-- 61 -- === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-10-03 08:28:18 + +++ modules/CMakeLists.txt 2013-10-07 23:27:33 + @@ -29,6 +29,7 @@ ADD_SUBDIRECTORY(w3c) ADD_SUBDIRECTORY(xml) ADD_SUBDIRECTORY(zorba-query) +ADD_SUBDIRECTORY(reflection) # Add external module projects - any subdirectories of a directory === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-01 03:34:33 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-07 23:27:33 + @@ -17,8 +17,6 @@ URI http://www.zorba-xquery.com/modules/datetime;) DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0 URI http://www.zorba-xquery.com/modules/fetch;) -DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0 - URI http://www.zorba-xquery.com/modules/reflection;) DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 URI http://www.zorba-xquery.com/modules/uri;) DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 === added directory 'modules/reflection' === added file 'modules/reflection/CMakeLists.txt' --- modules/reflection/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/reflection/CMakeLists.txt 2013-10-07 23:27:33 + @@ -0,0 +1,2
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0-xqdoc into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0-xqdoc into lp:zorba. Commit message: Update xqdoc module to zorba 3.0 Requested reviews: Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0-xqdoc/+merge/189738 Update xqdoc module to zorba 3.0 -- https://code.launchpad.net/~zorba-coders/zorba/update3.0-xqdoc/+merge/189738 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq' --- doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-05 00:21:53 + +++ doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-07 23:28:21 + @@ -15,7 +15,7 @@ :) import module namespace file = http://expath.org/ns/file;; -import module namespace xqdoc = http://www.zorba-xquery.com/modules/xqdoc;; +import module namespace xqdoc = http://zorba.io/modules/xqdoc;; import module namespace batch = http://www.zorba-xquery.com/modules/xqdoc/batch;; import module namespace fetch = http://www.zorba-xquery.com/modules/fetch;; import module namespace xqdoc-html = http://www.zorba-xquery.com/xqdoc-html; at xqdoc-html.xqy; === modified file 'doc/zorba/xqdoc/src/xqdoc-html.xqy' --- doc/zorba/xqdoc/src/xqdoc-html.xqy 2013-08-09 09:04:36 + +++ doc/zorba/xqdoc/src/xqdoc-html.xqy 2013-10-07 23:28:21 + @@ -18,7 +18,7 @@ import module namespace file = http://expath.org/ns/file;; -import module namespace xqdoc = http://www.zorba-xquery.com/modules/xqdoc;; +import module namespace xqdoc = http://zorba.io/modules/xqdoc;; import module namespace batch = http://www.zorba-xquery.com/modules/xqdoc/batch;; declare namespace xqd = http://www.xqdoc.org/1.0;; === modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy' --- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-09-17 00:26:50 + +++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-07 23:28:21 + @@ -27,7 +27,7 @@ import module namespace functx = http://www.functx.com;; import module namespace dot = http://www.zorba-xquery.com/modules/image/graphviz;; -import module namespace xqd = http://www.zorba-xquery.com/modules/xqdoc;; +import module namespace xqd = http://zorba.io/modules/xqdoc;; import module namespace fetch = http://www.zorba-xquery.com/modules/fetch;; import module namespace dml = http://www.zorba-xquery.com/modules/store/static/collections/dml;; import module namespace ddl = http://www.zorba-xquery.com/modules/store/static/collections/ddl;; === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-10-03 08:28:18 + +++ modules/CMakeLists.txt 2013-10-07 23:28:21 + @@ -27,10 +27,10 @@ ADD_SUBDIRECTORY(store) ADD_SUBDIRECTORY(structured-items) ADD_SUBDIRECTORY(w3c) -ADD_SUBDIRECTORY(xml) +ADD_SUBDIRECTORY(xml) +ADD_SUBDIRECTORY(xqdoc) ADD_SUBDIRECTORY(zorba-query) - # Add external module projects - any subdirectories of a directory # named zorba_modules as a sibling to the main Zorba source # directory. === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-01 03:34:33 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-07 23:28:21 + @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;) DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0 URI http://www.zorba-xquery.com/modules/datetime;) DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0 @@ -21,10 +20,6 @@ URI http://www.zorba-xquery.com/modules/reflection;) DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0 URI http://www.zorba-xquery.com/modules/uri;) -DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 - URI http://www.zorba-xquery.com/modules/xqdoc;) -DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd - URI http://www.zorba-xquery.com/modules/xqdoc-options;) # Subdirectories === modified file 'modules/com/zorba-xquery/www/modules/xqdoc/batch.xq' --- modules/com/zorba-xquery/www/modules/xqdoc/batch.xq 2013-08-09 08:27:30 + +++ modules/com/zorba-xquery/www/modules/xqdoc/batch.xq 2013-10-07 23:28:21 + @@ -30,7 +30,7 @@ import module namespace file = http://expath.org/ns/file;; -import module namespace xqdoc = http://www.zorba-xquery.com/modules/xqdoc;; +import module namespace xqdoc = http://zorba.io/modules/xqdoc;; import module namespace menu = http://www.zorba-xquery.com/modules/xqdoc/menu;; import module namespace html = http://www.zorba-xquery.com/modules/xqdoc/html;; === added directory 'modules/xqdoc' === added file 'modules/xqdoc/CMakeLists.txt' --- modules/xqdoc/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/xqdoc/CMakeLists.txt 2013-10-07 23:28:21 + @@ -0,0 +1,5 @@ +DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;) +DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0 + URI http://zorba.io/modules/xqdoc
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/win-fix into lp:zorba
In Windows you do, you can't have precompiler headers in between a function paramater. -- https://code.launchpad.net/~zorba-coders/zorba/win-fix/+merge/189190 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/win-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/win-fix/+merge/189190 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/win-fix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/win-fix into lp:zorba.
Commit message:
Fix for Windows
Requested reviews:
Juan Zacarias (juan457)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/win-fix/+merge/189190
Fix for Windows
--
https://code.launchpad.net/~zorba-coders/zorba/win-fix/+merge/189190
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/seq/seq_impl.cpp'
--- src/runtime/seq/seq_impl.cpp 2013-10-01 23:33:19 +
+++ src/runtime/seq/seq_impl.cpp 2013-10-03 23:06:58 +
@@ -34,8 +34,16 @@
inline Item_set_type* new_Item_set( TypeManager const *tm, long tz,
XQPCollator *coll, QueryLoc const loc ) {
+ int lBucketCount =
+#ifdef WIN32
+11
+#else
+ztd::prime_rehash_policy::default_bucket_count
+#endif /* WIN32 */
+ ;
+
return new Item_set_type(
-ztd::prime_rehash_policy::default_bucket_count,
+lBucketCount,
Item_set_type::hasher(),
Item_value_equal( tm, tz, coll, loc )
);
--
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/update3.0_datetime-module into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_datetime-module/+merge/172685 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/jsound-validator into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/jsound-validator/+merge/186908 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/bug1133806_xqxq_base_uri into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1133806_xqxq_base_uri/+merge/168020 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/zorba-windows-fix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/zorba-windows-fix
into lp:zorba.
Commit message:
Fixes for Windows
Requested reviews:
Juan Zacarias (juan457)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/186634
Fixes for Windows
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/186634
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/http-client/json/http-client.xq.src/http_response_parser.cpp'
--- modules/http-client/json/http-client.xq.src/http_response_parser.cpp 2013-09-17 21:12:49 +
+++ modules/http-client/json/http-client.xq.src/http_response_parser.cpp 2013-09-19 19:35:55 +
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include algorithm
#include cassert
#include cstring
#include iostream
=== modified file 'src/context/dynamic_loader.cpp'
--- src/context/dynamic_loader.cpp 2013-09-17 21:12:49 +
+++ src/context/dynamic_loader.cpp 2013-09-19 19:35:55 +
@@ -222,7 +222,7 @@
std::vectorzstring lLibPath;
aSctx.get_full_lib_path(lLibPath);
- std::unique_ptrstd::istream modfile(0); // result file
+ std::unique_ptrstd::istream modfile(); // result file
if (lLibPath.size() != 0)
{
--
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-windows-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/186634 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-1135003-remove-static-build into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1135003-remove-static-build/+merge/180452 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/fots-notice into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fots-notice/+merge/136872 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/move-test-iterplan into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 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/update3.0_datetime-module into lp:zorba
updated -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_datetime-module/+merge/172685 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/update3.0_image-module into lp:zorba/image-module
Misses JSON validation -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Your team Zorba Coders is subscribed to branch lp:zorba/image-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/zorba-windows-fix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba. Commit message: Windows move for cmake Requested reviews: Juan Zacarias (juan457) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 Windows fix for cmake -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 Your team Zorba Coders is subscribed to branch lp:zorba. === renamed file 'modules/com/zorba-xquery/www/modules/cacert.pem' = 'modules/http-client/cacert.pem' -- 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/zorba-win64 into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/zorba-win64 into
lp:zorba.
Commit message:
Fixes for Windows64
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846
Fixes for Windows64
--
https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCPack.cmake'
--- CMakeCPack.cmake 2013-02-07 17:24:36 +
+++ CMakeCPack.cmake 2013-08-06 20:42:37 +
@@ -83,6 +83,11 @@
SET(CPACK_COMPONENT_THESAURUS_INSTALL_TYPES Full)
SET(CPACK_COMPONENT_CSHARP_SWIG_INSTALL_TYPES Full)
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_GROUP external_modules)
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DISPLAY_NAME schema tools module)
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_DESCRIPTION Install the functionalities of the schema tools module.)
+SET(CPACK_COMPONENT_ZORBA_SCHEMA_TOOLS_MODULE_INSTALL_TYPES Full)
+
INCLUDE(${CMAKE_BINARY_DIR}/CMakeCPackModules.cmake)
@@ -103,7 +108,7 @@
IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
IF(CMAKE_CL_64)
- SET(CPACK_SYSTEM_NAME win64-${CMAKE_SYSTEM_PROCESSOR})
+ SET(CPACK_SYSTEM_NAME win64-x64)
ELSE(CMAKE_CL_64)
SET(CPACK_SYSTEM_NAME win32-${CMAKE_SYSTEM_PROCESSOR})
ENDIF(CMAKE_CL_64)
=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
--- cmake_modules/Windows/ProxyFindModule.cmake 2013-02-07 17:24:36 +
+++ cmake_modules/Windows/ProxyFindModule.cmake 2013-08-06 20:42:37 +
@@ -123,6 +123,21 @@
# if not already provided add the program files directory
SET (SEARCH_PATHS ${ZORBA_THIRD_PARTY_REQUIREMENTS})
+
+ STRING (REGEX MATCHALL machine:x64 MACHINE_X64_FOUND ${CMAKE_EXE_LINKER_FLAGS})
+ IF(MACHINE_X64_FOUND)
+LIST (FIND SEARCH_PATHS C:/Program Files PRORAM_FILES_FOUND)
+IF (PRORAM_FILES_FOUND EQUAL -1)
+ SET (SEARCH_PATHS ${SEARCH_PATHS} C:/Program Files)
+ENDIF (PRORAM_FILES_FOUND EQUAL -1)
+ ELSE(MACHINE_X64_FOUND)
+LIST (FIND SEARCH_PATHS $ENV{ProgramFiles} PRORAM_FILES_FOUND)
+IF (PRORAM_FILES_FOUND EQUAL -1)
+ SET (SEARCH_PATHS ${SEARCH_PATHS} $ENV{ProgramFiles})
+ENDIF (PRORAM_FILES_FOUND EQUAL -1)
+ ENDIF(MACHINE_X64_FOUND)
+
+
LIST (FIND SEARCH_PATHS $ENV{ProgramFiles} PRORAM_FILES_FOUND)
IF (PRORAM_FILES_FOUND EQUAL -1)
SET (SEARCH_PATHS ${SEARCH_PATHS} $ENV{ProgramFiles})
=== modified file 'src/debugger/socket.h'
--- src/debugger/socket.h 2013-02-07 17:24:36 +
+++ src/debugger/socket.h 2013-08-06 20:42:37 +
@@ -21,12 +21,16 @@
#include zorba/debugger_exception.h
-#ifdef WIN32
+#ifdef _WIN64
+ typedef unsigned __int64 SOCKET;
+#else
+#ifdef _WIN32
typedef unsigned int __w64 SOCKET;
#else
# define INVALID_SOCKET -1
typedef int SOCKET;
#endif
+#endif
namespace 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-windows-fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/178848 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-win64 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zorba-win64/+merge/178846 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-1188061 into lp:zorba/stack-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553 Your team Zorba Coders is subscribed to branch lp:zorba/stack-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/python_installer_fix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/python_installer_fix
into lp:zorba.
Commit message:
Fix for python installer on Windows.
Requested reviews:
Juan Zacarias (juan457)
Rodolfo Ochoa (rodolfo-ochoa)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/python_installer_fix/+merge/174895
Fix for python installer on Windows.
--
https://code.launchpad.net/~zorba-coders/zorba/python_installer_fix/+merge/174895
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'swig/python/CMakeLists.txt'
--- swig/python/CMakeLists.txt 2013-02-07 17:24:36 +
+++ swig/python/CMakeLists.txt 2013-07-16 00:00:41 +
@@ -56,6 +56,7 @@
ELSE(NOT WIN32)
INSTALL ( FILES
${CMAKE_CURRENT_BINARY_DIR}/_zorba_api.pyd
+ ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.py
DESTINATION share/python
COMPONENT python_swig )
ENDIF(NOT WIN32)
--
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/python_installer_fix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/python_installer_fix/+merge/174895 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/win64-build into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/win64-build/+merge/174890 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/fix-basename-tests into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-basename-tests/+merge/174117 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/update3.0_string-module into lp:zorba
Added the implementation of the is-seekable function in the string module. Also removed the materialize from the test since it was doing nothing, since it returns a seekable stream by the file function read-text. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_string-module/+merge/171376 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/update3.0_node-position-module into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105 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/update3.0_info-extraction-module into lp:zorba/info-extraction-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_info-extraction-module/+merge/170463 Your team Zorba Coders is subscribed to branch lp:zorba/info-extraction-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/update3.0_geo-module into lp:zorba/geo-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_geo-module/+merge/170212 Your team Zorba Coders is subscribed to branch lp:zorba/geo-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/update3.0_string-module into lp:zorba
All the changes were addressed except for -I know that it's unrelated to the change but the example using file:read-text in the materialize function doesn't make sense anymore. Because read-text returns a seekable string it can be consumed more than once. The http-client would be the right example. Also, a is-seekable function would be great to have. Should I do this change? -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_string-module/+merge/171376 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/update3.0_data-cleaning-module into lp:zorba/data-cleaning-module
Changes done -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_data-cleaning-module/+merge/170213 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-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/update3.0_geoproj-module into lp:zorba/geoproj-module
The changes as made seem fine. Two concerns: 1. Are there any errors raised by the module functions? If so, are they documented? No errors are thrown by the module. 2. Matthias: This seems like it is an ideal candidate for JSONify-ing; would you agree? If so, what would you think is the priority? I'm tempted to merge this revision as it stands, and file a separate lower-priority bug to JSONify this module later if we have time. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_geoproj-module/+merge/170214 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-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/update3.0_geo-module into lp:zorba/geo-module
1. Very sorry for the mis-information, but this module should NOT have been moved into the zorba.io namespace. EXpath modules should remain in their expath.org/ns namespace. 2. Remove the how to build the module information from the XQDoc; XQDoc should only contain information on *using* the module, not building it. Move this information into a top-level README.txt file in the module. ok 3. Are there any errors which may be raised by these module functions? If so, are they documented? Actually there are, I will update it. 4. Why did you change the GEOS_VERSION_PATCH check in geo_functions.cpp ? It was breaking my windows build of the module, not sure why it wasn't happening before. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_geo-module/+merge/170212 Your team Zorba Coders is subscribed to branch lp:zorba/geo-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/update3.0_data-cleaning-module into lp:zorba/data-cleaning-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_data-cleaning-module/+merge/170213 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-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/install_couchbase_update into lp:zorba/couchbase-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/install_couchbase_update/+merge/171023 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-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/update3.0_node-position-module into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0_node-position-module into lp:zorba. Commit message: Updated node-position module to Zorba 3.0 format. Requested reviews: Chris Hillery (ceejatec) Related bugs: Bug #1189795 in Zorba: Update core module node-position https://bugs.launchpad.net/zorba/+bug/1189795 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105 Updated node-position module to Zorba 3.0 format. -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_node-position-module/+merge/173105 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'doc/zorba/xqdoc/images/modules.svg' --- doc/zorba/xqdoc/images/modules.svg 2013-06-25 03:55:20 + +++ doc/zorba/xqdoc/images/modules.svg 2013-07-04 22:33:25 + @@ -2045,7 +2045,7 @@ /g !-- 8 -- g id=node213 class=nodetitle8/title -a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-position; +a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/node-position; ellipse fill=white stroke=white cx=1293 cy=-172 rx=59.2173 ry=18/ text text-anchor=middle x=1293 y=-168.3 font-family=Times,serif font-size=14.00 fill=rednode-position/text /a === modified file 'doc/zorba/xqdoc/images/modules_new.svg' --- doc/zorba/xqdoc/images/modules_new.svg 2013-06-25 03:55:20 + +++ doc/zorba/xqdoc/images/modules_new.svg 2013-07-04 22:33:25 + @@ -2045,7 +2045,7 @@ /g !-- 8 -- g id=node213 class=nodetitle8/title -a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://www.zorba-xquery.com/modules/node-position; +a xlink:href=../modules_zorba_xquery_data_model_node_Node Position.html xlink:title=(Zorba-core) module uri=http://zorba.io/modules/node-position; ellipse fill=white stroke=white cx=1293 cy=-172 rx=59.2173 ry=18/ text text-anchor=middle x=1293 y=-168.3 font-family=Times,serif font-size=14.00 fill=rednode-position/text /a === modified file 'modules/CMakeLists.txt' --- modules/CMakeLists.txt 2013-06-28 02:33:07 + +++ modules/CMakeLists.txt 2013-07-04 22:33:25 + @@ -18,6 +18,7 @@ ADD_SUBDIRECTORY(xqxq) ADD_SUBDIRECTORY(w3c) ADD_SUBDIRECTORY(full-text) +ADD_SUBDIRECTORY(nodes) # Add external module projects - any subdirectories of a directory # named zorba_modules as a sibling to the main Zorba source === modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt' --- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-06-28 02:33:07 + +++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-07-04 22:33:25 + @@ -62,8 +62,6 @@ URI http://www.zorba-xquery.com/modules/node-reference;) DECLARE_ZORBA_MODULE(FILE reference.xq VERSION 1.0 URI http://www.zorba-xquery.com/modules/reference;) -DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0 - URI http://www.zorba-xquery.com/modules/node-position;) DECLARE_ZORBA_MODULE(FILE node.xq VERSION 2.0 URI http://www.zorba-xquery.com/modules/node;) DECLARE_ZORBA_MODULE(FILE item.xq VERSION 1.0 === added directory 'modules/nodes' === added file 'modules/nodes/CMakeLists.txt' --- modules/nodes/CMakeLists.txt 1970-01-01 00:00:00 + +++ modules/nodes/CMakeLists.txt 2013-07-04 22:33:25 + @@ -0,0 +1,2 @@ +DECLARE_ZORBA_MODULE(FILE node-position.xq VERSION 2.0 + URI http://zorba.io/modules/node-position;) \ No newline at end of file === renamed file 'modules/com/zorba-xquery/www/modules/node-position.xq' = 'modules/nodes/node-position.xq' --- modules/com/zorba-xquery/www/modules/node-position.xq 2013-06-15 16:20:18 + +++ modules/nodes/node-position.xq 2013-07-04 22:33:25 + @@ -1,4 +1,4 @@ -xquery version 1.0; +jsoniq version 1.0; (: : Copyright 2006-2011 The FLWOR Foundation. : @@ -16,28 +16,28 @@ :) (:~ - : This module provides a function (np:node-position) that, given a node, + : pThis module provides a function (np:node-position) that, given a node, : returns positional information about the node in the form of an xs:anyURI : item. The module also defines functions that use such positional information : to determine: (1) positional relationships between two nodes (e.g. if one : is the ancestor of another) and (2) positional properties of a single node - : (e.g. its level in the tree). - : - : Within this module, the term node position will be used to refer to an - : xs:anyURI item that is returned by the np:node-position function. + : (e.g. its level in the tree)./p + : p/ + : pWithin this module, the term node position will be used to refer to an + : xs:anyURI item that is returned by the np:node-position function./p : : @author Federico Cavalieri, Markos Zaharioudakis : : @project Zorba/XQuery Data Model/Node/Node Position :) -module namespace np = http://www.zorba
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_datetime-module into lp:zorba
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/update3.0_datetime-module into lp:zorba.
Commit message:
updated datetime module to the Zorba3.0 namespace.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_datetime-module/+merge/172685
Updated datetime module to the Zorba3.0 namespace.
--
https://code.launchpad.net/~zorba-coders/zorba/update3.0_datetime-module/+merge/172685
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt 2013-06-28 02:33:07 +
+++ modules/CMakeLists.txt 2013-07-02 22:00:50 +
@@ -16,6 +16,7 @@
ADD_SUBDIRECTORY(org)
ADD_SUBDIRECTORY(functx)
ADD_SUBDIRECTORY(xqxq)
+ADD_SUBDIRECTORY(dateTime)
ADD_SUBDIRECTORY(w3c)
ADD_SUBDIRECTORY(full-text)
=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-06-28 02:33:07 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-07-02 22:00:50 +
@@ -52,8 +52,6 @@
MARK_AS_ADVANCED(ZORBA_HAVE_CURL)
DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI http://www.xqdoc.org/1.0;)
-DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
- URI http://www.zorba-xquery.com/modules/datetime;)
DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
URI http://www.zorba-xquery.com/modules/fetch;)
DECLARE_ZORBA_MODULE(FILE math.xq VERSION 2.0
=== added directory 'modules/dateTime'
=== added file 'modules/dateTime/CMakeLists.txt'
--- modules/dateTime/CMakeLists.txt 1970-01-01 00:00:00 +
+++ modules/dateTime/CMakeLists.txt 2013-07-02 22:00:50 +
@@ -0,0 +1,2 @@
+DECLARE_ZORBA_MODULE(FILE datetime.xq VERSION 2.0
+ URI http://zorba.io/modules/datetime;)
\ No newline at end of file
=== renamed file 'modules/com/zorba-xquery/www/modules/datetime.xq' = 'modules/dateTime/datetime.xq'
--- modules/com/zorba-xquery/www/modules/datetime.xq 2013-06-25 03:55:20 +
+++ modules/dateTime/datetime.xq 2013-07-02 22:00:50 +
@@ -17,34 +17,34 @@
:)
(:~
- : This module provides functions to retrieve the current dateTime and to
- : parse dates and times.
- :
- : In contrast to the current-dateTime functions specified in
+ : pThis module provides functions to retrieve the current dateTime and to
+ : parse dates and times./p
+ : p/
+ : pIn contrast to the current-dateTime functions specified in
: a href=http://www.w3.org/TR/xpath-functions-30/;XQuery Functions and
: Operators/a, the functions in this module are nondeterministic, that is,
: they do not return the current dateTime from the dynamic context, but return
- : the actual value.
- :
- : Dates and times are parsed according to the format given by
- : a href=http://pubs.opengroup.org/onlinepubs/007904975/functions/strptime.html;strptime/a.
- : However, date and time values must be complete.
- : For a date, the year and either month and day or day of the year must have
- : been parsed.
- : For a time, the hour must have been parsed.
+ : the actual value./p
+ : p/
+ : pDates and times are parsed according to the format given by
+ : a href=http://pubs.opengroup.org/onlinepubs/007904975/functions/strptime.html;strptime/a./p
+ : pHowever, date and time values must be complete./p
+ : pFor a date, the year and either month and day or day of the year must have
+ : been parsed./p
+ : pFor a time, the hour must have been parsed.
: (If either the minute, second, or timezone has not been parsed, they default
- : to 0.)
- : For a dateTime, the parsing requirements of both date and time must be met.
- :
- : When a locale is given,
+ : to 0.)/p
+ : pFor a dateTime, the parsing requirements of both date and time must be met./p
+ : p/
+ : pWhen a locale is given,
: it must be of the form {lang}[{sep}{country}[{encoding}]] where
: {lang} is an ISO 639-1 2-letter or 639-2 3-letter language code,
: {sep} is either '-' or '_',
: {country} is an ISO 3166-1 2-letter country code,
- : and {encoding} is any string that begins with a '.'.
- : The {sep}, {country}, and {encoding} are optional;
- : {encoding} is always ignored.
- : Examples include: de, en-US, fr_CA, ru_RU.UTF-8.
+ : and {encoding} is any string that begins with a '.'./p
+ : pThe {sep}, {country}, and {encoding} are optional;
+ : {encoding} is always ignored./p
+ : pExamples include: de, en-US, fr_CA, ru_RU.UTF-8./p
:
: @author Matthias Brantner
: @author Paul J. Lucas
@@ -52,7 +52,7 @@
: @project Zorba/XQuery Data Model/Atomic/Datetime
:
:)
-module namespace datetime = http://www.zorba-xquery.com/modules/datetime;;
+module namespace datetime = http://zorba.io/modules/datetime;;
declare namespace an = http://www.zorba-xquery.com/annotations;;
declare namespace zerr = http://zorba.io/modules/zorba-errors;;
@@ -61,9 +61,9 @@
declare option ver:module-version 2.0;
(:~
- : Gets the current date value in Universal time.
- : Note that this function is not stable: it returns the value
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/171593 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/171593 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/171593 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/update3.0_info-extraction-module into lp:zorba/info-extraction-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0_info-extraction-module into lp:zorba/info-extraction-module. Commit message: Update to 3.0 Requested reviews: Chris Hillery (ceejatec) Related bugs: Bug #1188043 in Zorba: Update non-core module info-extraction https://bugs.launchpad.net/zorba/+bug/1188043 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0_info-extraction-module/+merge/170463 Update to 3.0 -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_info-extraction-module/+merge/170463 Your team Zorba Coders is subscribed to branch lp:zorba/info-extraction-module. === modified file 'src/CMakeLists.txt' --- src/CMakeLists.txt 2012-07-03 20:02:52 + +++ src/CMakeLists.txt 2013-06-19 22:53:34 + @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/info-extraction; FILE info-extraction-module.xq) +DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/info-extraction; FILE info-extraction-module.xq) -DECLARE_ZORBA_SCHEMA (URI http://www.zorba-xquery.com/modules/info-extraction; FILE info-extraction-module.xsd) +DECLARE_ZORBA_SCHEMA (URI http://zorba.io/modules/info-extraction; FILE info-extraction-module.xsd) === modified file 'src/info-extraction-module.xq' --- src/info-extraction-module.xq 2013-06-15 19:42:23 + +++ src/info-extraction-module.xq 2013-06-19 22:53:34 + @@ -17,14 +17,14 @@ :) (:~ - : This library module provides data extraction functions that return a list - : of entities, relations, categories and concepts present in a given text. + : pThis library module provides data extraction functions that return a list + : of entities, relations, categories and concepts present in a given text./p : : @author Pedro Antunes : @project Zorba/Data Cleaning/Info Extraction :) -module namespace ex = http://www.zorba-xquery.com/modules/info-extraction;; +module namespace ex = http://zorba.io/modules/info-extraction;; declare namespace ann = http://www.zorba-xquery.com/annotations;; @@ -35,9 +35,9 @@ import schema namespace h = http://expath.org/ns/http-client;; (:~ - : Uses Yahoo's Content Analysis webservice to return a list of entities - : encountered in the text supplied as input. - : See http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information. + : pUses Yahoo's Content Analysis webservice to return a list of entities + : encountered in the text supplied as input./p + : pSee http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information./p : : @param $text String to be analyzed : @return Sequence of recognized entities @@ -60,9 +60,9 @@ }; (:~ - : Uses Yahoo's Content Analysis webservice to return a list of categories (topics) related - : to the text supplied as input. - : See http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information. + : pUses Yahoo's Content Analysis webservice to return a list of categories (topics) related + : to the text supplied as input./p + : pSee http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information./p : : @param $text String to be analyzed : @return Sequence of recognized categories @@ -78,9 +78,9 @@ }; (:~ - : Uses Yahoo's Content Analysis webservice to return a list of relations (entities found and related wikipedia links) - : encountered in the text supplied as input. - : See http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information. + : pUses Yahoo's Content Analysis webservice to return a list of relations (entities found and related wikipedia links) + : encountered in the text supplied as input./p + : pSee http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information./p : : @param $text String to be analyzed : @return Sequence of recognized relations @@ -107,9 +107,9 @@ }; (:~ - : Uses Yahoo's Content Analysis webservice to return a list of concepts (entity found and the corresponding wikipedia link) - : encountered in the text supplied as input. - : See http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information. + : pUses Yahoo's Content Analysis webservice to return a list of concepts (entity found and the corresponding wikipedia link) + : encountered in the text supplied as input./p + : pSee http://developer.yahoo.com/search/content/V2/contentAnalysis.html for more information./p : : @param $text String to be analyzed : @return Sequence of recognized concepts @@ -136,8 +136,8 @@ }; (:~ - : Uses Yahoo's Content Analysis webservice to return the text supplied as input - : together with entities recognized annotated as xml elements in the text. + : pUses Yahoo's Content Analysis webservice to return the text supplied as input + : together with entities recognized annotated as xml elements
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_geoproj-module into lp:zorba/geoproj-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/update3.0_geoproj-module into lp:zorba/geoproj-module. Commit message: Changes for Update 3.0 Requested reviews: Chris Hillery (ceejatec) Related bugs: Bug #1188046 in Zorba: Update non-core module geoproj https://bugs.launchpad.net/zorba/+bug/1188046 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update3.0_geoproj-module/+merge/170214 Changes for Update 3.0 -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_geoproj-module/+merge/170214 Your team Zorba Coders is subscribed to branch lp:zorba/geoproj-module. === modified file 'src/CMakeLists.txt' --- src/CMakeLists.txt 2012-08-07 19:49:24 + +++ src/CMakeLists.txt 2013-06-18 22:44:26 + @@ -11,10 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# all external module libraries are generated in the directory -# of the corresponding .xq file -MESSAGE(STATUS Add com) -ADD_SUBDIRECTORY(com) - -MESSAGE(STATUS End modules) +DECLARE_ZORBA_SCHEMA (FILE geoproj-param.xsd + URI http://zorba.io/modules/geoproj-param;) +DECLARE_ZORBA_MODULE (URI http://zorba.io/modules/geoproj; VERSION 1.0 FILE geoproj.xq) === removed file 'src/com/CMakeLists.txt' --- src/com/CMakeLists.txt 2011-10-06 08:18:23 + +++ src/com/CMakeLists.txt 1970-01-01 00:00:00 + @@ -1,14 +0,0 @@ -# Copyright 2006-2008 The FLWOR Foundation. -# -# Licensed under the Apache License, Version 2.0 (the License); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an AS IS BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -ADD_SUBDIRECTORY(zorba-xquery) === removed file 'src/com/zorba-xquery/CMakeLists.txt' --- src/com/zorba-xquery/CMakeLists.txt 2011-10-06 08:18:23 + +++ src/com/zorba-xquery/CMakeLists.txt 1970-01-01 00:00:00 + @@ -1,14 +0,0 @@ -# Copyright 2006-2008 The FLWOR Foundation. -# -# Licensed under the Apache License, Version 2.0 (the License); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an AS IS BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -ADD_SUBDIRECTORY(www) === removed file 'src/com/zorba-xquery/www/CMakeLists.txt' --- src/com/zorba-xquery/www/CMakeLists.txt 2011-10-06 08:18:23 + +++ src/com/zorba-xquery/www/CMakeLists.txt 1970-01-01 00:00:00 + @@ -1,14 +0,0 @@ -# Copyright 2006-2008 The FLWOR Foundation. -# -# Licensed under the Apache License, Version 2.0 (the License); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an AS IS BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -ADD_SUBDIRECTORY(modules) === removed file 'src/com/zorba-xquery/www/modules/CMakeLists.txt' --- src/com/zorba-xquery/www/modules/CMakeLists.txt 2011-07-27 00:24:29 + +++ src/com/zorba-xquery/www/modules/CMakeLists.txt 1970-01-01 00:00:00 + @@ -1,16 +0,0 @@ -# Copyright 2006-2008 The FLWOR Foundation. -# -# Licensed under the Apache License, Version 2.0 (the License); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an AS IS BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -DECLARE_ZORBA_SCHEMA (FILE geoproj-param.xsd - URI http://www.zorba-xquery.com/modules/geoproj-param;) -DECLARE_ZORBA_MODULE (URI http://www.zorba-xquery.com/modules/geoproj; VERSION 1.0 FILE geoproj.xq) === removed file 'src/com/zorba-xquery/www/modules/geoproj-param.xsd' --- src/com/zorba-xquery/www/modules/geoproj-param.xsd 2011-08-05 02:22:02 + +++ src/com/zorba-xquery
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1187537 into lp:zorba
Review: Needs Fixing It has compiling errors on Windows. -- https://code.launchpad.net/~paul-lucas/zorba/bug-1187537/+merge/169567 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-1187537 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1187537/+merge/169567 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/windows-fixes into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/windows-fixes into
lp:zorba.
Commit message:
Fixes for Windows.
Requested reviews:
Juan Zacarias (juan457)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/windows-fixes/+merge/168194
Fixes for Windows.
--
https://code.launchpad.net/~zorba-coders/zorba/windows-fixes/+merge/168194
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/zorbatypes/decimal.h'
--- src/zorbatypes/decimal.h 2013-05-16 19:05:52 +
+++ src/zorbatypes/decimal.h 2013-06-07 21:27:00 +
@@ -408,7 +408,7 @@
return value_.sign();
}
-inline Decimal::operator explicit_bool::type() const {
+inline Decimal::operator internal::ztd::explicit_bool::type() const {
return explicit_bool::value_of( sign() );
}
=== modified file 'src/zorbatypes/integer.h'
--- src/zorbatypes/integer.h 2013-05-20 20:29:45 +
+++ src/zorbatypes/integer.h 2013-06-07 21:27:00 +
@@ -1215,7 +1215,7 @@
#endif /* ZORBA_WITH_BIG_INTEGER */
templateclass T
-inline IntegerImplT::operator explicit_bool::type() const {
+inline IntegerImplT::operator internal::ztd::explicit_bool::type() const {
return explicit_bool::value_of( sign() );
}
=== modified file 'src/zorbatypes/timezone.h'
--- src/zorbatypes/timezone.h 2013-05-22 16:12:01 +
+++ src/zorbatypes/timezone.h 2013-06-07 21:27:00 +
@@ -131,7 +131,7 @@
return gmtoff_;
}
-inline TimeZone::operator explicit_bool::type() const {
+inline TimeZone::operator internal::ztd::explicit_bool::type() const {
return explicit_bool::value_of( !timezone_not_set_ );
}
--
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:~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/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
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/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/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/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
[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. Status: Needs review = Approved 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
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-2.9.1 into lp:~zorba-coders/zorba/zorba-2.9
The proposal to merge lp:~zorba-coders/zorba/bump-2.9.1 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-2.9.1/+merge/165823 -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.9.1/+merge/165823 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-2.9.1 into lp:~zorba-coders/zorba/zorba-2.9
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.9.1/+merge/165823 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/data-formatting-installer-fix into lp:zorba/data-formatting-module
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/data-formatting-installer-fix into
lp:zorba/data-formatting-module.
Commit message:
Fix for Ubuntu Installer.
Requested reviews:
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-installer-fix/+merge/165914
Fix for Ubuntu Installer.
--
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-installer-fix/+merge/165914
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-06-14 12:40:01 +
+++ CMakeLists.txt 2013-05-27 16:30:48 +
@@ -19,14 +19,15 @@
PROJECT (zorba_data-formatting_module)
FIND_PACKAGE (zorba_util-jvm_module QUIET)
+INCLUDE (${zorba_util-jvm_module_USE_FILE})
IF (zorba_util-jvm_module_FOUND)
- INCLUDE (${zorba_util-jvm_module_USE_FILE})
-
- ZORBA_FIND_JNI()
- FIND_PACKAGE(Java)
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})
@@ -34,8 +35,6 @@
ENABLE_TESTING ()
INCLUDE (CTest)
-SET_CMAKE_MODULE_PATH ()
-
FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
INCLUDE (${Zorba_USE_FILE})
=== added file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 1970-01-01 00:00:00 +
+++ cmake_modules/FindJNI.cmake 2013-05-27 16:30:48 +
@@ -0,0 +1,292 @@
+# - Find JNI java libraries.
+# This module finds if Java is installed and determines where the
+# include files and libraries are. It also determines what the name of
+# the library is. This code sets the following variables:
+#
+# JNI_INCLUDE_DIRS = the include dirs to use
+# JNI_LIBRARIES = the libraries to use
+# JNI_FOUND = TRUE if JNI headers and libraries were found.
+# JAVA_AWT_LIBRARY = the path to the jawt library
+# JAVA_JVM_LIBRARY = the path to the jvm library
+# JAVA_INCLUDE_PATH = the include path to jni.h
+# JAVA_INCLUDE_PATH2= the include path to jni_md.h
+# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+#
+
+#=
+# 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.
+#=
+# (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)
+# Determine java arch-specific library subdir
+# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
+# 1.6.0_18 + icedtea patches. However, it would be much better to base the
+# guess on the first part of the GNU config.guess platform triplet.
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch amd64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^i.86$)
+SET(_java_libarch i386)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^alpha)
+SET(_java_libarch alpha)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^arm)
+# Subdir is arm for both big-endian (arm) and little-endian (armel).
+SET(_java_libarch arm)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^mips)
+# mips* machines are bi-endian mostly so processor does not tell
+# endianess of the underlying system.
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} mips mipsel mipseb)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc)64)
+SET(_java_libarch ppc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc))
+SET(_java_libarch ppc)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sparc)
+# Both flavours can run on the same processor
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} sparc sparcv9)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(parisc|hppa))
+SET(_java_libarch parisc parisc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^s390)
+# s390 binaries can run on s390x machines
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} s390 s390x)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sh)
+SET(_java_libarch sh)
+ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
+ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+
+# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
+# system is non-Linux (where the code above has not been well tested)
+IF(NOT _java_libarch
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/data-formatting-installer-fix into lp:zorba/data-formatting-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/data-formatting-installer-fix/+merge/165914 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-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/util-jvm-rpath into lp:zorba/util-jvm-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/util-jvm-rpath/+merge/163074 Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-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
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba.
Commit message:
php swig was creating the zorba_api.so with a wrong name.
Requested reviews:
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917
php swig was creating the zorba_api.so with a wrong name.
--
https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2013-05-21 23:46:23 +
+++ cmake_modules/ZorbaModule.cmake 2013-05-27 17:08:27 +
@@ -522,8 +522,10 @@
GET_FILENAME_COMPONENT (_jar_file ${_jar_file} REALPATH)
ENDIF (IS_SYMLINK ${_jar_file})
GET_FILENAME_COMPONENT (_output_filename ${_jar_file} NAME)
- ADD_COPY_RULE (LIB ${_jar_file} jars/${_output_filename}
- ${JAR_TARGET} 1 ${JAR_TEST_ONLY})
+ IF (WIN32)
+ADD_COPY_RULE (LIB ${_jar_file} jars/${_output_filename}
+ ${JAR_TARGET} 1 ${JAR_TEST_ONLY})
+ ENDIF (WIN32)
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-27 17:08:27 +
@@ -59,7 +59,7 @@
# 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 )
+SET_TARGET_PROPERTIES (zorba_api_php PROPERTIES PREFIX )
ENDIF (LINUX OR CYGWIN OR APPLE)
#set project folder location for IDEs
--
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-installer-fix into lp:zorba/schema-tools-module
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/schema-tools-installer-fix into
lp:zorba/schema-tools-module.
Commit message:
Changes for Ubuntu Packages.
Requested reviews:
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/schema-tools-installer-fix/+merge/165918
Changes for Ubuntu Packages.
--
https://code.launchpad.net/~zorba-coders/zorba/schema-tools-installer-fix/+merge/165918
Your team Zorba Coders is subscribed to branch lp:zorba/schema-tools-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-06-14 12:39:26 +
+++ CMakeLists.txt 2013-05-27 17:19:26 +
@@ -17,12 +17,15 @@
PROJECT (zorba_schema-tools_module)
FIND_PACKAGE (zorba_util-jvm_module QUIET)
+INCLUDE (${zorba_util-jvm_module_USE_FILE})
IF (zorba_util-jvm_module_FOUND)
- ZORBA_FIND_JNI()
- FIND_PACKAGE(Java)
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})
=== added file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 1970-01-01 00:00:00 +
+++ cmake_modules/FindJNI.cmake 2013-05-27 17:19:26 +
@@ -0,0 +1,310 @@
+# - Find JNI java libraries.
+# This module finds if Java is installed and determines where the
+# include files and libraries are. It also determines what the name of
+# the library is. This code sets the following variables:
+#
+# JNI_INCLUDE_DIRS = the include dirs to use
+# JNI_LIBRARIES = the libraries to use
+# JNI_FOUND = TRUE if JNI headers and libraries were found.
+# JAVA_AWT_LIBRARY = the path to the jawt library
+# JAVA_JVM_LIBRARY = the path to the jvm library
+# JAVA_INCLUDE_PATH = the include path to jni.h
+# JAVA_INCLUDE_PATH2= the include path to jni_md.h
+# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+#
+
+#=
+# 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.
+#=
+
+# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+MACRO(java_append_library_directories _var)
+# Determine java arch-specific library subdir
+# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
+# 1.6.0_18 + icedtea patches. However, it would be much better to base the
+# guess on the first part of the GNU config.guess platform triplet.
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch amd64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^i.86$)
+SET(_java_libarch i386)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^alpha)
+SET(_java_libarch alpha)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^arm)
+# Subdir is arm for both big-endian (arm) and little-endian (armel).
+SET(_java_libarch arm)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^mips)
+# mips* machines are bi-endian mostly so processor does not tell
+# endianess of the underlying system.
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} mips mipsel mipseb)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc)64)
+SET(_java_libarch ppc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/schema-tools-installer-fix into lp:zorba/schema-tools-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/schema-tools-installer-fix/+merge/165918 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
Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/language-bindings-install-fix into
lp:~zorba-coders/zorba/zorba-2.9.
Commit message:
Fix for php api Install.
Requested reviews:
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932
Fix for php api Install.
--
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.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2013-03-28 01:00:17 +
+++ cmake_modules/ZorbaModule.cmake 2013-05-27 19:56:34 +
@@ -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-27 19:56:34 +
@@ -59,7 +59,7 @@
# 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 )
+SET_TARGET_PROPERTIES (zorba_api_php PROPERTIES PREFIX )
ENDIF (LINUX OR CYGWIN OR APPLE)
#set project folder location for IDEs
--
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/165030 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 = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 -- https://code.launchpad.net/~zorba-coders/zorba/bump-module-versions/+merge/165030 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/install-symlink-jars into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/install-symlink-jars/+merge/164993 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/prune-rbkt into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/prune-rbkt/+merge/164088 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/winfix into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/winfix into lp:zorba.
Commit message:
Windows fix for src/util/stl_util.h
Requested reviews:
Juan Zacarias (juan457)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239
Windows fix for src/util/stl_util.h
--
https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/stl_util.h'
--- src/util/stl_util.h 2013-05-09 00:21:51 +
+++ src/util/stl_util.h 2013-05-16 17:42:32 +
@@ -421,10 +421,7 @@
return true;
}
-inline std::enable_if!ZORBA_TR1_NS::is_signedchar::value
-!ZORBA_TR1_NS::is_unsignedchar::value,
- bool::type
-ge0( char c ) {
+inline bool ge0( char c ) {
return c = 0;
}
@@ -440,10 +437,7 @@
return false;
}
-inline std::enable_if!ZORBA_TR1_NS::is_signedchar::value
-!ZORBA_TR1_NS::is_unsignedchar::value,
- bool::type
-lt0( char c ) {
+inline bool lt0( char c ) {
return c 0;
}
--
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/winfix into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/winfix/+merge/164239 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/164051 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/163627 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/163627 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/163627 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/util-jvm-rpath into lp:zorba/util-jvm-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/util-jvm-rpath into
lp:zorba/util-jvm-module.
Commit message:
Fixes for Debian Installers.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-rpath/+merge/163074
Fixes for Debian Installers.
--
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-rpath/+merge/163074
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.
=== added file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 1970-01-01 00:00:00 +
+++ cmake_modules/FindJNI.cmake 2013-05-09 00:10:32 +
@@ -0,0 +1,286 @@
+# - Find JNI java libraries.
+# This module finds if Java is installed and determines where the
+# include files and libraries are. It also determines what the name of
+# the library is. This code sets the following variables:
+#
+# JNI_INCLUDE_DIRS = the include dirs to use
+# JNI_LIBRARIES = the libraries to use
+# JNI_FOUND = TRUE if JNI headers and libraries were found.
+# JAVA_AWT_LIBRARY = the path to the jawt library
+# JAVA_JVM_LIBRARY = the path to the jvm library
+# JAVA_INCLUDE_PATH = the include path to jni.h
+# JAVA_INCLUDE_PATH2= the include path to jni_md.h
+# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+#
+
+#=
+# 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.
+#=
+# (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)
+# Determine java arch-specific library subdir
+# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
+# 1.6.0_18 + icedtea patches. However, it would be much better to base the
+# guess on the first part of the GNU config.guess platform triplet.
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch amd64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^i.86$)
+SET(_java_libarch i386)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^alpha)
+SET(_java_libarch alpha)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^arm)
+# Subdir is arm for both big-endian (arm) and little-endian (armel).
+SET(_java_libarch arm)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^mips)
+# mips* machines are bi-endian mostly so processor does not tell
+# endianess of the underlying system.
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} mips mipsel mipseb)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc)64)
+SET(_java_libarch ppc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc))
+SET(_java_libarch ppc)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sparc)
+# Both flavours can run on the same processor
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} sparc sparcv9)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(parisc|hppa))
+SET(_java_libarch parisc parisc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^s390)
+# s390 binaries can run on s390x machines
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} s390 s390x)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sh)
+SET(_java_libarch sh)
+ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
+ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+
+# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
+# system is non-Linux (where the code above has not been well tested)
+IF(NOT _java_libarch OR NOT CMAKE_SYSTEM_NAME MATCHES Linux)
+LIST(APPEND _java_libarch i386 amd64 ppc)
+ENDIF(NOT _java_libarch OR NOT CMAKE_SYSTEM_NAME MATCHES Linux)
+
+# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
+# current value to a hardcoded list. Remove possible duplicates.
+LIST(REMOVE_DUPLICATES _java_libarch)
+
+FOREACH(_path ${ARGN})
+IF(_path MATCHES {libarch})
+FOREACH(_libarch ${_java_libarch})
+STRING(REPLACE {libarch} ${_libarch} _newpath ${_path})
+LIST(APPEND ${_var} ${_newpath})
+ENDFOREACH(_libarch)
+ELSE(_path MATCHES {libarch})
+LIST(APPEND ${_var} ${_path})
+ENDIF(_path MATCHES {libarch})
+ENDFOREACH(_path)
+ENDMACRO(java_append_library_directories)
+
+GET_FILENAME_COMPONENT(java_install_version
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1064978 into lp:zorba
import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
variable $queryID := xqxq:prepare-main-module('declare variable $ext2
external; $ext2');
fn:local-name-from-QName(xqxq:variable-type-name($queryID, xs:QName('ext2')))
returns xs:anyType. Shouldn't it be anyType? I think the QName is not
constructed
correctly.
What do you mean is not being constructed correctly?
xs:anyType should not be a string constant in the code. I think this should
come from the typemanager.
The thing with the variables that doesn't have a type specified in code when
asked about the XQType of the variable using the function var-getType it
returns a NULL pointer that is why a set a constant value of xs:anyType, now
you don't want this to be constant what should I do then? create a new any
type XQType variable using the TypeManager and return it's schemaString()?
--
https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696
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/bug1064978 into lp:zorba
Why don't you use XQType::getQName to get the QName directly and return it? Because if the type is not atomic, if it is an element or an object it throws a zorba exception. -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug1064978 into lp:zorba
I talked to Markos and there are some more issues here. 1. The function should probably go into the static context instead of the dynamic context. But the Static context doesn't have functions to access the external variables, so if this function is to be implemented in the static context it would actually be using several functions of the dynamic context to work. Since the external variable are part of the Dynamic context isn't it better to just leave them there? 2. It really depends on what you want to cast to. In general, the target type for casting is a sequence type (e.g. node()*, or xs:string?). As already mentioned, this cannot be returned as an item other than a string. If you did that, it pushes a lot of effort to the consumer because he needs to parse the sequence-type. There are two alternatives: - xqxq:variable-type-name($name as xs:QName) as xs:QName? which returns the name of type (e.g. no node()*) - xqxq:variable-sequence-type($name as xs:QName) as xs:string? which returns the sequence type as a string. It really depends on exactly what the user needs. I would go with variable- type-name if that's sufficient for all FOTS use cases. I will go ahead and make the change for it to return of a QName -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug1064978 into lp:zorba
I talked to Markos and there are some more issues here. 1. The function should probably go into the static context instead of the dynamic context. But the Static context doesn't have functions to access the external variables, so if this function is to be implemented in the static context it would actually be using several functions of the dynamic context to work. Since the external variable are part of the Dynamic context isn't it better to just leave them there? As I said, it doesn't belong there. If you want to have it in the dynamic context you should only invoke it after execution. I think you should use VarInfo* lookup_var(const store::Item* qname) const; VarInfo contains the type of the variable. Oh that makes sense I will make it static context then. 2. It really depends on what you want to cast to. In general, the target type for casting is a sequence type (e.g. node()*, or xs:string?). As already mentioned, this cannot be returned as an item other than a string. If you did that, it pushes a lot of effort to the consumer because he needs to parse the sequence-type. There are two alternatives: - xqxq:variable-type-name($name as xs:QName) as xs:QName? which returns the name of type (e.g. no node()*) - xqxq:variable-sequence-type($name as xs:QName) as xs:string? which returns the sequence type as a string. It really depends on exactly what the user needs. I would go with variable- type-name if that's sufficient for all FOTS use cases. I will go ahead and make the change for it to return of a QName Double check with Sorin whether he really doesn't need the occurrence indicator for casting. The current implementation does return the occurrence indicator -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug1064978 into lp:zorba
So, should I remove the xml dependency from the function? or should I remove the whole function? If we remove the function the user should be able to create the same function by themselves using xqxq:get-type-variable I think we should remove the entire function. It leaves to many unanswered questions. For example, what if the user wants to pass other parameters to the parse-fragment function or what if the user wants to validate items before passing them as arguments? So I made the following changes: *Removed the implementation of bind-cast-variable *Changed the return value of getVariableType from zorba::String to a string Item since if the function returns a TypeIdentifier getting a legible type of the variable is lost, unless there is a way to get the schema String from a typeIdentifier? I think a string item doesn't make a difference. The type of a variable is a sequence type that consists of a QName and an occurrence indicator. Just having the name doesn't really help. What do you think is missing from the TypeIdentifier? It allows you to retrieve the URI, local name, and quantifier. What am I missing? There are 2 things I miss information about typeIdentifier: 1. how to create a TypeIdentifier from a XQType 2. The function of xqxq is supposed to return the string of type function so getVariableType is returning the XQType toSchemaString so that the user can actually use it to cast the values of the variable, now does a typeIdentifier has a value like that? Does the localname represents that? -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug1064978 into lp:zorba
So, should I remove the xml dependency from the function? or should
I
remove
the whole function?
If we remove the function the user should be able to create the same
function
by themselves using xqxq:get-type-variable
I think we should remove the entire function. It leaves to many
unanswered
questions. For example,
what if the user wants to pass other parameters to the parse-fragment
function
or what if the user wants to validate items before passing them as
arguments?
So I made the following changes:
*Removed the implementation of bind-cast-variable
*Changed the return value of getVariableType from zorba::String to a
string
Item since if the function returns a TypeIdentifier getting a legible
type
of
the variable is lost, unless there is a way to get the schema String
from
a
typeIdentifier?
I think a string item doesn't make a difference. The type of a variable is
a
sequence type that consists of a QName and an occurrence indicator. Just
having the name doesn't really help. What do you think is missing from the
TypeIdentifier? It allows you to retrieve the URI, local name, and
quantifier.
What am I missing?
There are 2 things I miss information about typeIdentifier:
1. how to create a TypeIdentifier from a XQType
Take a look at CollectionImpl::getType in src/api/collectionimpl.cpp.
2. The function of xqxq is supposed to return the string of type function so
getVariableType is returning the XQType toSchemaString so that the user can
actually use it to cast the values of the variable, now does a
typeIdentifier
has a value like that? Does the localname represents that?
The problem is that there is no representation of types in the data model. To
answer the question we need to investigate the use case. I think the function
should either (1) return a QName item that represents the name of the type
(maybe renaming the function to getVariablePrimeType) or (2) return a string
using the sequence-type syntax (e.g. xs:string*, xs:integer?, or
Q{http://foo.bar}my-type*).
As for the purpose of the function, is to allow the user a tool so he can cast
a string value into the corresponding type of external variable, that's why we
need the function to return something logical in string which in this case the
schema string of the type fits perfectly, so an actual type representation of
the function is not that helpful if is not usable to cast the variable.
So let me see if I understand your points the first one, is to rename the
function (which is appropriate) and to instead of returning the string item
with the value turn it into a QName my only question would be the namespace of
this QName should it be the same of the external variable? or a new namespace
referring to this primetype, also I am guessing that the localname would be the
schema string of the type.
As for your second suggestion I don't understand what you mean by it, are you
talking about the xqxq.xq description of the function or the new dynamic
context function? the xqxq one is already returning something like that and the
dynamic context one you mean to return a Sequence? or what do you mean?
--
https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696
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/rq-xerces-311 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/rq-xerces-311/+merge/160781 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/rq-xerces-311 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/rq-xerces-311 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/rq-xerces-311/+merge/160781 -- https://code.launchpad.net/~zorba-coders/zorba/rq-xerces-311/+merge/160781 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/bug1064978 into lp:zorba
So, should I remove the xml dependency from the function? or should I remove the whole function? If we remove the function the user should be able to create the same function by themselves using xqxq:get-type-variable I think we should remove the entire function. It leaves to many unanswered questions. For example, what if the user wants to pass other parameters to the parse-fragment function or what if the user wants to validate items before passing them as arguments? So I made the following changes: *Removed the implementation of bind-cast-variable *Changed the return value of getVariableType from zorba::String to a string Item since if the function returns a TypeIdentifier getting a legible type of the variable is lost, unless there is a way to get the schema String from a typeIdentifier? -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug1064978_xqxq_bind_cast_variable into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 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
