[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/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/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
The proposal to merge lp:~zorba-coders/zorba/php_windows_fix into lp:zorba has been updated. Description changed to: Solved Linker error when building the php bindings. https://code.launchpad.net/~zorba-coders/zorba/process_windows_fix/+merge/192252 https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253 -- 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
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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php_windows_fix into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253 https://code.launchpad.net/~zorba-coders/zorba/process_windows_fix/+merge/192252 https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- 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
The proposal to merge lp:~zorba-coders/zorba/php_windows_fix into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/php_windows_fix/+merge/192253 -- 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/process_windows_fix into lp:zorba/process-module
The proposal to merge lp:~zorba-coders/zorba/process_windows_fix into lp:zorba/process-module has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/process_windows_fix/+merge/192252 -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/process_windows_fix into lp:zorba/process-module
Validation queue succeeded - proposal merged! -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive_windows_fix into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/archive_windows_fix into lp:zorba/archive-module has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251 -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php_windows_fix into lp:zorba
Validation queue succeeded - proposal merged! -- 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/archive_windows_fix into lp:zorba/archive-module
Validation queue succeeded - proposal merged! -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_image-module into lp:zorba/image-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- 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/update3.0_image-module into lp:zorba/image-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Stage BuildZorbaUbuntu failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/446/parsed_console to view the results. -- 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
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/update3.0_image-module into lp:zorba/image-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- 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/update3.0_image-module into lp:zorba/image-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Stage ZorbaVQ failed. Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/495/console to view the results. -- 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/update3.0_image-module into lp:zorba/image-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- 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/update3.0_image-module into lp:zorba/image-module
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826
:
Votes: {'Approve': 1}
--
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/update3.0_image-module into lp:zorba/image-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/241/console to view the results. -- 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
