VirtualBox

Changeset 65153 in vbox


Ignore:
Timestamp:
Jan 5, 2017 1:20:21 PM (8 years ago)
Author:
vboxsync
Message:

doxygen: more unification: moved Doxyfile.{Core,qtgui,iprt}.* and docs.{Core,qtgui,iprt} to the respective doxygen directories; sort *_DOXYFILE_INPUT because the wildcard function does not return deterministic results; use separate *_DOXYFILE_{INPUT,OUTPUT} variables

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r65141 r65153  
    520520endif # !VBOX_ONLY_DOCS
    521521
    522 docs.Core docs.core: $(PATH_TARGET)/docs.Core
    523 
    524 
    525 
    526522#
    527523# The core (VMM+REM+Devices+Main) documentation.
    … …  
    530526# and GCFGM lists.
    531527#
     528VBOX_CORE_DOXYFILE_OUTPUT = $(PATH_OUT)/docs/Core
     529BLDDIRS += $(VBOX_CORE_DOXYFILE_OUTPUT)
    532530OTHER_CLEAN += \
    533531        $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core \
    … …  
    871869VBOX_CORE_DOXYFILE_INPUT := \
    872870        $(VBOX_CORE_DOXYFILE_INPUT_FIRST) \
    873         $(filter-out $(VBOX_CORE_DOXYFILE_INPUT_FIRST), $(VBOX_CORE_DOXYFILE_INPUT))
     871        $(sort $(filter-out $(VBOX_CORE_DOXYFILE_INPUT_FIRST), $(VBOX_CORE_DOXYFILE_INPUT)))
    874872
    875873# And some some additional stuff.
    … …  
    878876        $(PATH_ROOT)/src/recompiler/VBoxREMWrapper.cpp
    879877
    880 
    881 VBOX_CORE_DOXYFILE_OUTPUT = $(PATH_OUT)/docs/Core
    882 BLDDIRS += $(VBOX_CORE_DOXYFILE_OUTPUT)
    883 
    884 -include $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core.dep
     878includedep $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core.dep
    885879
    886880# Generate the Doxyfile
    887881$(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core: Doxyfile.Core \
    888                 $(comp-vars VBOX_CORE_DOXYFILE_INPUT,DOXYGEN_INPUT_PREV,FORCE) \
    889                 $(comp-vars VBOX_CORE_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \
     882                $(comp-vars VBOX_CORE_DOXYFILE_INPUT,DOXYGEN_CORE_INPUT_PREV,FORCE) \
     883                $(comp-vars VBOX_CORE_DOXYFILE_OUTPUT,DOXYGEN_CORE_OUTPUT_PREV,FORCE) \
    890884                | $$(dir $$@)
    891         $(call MSG_L1,generating Core doxygen file)
    892885        $(QUIET)$(RM) -f $@ [email protected] [email protected]
    893886        $(QUIET)$(CP) -f Doxyfile.Core [email protected]
    … …  
    910903        $(QUIET)$(APPEND) [email protected]
    911904        $(QUIET)$(MV) -f [email protected] $@
    912         @$(APPEND) [email protected] "DOXYGEN_OUTPUT_PREV = $(VBOX_CORE_DOXYFILE_OUTPUT)"
    913         @$(APPEND) [email protected] "DOXYGEN_INPUT_PREV = $(VBOX_CORE_DOXYFILE_INPUT)"
     905        @$(APPEND) [email protected] "DOXYGEN_CORE_OUTPUT_PREV = $(VBOX_CORE_DOXYFILE_OUTPUT)"
     906        @$(APPEND) [email protected] "DOXYGEN_CORE_INPUT_PREV = $(VBOX_CORE_DOXYFILE_INPUT)"
    914907
    915908# Do the actual job.
    916 $(PATH_TARGET)/docs.Core: $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core $$(VBOX_CORE_DOXYFILE_INPUT) | $(VBOX_CORE_DOXYFILE_OUTPUT)/
    917         $(RM) -f $(PATH_TARGET)/docs.Core
    918         $(RM) -Rf $(VBOX_CORE_DOXYFILE_OUTPUT)/html/
     909$(VBOX_CORE_DOXYFILE_OUTPUT)/docs.Core: $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core $$(VBOX_CORE_DOXYFILE_INPUT) \
     910                | $(VBOX_CORE_DOXYFILE_OUTPUT)/
     911        $(QUIET)$(RM) -f $@
     912        $(QUIET)$(RM) -Rf $(VBOX_CORE_DOXYFILE_OUTPUT)/html/
    919913        doxygen $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core
    920914        $(SED) -n \
    … …  
    950944        $(CAT) $(VBOX_CORE_DOXYFILE_OUTPUT)/errors2
    951945        $(SED) -e "/[^ ]/q 1" $(VBOX_CORE_DOXYFILE_OUTPUT)/errors2
    952         $(APPEND) $(PATH_TARGET)/docs.Core
     946        $(APPEND) $@
     947
     948docs.Core docs.core: $(VBOX_CORE_DOXYFILE_OUTPUT)/docs.Core
    953949
    954950

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r65139 r65153  
    12571257        $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui \
    12581258        $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui.dep \
    1259         $(PATH_TARGET)/docs.qtgui
     1259        $(QTGUI_DOXYFILE_OUTPUT)/docs.qtgui
    12601260
    12611261QTGUI_DOXYFILE_INPUT_DIRS := \
    … …  
    13011301        $(foreach dir, $(QTGUI_DOXYFILE_INPUT_DIRS), \
    13021302                $(sort $(wildcard $(dir)/*.h)) \
    1303                 $(wildcard $(dir)/*.cpp $(dir)/*.m $(dir)/*.mm))
    1304 
    1305 -include $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui.dep
     1303                $(sort $(wildcard $(dir)/*.cpp $(dir)/*.m $(dir)/*.mm)))
     1304
     1305includedep $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui.dep
    13061306
    13071307# Generate the Doxyfile
    … …  
    13091309                $(PATH_SUB_CURRENT)/Doxyfile \
    13101310                $(PATH_SUB_CURRENT)/Makefile.kmk \
    1311                 $(comp-vars QTGUI_DOXYFILE_INPUT,QTGUI_DOXYFILE_INPUT_PREV,FORCE) \
     1311                $(comp-vars QTGUI_DOXYFILE_INPUT,DOXYGEN_QTGUI_INPUT_PREV,FORCE) \
     1312                $(comp-vars QTGUI_DOXYFILE_OUTPUT,DOXYGEN_QTGUI_OUTPUT_PREV,FORCE) \
    13121313                | $$(dir $$@)
    1313         $(call MSG_L1,generating qtgui doxygen file)
    13141314        $(QUIET)$(RM) -f $@ [email protected] [email protected]
    13151315        $(QUIET)$(CP) -f $< [email protected]
    … …  
    13231323        $(QUIET)$(APPEND) [email protected]
    13241324        $(QUIET)$(MV) -f [email protected] $@
    1325         @$(APPEND) [email protected] "QTGUI_DOXYFILE_INPUT_PREV = $(QTGUI_DOXYFILE_INPUT)"
     1325        @$(APPEND) [email protected] "DOXYGEN_QTGUI_OUTPUT_PREV = $(QTGUI_DOXYFILE_OUTPUT)"
     1326        @$(APPEND) [email protected] "DOXYGEN_QTGUI_INPUT_PREV = $(QTGUI_DOXYFILE_INPUT)"
    13261327
    13271328# Do the actual job.
    1328 $(PATH_TARGET)/docs.qtgui: $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui $$(QTGUI_DOXYFILE_INPUT) | $(QTGUI_DOXYFILE_OUTPUT)/
     1329$(QTGUI_DOXYFILE_OUTPUT)/docs.qtgui: $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui $$(QTGUI_DOXYFILE_INPUT) \
     1330                | $(QTGUI_DOXYFILE_OUTPUT)/
    13291331        $(call MSG_L1,doxygen qtgui)
     1332        $(QUIET)$(RM) -f $@
    13301333        $(QUIET)$(RM) -Rf -- $(QTGUI_DOXYFILE_OUTPUT)/html/
    1331         $(QUIET)doxygen $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui
    1332         $(QUIET)$(APPEND) $(PATH_TARGET)/docs.qtgui
     1334        doxygen $(QTGUI_DOXYFILE_OUTPUT)/Doxyfile.qtgui
     1335        $(APPEND) $@
    13331336
    13341337# aliases
    1335 docs.qtgui: $(PATH_TARGET)/docs.qtgui
     1338docs.qtgui: $(QTGUI_DOXYFILE_OUTPUT)/docs.qtgui
    13361339if !defined(VBOX_ONLY_DOCS) && defined(VBOX_WITH_ALL_DOXYGEN_TARGETS)
    1337 docs:      $(PATH_TARGET)/docs.qtgui
     1340docs: $(QTGUI_DOXYFILE_OUTPUT)/docs.qtgui
    13381341endif
    13391342

  • trunk/src/VBox/Runtime/Makefile.kmk

    r64921 r65153  
    129129        $(IPRT_OUT_DIR)/odi2name.h \
    130130        $(IPRT_OUT_DIR)/odi2name.h.ts \
    131         $(IPRT_OUT_DIR)/Doxyfile.iprt \
    132         $(IPRT_OUT_DIR)/Doxyfile.iprt.dep \
    133         $(IPRT_OUT_DIR)/docs.iprt
     131        $(IPRT_DOXYFILE_OUTPUT)/Doxyfile.iprt \
     132        $(IPRT_DOXYFILE_OUTPUT)/Doxyfile.iprt.dep \
     133        $(IPRT_DOXYFILE_OUTPUT)/docs.iprt
    134134
    135135
    … …  
    29112911IPRT_DOXYFILE_INPUT := \
    29122912        $(IPRT_DOXYFILE_INPUT_FIRST) \
    2913         $(filter-out $(IPRT_DOXYFILE_INPUT_FIRST), $(IPRT_DOXYFILE_INPUT))
     2913        $(sort $(filter-out $(IPRT_DOXYFILE_INPUT_FIRST), $(IPRT_DOXYFILE_INPUT)))
    29142914
    29152915
    … …  
    29172917BLDDIRS += $(IPRT_DOXYFILE_OUTPUT)
    29182918
    2919 includedep $(IPRT_OUT_DIR)/Doxyfile.iprt.dep
     2919includedep $(IPRT_DOXYFILE_OUTPUT)/Doxyfile.iprt.dep
    29202920
    29212921# Generate the Doxyfile
    2922 $(IPRT_OUT_DIR)/Doxyfile.iprt: \
     2922$(IPRT_DOXYFILE_OUTPUT)/Doxyfile.iprt: \
    29232923                $(VBOX_PATH_RUNTIME_SRC)/Doxyfile \
    29242924                $(VBOX_PATH_RUNTIME_SRC)/Makefile.kmk \
    2925                 $(comp-vars IPRT_DOXYFILE_INPUT,DOXYGEN_INPUT_PREV,FORCE) \
    2926                 $(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \
     2925                $(comp-vars IPRT_DOXYFILE_INPUT,DOXYGEN_IPRT_INPUT_PREV,FORCE) \
     2926                $(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_IPRT_OUTPUT_PREV,FORCE) \
    29272927                | $$(dir $$@)
    29282928        $(QUIET)$(RM) -f $@ [email protected] [email protected]
    … …  
    29472947        $(QUIET)$(APPEND) [email protected]
    29482948        $(QUIET)$(MV) -f [email protected] $@
    2949         $(QUIET)$(APPEND) [email protected] "DOXYGEN_OUTPUT_PREV = $(IPRT_DOXYFILE_OUTPUT)"
    2950         $(QUIET)$(APPEND) [email protected] "DOXYGEN_INPUT_PREV = $(IPRT_DOXYFILE_INPUT)"
     2949        $(QUIET)$(APPEND) [email protected] "DOXYGEN_IPRT_OUTPUT_PREV = $(IPRT_DOXYFILE_OUTPUT)"
     2950        $(QUIET)$(APPEND) [email protected] "DOXYGEN_IPRT_INPUT_PREV = $(IPRT_DOXYFILE_INPUT)"
    29512951
    29522952# Do the actual job.
    2953 $(IPRT_OUT_DIR)/docs.iprt: $(IPRT_OUT_DIR)/Doxyfile.iprt $$(IPRT_DOXYFILE_INPUT) | $(IPRT_DOXYFILE_OUTPUT)/
    2954         $(QUIET)$(RM) -f $(wildcard $(IPRT_DOXYFILE_OUTPUT)/html/*) $(IPRT_OUT_DIR)/docs.iprt
    2955         doxygen $(DOXYGEN_OPTS) $(IPRT_OUT_DIR)/Doxyfile.iprt
    2956         $(SED)  -e '/warning. Unexpected tag .dd. found/d' \
    2957                 -e '/warning. Unsupported xml.html tag .globalScope. found/d' \
    2958                --output $(IPRT_DOXYFILE_OUTPUT)/errors2 \
    2959                 $(IPRT_DOXYFILE_OUTPUT)/errors
     2953$(IPRT_DOXYFILE_OUTPUT)/docs.iprt: $(IPRT_DOXYFILE_OUTPUT)/Doxyfile.iprt $$(IPRT_DOXYFILE_INPUT) \
     2954                | $(IPRT_DOXYFILE_OUTPUT)/
     2955        $(QUIET)$(RM) -f $@
     2956        $(QUIET)$(RM) -Rf $(IPRT_DOXYFILE_OUTPUT)/html/
     2957        doxygen $(DOXYGEN_OPTS) $(IPRT_DOXYFILE_OUTPUT)/Doxyfile.iprt
     2958        $(SED) \
     2959                -e '/warning. Unexpected tag .dd. found/d' \
     2960                -e '/warning. Unsupported xml.html tag .globalScope. found/d' \
     2961                --output $(IPRT_DOXYFILE_OUTPUT)/errors2 \
     2962                $(IPRT_DOXYFILE_OUTPUT)/errors
    29602963        $(CAT) $(IPRT_DOXYFILE_OUTPUT)/errors2
    29612964        $(SED) -e "/[^ ]/q 1" $(IPRT_DOXYFILE_OUTPUT)/errors2
    2962         $(APPEND) $(IPRT_OUT_DIR)/docs.iprt
     2965        $(APPEND) $@
    29632966
    29642967# aliases
    2965 docs.iprt: $(IPRT_OUT_DIR)/docs.iprt
     2968docs.iprt: $(IPRT_DOXYFILE_OUTPUT)/docs.iprt
    29662969if !defined(VBOX_ONLY_DOCS) && defined(VBOX_WITH_ALL_DOXYGEN_TARGETS)
    2967 docs:      $(IPRT_OUT_DIR)/docs.iprt
     2970docs: $(IPRT_DOXYFILE_OUTPUT)/docs.iprt
    29682971endif
    29692972
    29702973test-doxygen::
    2971         @echo test-$(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE)
     2974        @echo test-$(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_IPRT_OUTPUT_PREV,FORCE)
    29722975        @echo $(IPRT_DOXYFILE_OUTPUT)
    2973         @echo $(DOXYGEN_OUTPUT_PREV)
     2976        @echo $(DOXYGEN_IPRT_OUTPUT_PREV)
    29742977        @echo $(IPRT_DOXYFILE_INPUT)
    29752978
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette