zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bug_867107 into lp:zorba.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
  David Graf (davidagraf)
Related bugs:
  Bug #867107 in Zorba: "xqdoc dependency to zorba is wrong"
  https://bugs.launchpad.net/zorba/+bug/867107

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug_867107/+merge/81956

Fixed bug #867107.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug_867107/+merge/81956
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2011-11-08 03:11:02 +0000
+++ ChangeLog	2011-11-11 10:50:10 +0000
@@ -62,6 +62,7 @@
   * New node-position module. This module allows to obtain a representation of a node position, which
     can be used to assess structural relationships with other nodes.   
   * Fixed bug #872502 (validation of the JSON module xqdoc fails)
+  * Fixed bug #867107 (xqdoc dependency to zorba is wrong)
 
 version 2.0.1
 

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2011-10-19 16:19:45 +0000
+++ cmake_modules/ZorbaModule.cmake	2011-11-11 10:50:10 +0000
@@ -676,6 +676,10 @@
 # ZORBA_XHTML_REQUISITES_PATH - points to the dir containing the html requisites (images, lib, styles, templates dirs)
 # Zorba_EXE - points to zorba.exe (or zorba.bat)
 MACRO (ADD_XQDOC_TARGETS)
+	IF(NOT ZORBA_WITH_FILE_ACCESS)
+		MESSAGE(WARNING "Can not build XQDoc documentation because 'File' module is not present")
+	ENDIF()
+
   MESSAGE(STATUS "ADD_XQDOC_TARGETS")
 
   SET(ZORBA_XQDOC_XML_XQ
@@ -698,7 +702,7 @@
       COMMENT "Building XQDoc XML documentation ..."
   )
   MESSAGE(STATUS "  added target xqdoc-xml")
-  ADD_DEPENDENCIES(xqdoc-xml zorba_simplestore)
+  ADD_DEPENDENCIES(xqdoc-xml zorbacmd zorba_simplestore check_uris)
 
   SET_TARGET_PROPERTIES (xqdoc-xml PROPERTIES
     EXCLUDE_FROM_DEFAULT_BUILD 1