From 2ada8e795a3e42f5a79a954790903f183b48456f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Sun, 24 May 2015 23:09:39 +0300 Subject: [PATCH] Fixed|Builder: Updated paths for running Doxygen --- distrib/autobuild.py | 46 +++++++++++----------- doomsday/apps/client/api.doxy | 6 +-- doomsday/apps/client/client-mac.doxy | 4 +- doomsday/apps/client/client-win32.doxy | 4 +- doomsday/apps/plugins/doom/doom.doxy | 4 +- doomsday/apps/plugins/heretic/heretic.doxy | 4 +- doomsday/apps/plugins/hexen/hexen.doxy | 4 +- doomsday/external/assimp | 2 +- doomsday/sdk/libappfw/appfw.doxy | 4 +- doomsday/sdk/libcore/api2.doxy | 4 +- doomsday/sdk/libgui/gui.doxy | 4 +- doomsday/sdk/libshell/shell.doxy | 4 +- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/distrib/autobuild.py b/distrib/autobuild.py index 6b14b77c15..f7dd55ec76 100755 --- a/distrib/autobuild.py +++ b/distrib/autobuild.py @@ -389,43 +389,43 @@ def generate_apidoc(): system_command('wc -l doxyissues-qch.txt') print >> sys.stderr, "\nPublic API 2.0 docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/libcore')) - system_command('doxygen api2.doxy >/dev/null 2>../doxyissues-api2.txt') - system_command('wc -l ../doxyissues-api2.txt') + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/sdk/libcore')) + system_command('doxygen api2.doxy >/dev/null 2>../../doxyissues-api2.txt') + system_command('wc -l ../../doxyissues-api2.txt') print >> sys.stderr, "\nPublic API docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/client')) - system_command('doxygen api.doxy >/dev/null 2>../doxyissues-api.txt') - system_command('wc -l ../doxyissues-api.txt') + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/apps/client')) + system_command('doxygen api.doxy >/dev/null 2>../../doxyissues-api.txt') + system_command('wc -l ../../doxyissues-api.txt') print >> sys.stderr, "\nlibshell docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/libshell')) - system_command('doxygen shell.doxy >/dev/null 2>../doxyissues-shell.txt') - system_command('wc -l ../doxyissues-shell.txt') + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/sdk/libshell')) + system_command('doxygen shell.doxy >/dev/null 2>../../doxyissues-shell.txt') + system_command('wc -l ../../doxyissues-shell.txt') print >> sys.stderr, "\nInternal Win32 docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/client')) - system_command('doxygen client-win32.doxy >/dev/null 2>../doxyissues-win32.txt') - system_command('wc -l ../doxyissues-win32.txt') + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/apps/client')) + system_command('doxygen client-win32.doxy >/dev/null 2>../../doxyissues-win32.txt') + system_command('wc -l ../../doxyissues-win32.txt') print >> sys.stderr, "\nInternal Mac/Unix docs..." - system_command('doxygen client-mac.doxy >/dev/null 2>../doxyissues-mac.txt') - system_command('wc -l ../doxyissues-mac.txt') + system_command('doxygen client-mac.doxy >/dev/null 2>../../doxyissues-mac.txt') + system_command('wc -l ../../doxyissues-mac.txt') print >> sys.stderr, "\nDoom plugin docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/plugins/doom')) - system_command('doxygen doom.doxy >/dev/null 2>../../doxyissues-doom.txt') - system_command('wc -l ../../doxyissues-doom.txt') + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/apps/plugins/doom')) + system_command('doxygen doom.doxy >/dev/null 2>../../../doxyissues-doom.txt') + system_command('wc -l ../../../doxyissues-doom.txt') print >> sys.stderr, "\nHeretic plugin docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/plugins/heretic')) - system_command('doxygen heretic.doxy >/dev/null 2>../../doxyissues-heretic.txt') - system_command('wc -l ../../doxyissues-heretic.txt') + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/apps/plugins/heretic')) + system_command('doxygen heretic.doxy >/dev/null 2>../../../doxyissues-heretic.txt') + system_command('wc -l ../../../doxyissues-heretic.txt') print >> sys.stderr, "\nHexen plugin docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/plugins/hexen')) - system_command('doxygen hexen.doxy >/dev/null 2>../../doxyissues-hexen.txt') - system_command('wc -l ../../doxyissues-hexen.txt') + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/apps/plugins/hexen')) + system_command('doxygen hexen.doxy >/dev/null 2>../../../doxyissues-hexen.txt') + system_command('wc -l ../../../doxyissues-hexen.txt') def generate_readme(): diff --git a/doomsday/apps/client/api.doxy b/doomsday/apps/client/api.doxy index 3060752447..9009ad3e1f 100644 --- a/doomsday/apps/client/api.doxy +++ b/doomsday/apps/client/api.doxy @@ -1,12 +1,12 @@ # Public API documentation for Doomsday and liblegacy -@INCLUDE = ../doomsday.doxy +@INCLUDE = ../../doomsday.doxy PROJECT_NAME = "Doomsday and liblegacy" PROJECT_NUMBER = 2.0 PROJECT_BRIEF = "Public API" -OUTPUT_DIRECTORY = ../apidoc/api/ +OUTPUT_DIRECTORY = ../../apidoc/api/ -INPUT = ../api ../liblegacy/include +INPUT = ../api ../../sdk/liblegacy/include PREDEFINED = __DOOMSDAY__ __DENG__ \ "DENG_API_TYPEDEF(Name)=typedef struct de_api_##Name##_s" \ "DENG_API_T(Name)=de_api_##Name##_t" \ diff --git a/doomsday/apps/client/client-mac.doxy b/doomsday/apps/client/client-mac.doxy index 07f25a03dc..b85c93c757 100644 --- a/doomsday/apps/client/client-mac.doxy +++ b/doomsday/apps/client/client-mac.doxy @@ -1,10 +1,10 @@ # API documentation for the Doomsday Client -@INCLUDE = ../doomsday.doxy +@INCLUDE = ../../doomsday.doxy PROJECT_NAME = "Doomsday Client" PROJECT_NUMBER = 2.0 PROJECT_BRIEF = "Internal documentation (Mac OS X)" -OUTPUT_DIRECTORY = ../apidoc/mac/ +OUTPUT_DIRECTORY = ../../apidoc/mac/ INPUT = ../api include src EXCLUDE = include/windows src/windows diff --git a/doomsday/apps/client/client-win32.doxy b/doomsday/apps/client/client-win32.doxy index a546ed7baa..5dfcfe38e8 100644 --- a/doomsday/apps/client/client-win32.doxy +++ b/doomsday/apps/client/client-win32.doxy @@ -1,10 +1,10 @@ # API documentation for the Doomsday Client -@INCLUDE = ../doomsday.doxy +@INCLUDE = ../../doomsday.doxy PROJECT_NAME = "Doomsday Client" PROJECT_NUMBER = 2.0 PROJECT_BRIEF = "Internal documentation (Windows)" -OUTPUT_DIRECTORY = ../apidoc/win32/ +OUTPUT_DIRECTORY = ../../apidoc/win32/ INPUT = ../api include src EXCLUDE = include/unix include/macx src/unix src/macx diff --git a/doomsday/apps/plugins/doom/doom.doxy b/doomsday/apps/plugins/doom/doom.doxy index 97e0d7b413..3be0c3a09f 100644 --- a/doomsday/apps/plugins/doom/doom.doxy +++ b/doomsday/apps/plugins/doom/doom.doxy @@ -1,8 +1,8 @@ # API documentation for the libdoom -@INCLUDE = ../../doomsday.doxy +@INCLUDE = ../../../doomsday.doxy PROJECT_NAME = libdoom -OUTPUT_DIRECTORY = ../../apidoc/jdoom/ +OUTPUT_DIRECTORY = ../../../apidoc/jdoom/ INPUT = src include res ../common/src ../common/include diff --git a/doomsday/apps/plugins/heretic/heretic.doxy b/doomsday/apps/plugins/heretic/heretic.doxy index b4cad5623d..c30ed5ffaf 100644 --- a/doomsday/apps/plugins/heretic/heretic.doxy +++ b/doomsday/apps/plugins/heretic/heretic.doxy @@ -1,8 +1,8 @@ # API documentation for the libheretic -@INCLUDE = ../../doomsday.doxy +@INCLUDE = ../../../doomsday.doxy PROJECT_NAME = libheretic -OUTPUT_DIRECTORY = ../../apidoc/jheretic/ +OUTPUT_DIRECTORY = ../../../apidoc/jheretic/ INPUT = src include res ../common/src ../common/include diff --git a/doomsday/apps/plugins/hexen/hexen.doxy b/doomsday/apps/plugins/hexen/hexen.doxy index c05b6c82f3..83f97833a7 100644 --- a/doomsday/apps/plugins/hexen/hexen.doxy +++ b/doomsday/apps/plugins/hexen/hexen.doxy @@ -1,8 +1,8 @@ # API documentation for the libhexen -@INCLUDE = ../../doomsday.doxy +@INCLUDE = ../../../doomsday.doxy PROJECT_NAME = libhexen -OUTPUT_DIRECTORY = ../../apidoc/jhexen/ +OUTPUT_DIRECTORY = ../../../apidoc/jhexen/ INPUT = src include res ../common/src ../common/include diff --git a/doomsday/external/assimp b/doomsday/external/assimp index f9c6064ee5..9553de3de6 160000 --- a/doomsday/external/assimp +++ b/doomsday/external/assimp @@ -1 +1 @@ -Subproject commit f9c6064ee5e6e6f5d30e5ed240e65d1ad8b2741e +Subproject commit 9553de3de641eaef50faac384fcc35039aee4735 diff --git a/doomsday/sdk/libappfw/appfw.doxy b/doomsday/sdk/libappfw/appfw.doxy index 5d5bcfe6ad..0c0f8835d9 100644 --- a/doomsday/sdk/libappfw/appfw.doxy +++ b/doomsday/sdk/libappfw/appfw.doxy @@ -1,10 +1,10 @@ # Public API documentation for libappfw -@INCLUDE = ../doomsday.doxy +@INCLUDE = ../../doomsday.doxy PROJECT_NAME = "libappfw" PROJECT_NUMBER = 2.0.0 PROJECT_BRIEF = "Application Framework" -OUTPUT_DIRECTORY = ../apidoc/appfw/ +OUTPUT_DIRECTORY = ../../apidoc/appfw/ INPUT = include src FILE_PATTERNS = * diff --git a/doomsday/sdk/libcore/api2.doxy b/doomsday/sdk/libcore/api2.doxy index 97def486e4..b14f64b4a0 100644 --- a/doomsday/sdk/libcore/api2.doxy +++ b/doomsday/sdk/libcore/api2.doxy @@ -1,10 +1,10 @@ # Public API documentation for libcore -@INCLUDE = ../doomsday.doxy +@INCLUDE = ../../doomsday.doxy PROJECT_NAME = "libcore" PROJECT_NUMBER = 2.0.0-Dev PROJECT_BRIEF = "Public API" -OUTPUT_DIRECTORY = ../apidoc/api2/ +OUTPUT_DIRECTORY = ../../apidoc/api2/ INPUT = include src FILE_PATTERNS = * diff --git a/doomsday/sdk/libgui/gui.doxy b/doomsday/sdk/libgui/gui.doxy index 293d6ca4ce..5551c27ae1 100644 --- a/doomsday/sdk/libgui/gui.doxy +++ b/doomsday/sdk/libgui/gui.doxy @@ -1,10 +1,10 @@ # Public API documentation for libgui -@INCLUDE = ../doomsday.doxy +@INCLUDE = ../../doomsday.doxy PROJECT_NAME = "libgui" PROJECT_NUMBER = 2.0.0 PROJECT_BRIEF = "Graphics, Audio and Input Library" -OUTPUT_DIRECTORY = ../apidoc/gui/ +OUTPUT_DIRECTORY = ../../apidoc/gui/ INPUT = include src FILE_PATTERNS = * diff --git a/doomsday/sdk/libshell/shell.doxy b/doomsday/sdk/libshell/shell.doxy index 2aaee43705..d84ad9f00e 100644 --- a/doomsday/sdk/libshell/shell.doxy +++ b/doomsday/sdk/libshell/shell.doxy @@ -1,10 +1,10 @@ # Public API documentation for libshell -@INCLUDE = ../doomsday.doxy +@INCLUDE = ../../doomsday.doxy PROJECT_NAME = "libshell" PROJECT_NUMBER = 0.1.0 PROJECT_BRIEF = "Tool Library for Shell Connections and UI" -OUTPUT_DIRECTORY = ../apidoc/shell/ +OUTPUT_DIRECTORY = ../../apidoc/shell/ INPUT = include src FILE_PATTERNS = *