Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_962255_image_module into lp:zorba/image-module

2012-05-16 Thread Sorin Marian Nasoi 
> Sorry, this fix isn't right.
> 
> 1. You can't depend on the relative path to the Zorba source directory,
> because Zorba could be built with ZORBA_MODULES_DIR pointing anywhere.
> 
> 2. You also can't depend on the build directory being a direct subdirectory of
> the source directory.
> 
> 3. Finally, you can't depend on Zorba even being part of this build, because
> it is possible to build a non-core module against a Zorba binary installation.
> So, there may not be any Zorba source directory, and the "xqdoc" target may
> not exist.
> 
> I think trying to move this command out of the trunk isn't a good idea.
What is the best solution to check if an external module (Graphviz in this 
case) is build from within Zorba?

Thanks for the help.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_962255_image_module/+merge/105991
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/fix_bug_962255_image_module into lp:zorba/image-module

2012-05-16 Thread Chris Hillery 
Review: Needs Fixing

Sorry, this fix isn't right.

1. You can't depend on the relative path to the Zorba source directory, because 
Zorba could be built with ZORBA_MODULES_DIR pointing anywhere.

2. You also can't depend on the build directory being a direct subdirectory of 
the source directory.

3. Finally, you can't depend on Zorba even being part of this build, because it 
is possible to build a non-core module against a Zorba binary installation. So, 
there may not be any Zorba source directory, and the "xqdoc" target may not 
exist.

I think trying to move this command out of the trunk isn't a good idea.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_962255_image_module/+merge/105991
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/fix_bug_962255_image_module into lp:zorba/image-module

2012-05-16 Thread Sorin Marian Nasoi 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_962255_image_module/+merge/105991
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/fix_bug_962255_image_module into lp:zorba/image-module

2012-05-16 Thread Sorin Marian Nasoi 
Sorin Marian Nasoi has proposed merging 
lp:~zorba-coders/zorba/fix_bug_962255_image_module into lp:zorba/image-module.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #962255 in Zorba: "integrate into XQDoc the module dependency graph 
generation"
  https://bugs.launchpad.net/zorba/+bug/962255

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

Partial fix for lp:962255.
Branch lp:~zorba-coders/zorba/fix_bug_962255 is the other part of the fix.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_962255_image_module/+merge/105991
Your team Zorba Coders is subscribed to branch lp:zorba/image-module.
=== modified file 'src/com/zorba-xquery/www/modules/image/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/image/CMakeLists.txt	2012-04-17 09:36:45 +
+++ src/com/zorba-xquery/www/modules/image/CMakeLists.txt	2012-05-16 14:38:23 +
@@ -108,6 +108,22 @@
   LINK_LIBRARIES "${GRAPHVIZ_LIBRARIES}")
 
 ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test_graphviz")
+
+#   Add the modules_svg command for which a working zorba cmd is required.
+ADD_CUSTOM_TARGET(modules_svg
+  ${ZORBA_EXE}
+--omit-xml-declaration
+-f
+-q "\"${CMAKE_CURRENT_BINARY_DIR}/../../../../../../../../../doc/zorba/xqdoc/src/generate-module-dependencies-svg.xq\""
+-e "\"ZorbaBuildFolder:=${CMAKE_CURRENT_BINARY_DIR}/../../../../../../../../\""
+-o "\"${CMAKE_CURRENT_BINARY_DIR}/../../../../../../../../doc/zorba/xqdoc/xhtml/images/modules.svg\""
+COMMENT "Building module dependencies SVG..."
+)
+SET_TARGET_PROPERTIES (modules_svg PROPERTIES
+  EXCLUDE_FROM_DEFAULT_BUILD 1
+  FOLDER "Docs"
+)
+ADD_DEPENDENCIES(modules_svg "xqdoc")
 
   ELSE (GRAPHVIZ_FOUND)
 MESSAGE(STATUS "Graphviz library not found.")

-- 
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