[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-declare-module-bug917981-2012-02-07T14-44-58.09Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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-declare-module-bug917981 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job fix-declare-module-bug917981-2012-02-07T14-44-58.09Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-declare-module-bug917981-2012-02-08T01-30-59.111Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
Validation queue job fix-declare-module-bug917981-2012-02-08T01-30-59.111Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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-declare-module-bug917981 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 (message): Validation queue job fix-declare-module-bug917981-2012-01-18T08-36-53.936Z is finished. The final status was: 6 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
Chris Hillery has proposed merging
lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #917981 in Zorba: DECLARE_ZORBA_MODULE() should raise error on
duplicates
https://bugs.launchpad.net/zorba/+bug/917981
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977
--
https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-01-11 17:30:25 +
+++ ChangeLog 2012-01-18 02:19:25 +
@@ -21,6 +21,7 @@
support.
* zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
* Added API method Item::getNamespaceBindings().
+ * Fixed bug #917981 (disallow declaring same module twice).
version 2.1
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2011-12-21 14:40:33 +
+++ cmake_modules/ZorbaModule.cmake 2012-01-18 02:19:25 +
@@ -159,41 +159,51 @@
MATH (EXPR num_zorba_modules ${num_zorba_modules} + 1)
SET_PROPERTY (GLOBAL PROPERTY ZORBA_MODULE_COUNT ${num_zorba_modules})
- # Compute the version numbers, if any provided.
- IF (MODULE_VERSION)
-STRING (REPLACE . ; version ${MODULE_VERSION})
-LIST (LENGTH version version_len)
-IF (NOT (version_len EQUAL 2) OR (version_len EQUAL 3))
- MESSAGE (FATAL_ERROR
-Version ${MODULE_VERSION} not of form 'major.minor[.patch]')
-ENDIF (NOT (version_len EQUAL 2) OR (version_len EQUAL 3))
-LIST (GET version 0 major_ver)
-LIST (GET version 1 minor_ver)
-IF (version_len EQUAL 3)
- LIST (GET version 2 patch_ver)
- MATH (EXPR version_int
-${major_ver} * 1 + ${minor_ver} * 10 + ${patch_ver})
-ELSE (version_len EQUAL 3)
- SET (patch_ver)
- MATH (EXPR version_int ${major_ver} * 1 + ${minor_ver} * 10)
-ENDIF (version_len EQUAL 3)
-
-# We maintain a global CMake property named after the target URI
-# which remembers all versions of this URI which have been
-# declared. If a *lower* version has already been declared, the
-# output file rules will be messed up, so die.
-GET_PROPERTY (target_versions GLOBAL PROPERTY ${uri_sym}-versions)
-FOREACH (known_ver ${target_versions})
- IF (known_ver LESS version_int)
-MESSAGE (FATAL_ERROR
- The module ${MODULE_URI} has already been declared with a
- lower version number than ${MODULE_VERSION}.
- Please call DECLARE_ZORBA_MODULE() for higher versions of the same
- module first.)
- ENDIF (known_ver LESS version_int)
-ENDFOREACH (known_ver)
-SET_PROPERTY (GLOBAL APPEND PROPERTY ${uri_sym}-versions ${version_int})
- ENDIF (MODULE_VERSION)
+ # If no version specified, it is effectively treated as 0.0.0.
+ IF (NOT MODULE_VERSION)
+SET (MODULE_VERSION 0.0.0)
+ ENDIF (NOT MODULE_VERSION)
+
+ # Compute a unique integer, version_int, based on the version
+ # number, so we can more easily compare with other versions later.
+ STRING (REPLACE . ; version ${MODULE_VERSION})
+ LIST (LENGTH version version_len)
+ IF (NOT ( (version_len EQUAL 2) OR (version_len EQUAL 3) ) )
+MESSAGE (FATAL_ERROR
+ Version ${version_len} ${MODULE_VERSION} not of form 'major.minor[.patch]')
+ ENDIF (NOT ( (version_len EQUAL 2) OR (version_len EQUAL 3) ) )
+ LIST (GET version 0 major_ver)
+ LIST (GET version 1 minor_ver)
+ IF (version_len EQUAL 3)
+LIST (GET version 2 patch_ver)
+MATH (EXPR version_int
+ ${major_ver} * 1 + ${minor_ver} * 10 + ${patch_ver})
+ ELSE (version_len EQUAL 3)
+SET (patch_ver)
+MATH (EXPR version_int ${major_ver} * 1 + ${minor_ver} * 10)
+ ENDIF (version_len EQUAL 3)
+
+ # We maintain a global CMake property named after the target URI
+ # which remembers all versions of this URI which have been
+ # declared. If a *lower* version has already been declared, the
+ # output file rules will be messed up, so die. If the *same* version
+ # has already been declare, XQdoc will be messed up, so die.
+ GET_PROPERTY (target_versions GLOBAL PROPERTY ${uri_sym}-versions)
+ FOREACH (known_ver ${target_versions})
+IF (known_ver LESS version_int)
+ MESSAGE (FATAL_ERROR
+The module ${MODULE_URI} has already been declared with a
+lower version number than ${MODULE_VERSION}.
+Please call DECLARE_ZORBA_MODULE() for higher versions of the same
+module first.)
+ElSEIF (known_ver EQUAL version_int)
+ MESSAGE (FATAL_ERROR
+The module ${MODULE_URI} has already been declared with the
+version number ${MODULE_VERSION}. You cannot declare the same
+module twice.)
+ENDIF (known_ver LESS version_int)
+ ENDFOREACH (known_ver)
+ SET_PROPERTY
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-declare-module-bug917981-2012-01-18T02-20-58.486Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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-declare-module-bug917981 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 (message): Validation queue job fix-declare-module-bug917981-2012-01-18T02-20-58.486Z is finished. The final status was: 6 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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/fix-declare-module-bug917981 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-declare-module-bug917981 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 -- https://code.launchpad.net/~zorba-coders/zorba/fix-declare-module-bug917981/+merge/88977 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
