Zorba

Merge lp:~zorba-coders/zorba/bug_867107 into lp:zorba

  1. bug_867107
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 10542
Merged at revision: 10542
Proposed branch: lp:~zorba-coders/zorba/bug_867107
Merge into: lp:zorba
Diff against target: 35 lines (+6/-1)
2 files modified
ChangeLog (+1/-0)
cmake_modules/ZorbaModule.cmake (+5/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug_867107
Reviewer Review Type Date Requested Status
David Graf (community) Approve
Sorin Marian Nasoi Approve
Review via email: mp+81956@code.launchpad.net

Commit message

Fixed bug #867107.

Description of the change

Fixed bug #867107.

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

Reviewed and approved the change.

review: Approve
Revision history for this message
David Graf (davidagraf) wrote :

The fix works on my machine!

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug_867107-2011-11-11T15-18-16.34Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug_867107 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job bug_867107-2011-11-11T15-18-16.34Z 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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug_867107-2011-11-11T15-52-07.009Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug_867107-2011-11-11T15-52-07.009Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-11-08 03:11:02 +0000
3+++ ChangeLog 2011-11-11 10:50:10 +0000
4@@ -62,6 +62,7 @@
5 * New node-position module. This module allows to obtain a representation of a node position, which
6 can be used to assess structural relationships with other nodes.
7 * Fixed bug #872502 (validation of the JSON module xqdoc fails)
8+ * Fixed bug #867107 (xqdoc dependency to zorba is wrong)
9
10 version 2.0.1
11
12
13=== modified file 'cmake_modules/ZorbaModule.cmake'
14--- cmake_modules/ZorbaModule.cmake 2011-10-19 16:19:45 +0000
15+++ cmake_modules/ZorbaModule.cmake 2011-11-11 10:50:10 +0000
16@@ -676,6 +676,10 @@
17 # ZORBA_XHTML_REQUISITES_PATH - points to the dir containing the html requisites (images, lib, styles, templates dirs)
18 # Zorba_EXE - points to zorba.exe (or zorba.bat)
19 MACRO (ADD_XQDOC_TARGETS)
20+ IF(NOT ZORBA_WITH_FILE_ACCESS)
21+ MESSAGE(WARNING "Can not build XQDoc documentation because 'File' module is not present")
22+ ENDIF()
23+
24 MESSAGE(STATUS "ADD_XQDOC_TARGETS")
25
26 SET(ZORBA_XQDOC_XML_XQ
27@@ -698,7 +702,7 @@
28 COMMENT "Building XQDoc XML documentation ..."
29 )
30 MESSAGE(STATUS " added target xqdoc-xml")
31- ADD_DEPENDENCIES(xqdoc-xml zorba_simplestore)
32+ ADD_DEPENDENCIES(xqdoc-xml zorbacmd zorba_simplestore check_uris)
33
34 SET_TARGET_PROPERTIES (xqdoc-xml PROPERTIES
35 EXCLUDE_FROM_DEFAULT_BUILD 1

Subscribers

People subscribed via source and target branches