Changed build dependency order

Previously, doc_doxygen was building in parallel with
dali2-scene-loader and occasionally picking up a temporary file from
the latter.

Made doc_doxygen dependent on dali2-scene-loader so that it no longer
builds in parallel, and instead, builds afterwards.

Removed obsolete tags from doxygen config files.

Change-Id: If429a202c6611dd287c0cbc45e1720444b80eee0
Signed-off-by: David Steele <david.steele@samsung.com>

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 840ff92..a7bc0e6 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -515,6 +515,11 @@ IF( ENABLE_COVERAGE )
   ENDIF( LCOV_BIN )
 ENDIF()
 
   ENDIF( LCOV_BIN )
 ENDIF()
 

+IF ( BUILD_SCENE_LOADER )
+  ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/dali-scene-loader )
+ENDIF()
+
+

 # Build documentation if doxygen tool is available
 SET( doxygenEnabled OFF )
 IF( DOXYGEN_FOUND )
 # Build documentation if doxygen tool is available
 SET( doxygenEnabled OFF )
 IF( DOXYGEN_FOUND )


@@ -527,14 +532,29 @@ IF( DOXYGEN_FOUND )
   SET( DOXYGEN_INTERNAL_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs-internal )
   CONFIGURE_FILE( ${DOXYGEN_SRC_DIR}/dali.doxy.in ${DOXYGEN_SRC_DIR}/dali.doxy @ONLY )
   CONFIGURE_FILE( ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy.in ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy @ONLY )
   SET( DOXYGEN_INTERNAL_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs-internal )
   CONFIGURE_FILE( ${DOXYGEN_SRC_DIR}/dali.doxy.in ${DOXYGEN_SRC_DIR}/dali.doxy @ONLY )
   CONFIGURE_FILE( ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy.in ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy @ONLY )

-  ADD_CUSTOM_TARGET( doc_doxygen ALL
-                     DEPENDS ${name}
-                     COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_SRC_DIR}/dali.doxy
-                     COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_SRC_DIR}/dali.doxy
-                     COMMAND ${CMAKE_COMMAND} -P ${DOXYGEN_SRC_DIR}/check_for_errors.cmake
-                     COMMENT "Generating API documentation with Doxygen"
-                     WORKING_DIRECTORY ${DOXYGEN_SRC_DIR}
-                     VERBATIM )
+
+  IF ( BUILD_SCENE_LOADER )
+    ADD_CUSTOM_TARGET( doc_doxygen ALL
+      DEPENDS ${name} dali2-scene-loader
+      COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_SRC_DIR}/dali.doxy
+      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_SRC_DIR}/dali.doxy
+      COMMAND ${CMAKE_COMMAND} -P ${DOXYGEN_SRC_DIR}/check_for_errors.cmake
+      COMMENT "Generating API documentation with Doxygen"
+      WORKING_DIRECTORY ${DOXYGEN_SRC_DIR}
+      VERBATIM )
+  ELSE()
+    ADD_CUSTOM_TARGET( doc_doxygen ALL
+      DEPENDS ${name}
+      COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_SRC_DIR}/dali.doxy
+      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_SRC_DIR}/dali.doxy
+      COMMAND ${CMAKE_COMMAND} -P ${DOXYGEN_SRC_DIR}/check_for_errors.cmake
+      COMMENT "Generating API documentation with Doxygen"
+      WORKING_DIRECTORY ${DOXYGEN_SRC_DIR}
+      VERBATIM )
+  ENDIF()
+
+  # Following target is optional - it doesn't run by default
+  # Build using "make doc_doxygen_internal".

   ADD_CUSTOM_TARGET( doc_doxygen_internal
                      COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy
                      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy
   ADD_CUSTOM_TARGET( doc_doxygen_internal
                      COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy
                      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INTERNAL_SRC_DIR}/dali-internal.doxy


@@ -549,9 +569,6 @@ IF( CONFIGURE_AUTOMATED_TESTS )
                   ${ROOT_SRC_DIR}/automated-tests/CMakeLists.txt @ONLY )
 ENDIF()
 
                   ${ROOT_SRC_DIR}/automated-tests/CMakeLists.txt @ONLY )
 ENDIF()
 

-IF ( BUILD_SCENE_LOADER )
-  ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/dali-scene-loader )
-ENDIF()

 
 # Configuration Messages
 MESSAGE( STATUS "Configuration:\n" )
 
 # Configuration Messages
 MESSAGE( STATUS "Configuration:\n" )

diff --git a/build/tizen/docs-internal/dali-internal.doxy.in b/build/tizen/docs-internal/dali-internal.doxy.in
index 1d6036f..5364753 100644 (file)
--- a/build/tizen/docs-internal/dali-internal.doxy.in
+++ b/build/tizen/docs-internal/dali-internal.doxy.in
@@ -2368,7 +2368,7 @@ EXTERNAL_PAGES         = YES
 # interpreter (i.e. the result of 'which perl').
 # The default file (with absolute path) is: /usr/bin/perl.
 
 # interpreter (i.e. the result of 'which perl').
 # The default file (with absolute path) is: /usr/bin/perl.
 

-PERL_PATH              = /usr/bin/perl
+#PERL_PATH              = /usr/bin/perl

 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool


@@ -2390,7 +2390,7 @@ CLASS_DIAGRAMS         = YES
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 

-MSCGEN_PATH            =
+#MSCGEN_PATH            =

 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The

diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in
index 0a9d553..8ef9112 100644 (file)
--- a/build/tizen/docs/dali.doxy.in
+++ b/build/tizen/docs/dali.doxy.in
@@ -2348,7 +2348,7 @@ EXTERNAL_PAGES         = YES
 # interpreter (i.e. the result of 'which perl').
 # The default file (with absolute path) is: /usr/bin/perl.
 
 # interpreter (i.e. the result of 'which perl').
 # The default file (with absolute path) is: /usr/bin/perl.
 

-PERL_PATH              = /usr/bin/perl
+#PERL_PATH              = /usr/bin/perl

 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool


@@ -2370,7 +2370,7 @@ CLASS_DIAGRAMS         = YES
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 

-MSCGEN_PATH            =
+#MSCGEN_PATH            =

 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The