← Back to team overview

zorba-coders team mailing list archive

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

 

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 +0000
+++ src/com/zorba-xquery/www/modules/image/CMakeLists.txt	2012-05-16 14:38:23 +0000
@@ -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.")


Follow ups