1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00

Move doxygen config from flight to make/doxygen/

This commit is contained in:
Oleg Semyonov 2013-04-24 21:54:55 +03:00
parent 71465232f0
commit 748b28f4f4
7 changed files with 1565 additions and 1561 deletions

View File

@ -192,7 +192,6 @@ export FLIGHTLIB := $(ROOT_DIR)/flight/Libraries
export OPMODULEDIR := $(ROOT_DIR)/flight/Modules export OPMODULEDIR := $(ROOT_DIR)/flight/Modules
export OPUAVOBJ := $(ROOT_DIR)/flight/uavobjects export OPUAVOBJ := $(ROOT_DIR)/flight/uavobjects
export OPUAVTALK := $(ROOT_DIR)/flight/uavtalk export OPUAVTALK := $(ROOT_DIR)/flight/uavtalk
export DOXYGENDIR := $(ROOT_DIR)/flight/Doc/Doxygen
export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics
@ -815,6 +814,18 @@ build-info:
--template="make/templates/$@.txt" \ --template="make/templates/$@.txt" \
--outfile="$(BUILD_DIR)/$@.txt" --outfile="$(BUILD_DIR)/$@.txt"
##############################
#
# Doxygen documentation
# FIXME: currently is not not used and should be updated
#
##############################
# Generate Doxygen documentation
.PHONY: docs
docs:
$(DOXYGEN) $(ROOT_DIR)/make/doxygen/doxygen.cfg
############################## ##############################
# #
# Help message, the default Makefile goal # Help message, the default Makefile goal

View File

@ -330,10 +330,6 @@ opfw: $(OUTDIR)/$(TARGET).opfw
# Display sizes of sections. # Display sizes of sections.
$(eval $(call SIZE_TEMPLATE, $(OUTDIR)/$(TARGET).elf)) $(eval $(call SIZE_TEMPLATE, $(OUTDIR)/$(TARGET).elf))
# Generate Doxygen documents
docs:
doxygen $(DOXYGENDIR)/doxygen.cfg
# Install: install binary file with prefix/suffix into install directory # Install: install binary file with prefix/suffix into install directory
install: $(OUTDIR)/$(TARGET).opfw install: $(OUTDIR)/$(TARGET).opfw
ifneq ($(INSTALL_DIR),) ifneq ($(INSTALL_DIR),)

1
make/.gitattributes vendored
View File

@ -6,6 +6,7 @@
*.py text eol=lf *.py text eol=lf
*.sh text eol=lf *.sh text eol=lf
/doxygen/*.cfg text eol=lf
/templates/firmwareinfotemplate.c text eol=lf /templates/firmwareinfotemplate.c text eol=lf
/templates/gcs_version_info_template.h text eol=crlf /templates/gcs_version_info_template.h text eol=crlf
/templates/*.txt text eol=crlf /templates/*.txt text eol=crlf

View File

@ -42,7 +42,6 @@ FREERTOS_DIR = $(PIOSCOMMON)/Libraries/FreeRTOS
include $(FREERTOS_DIR)/library.mk include $(FREERTOS_DIR)/library.mk
## Misc ## Misc
DOXYGENDIR = $(ROOT_DIR)/flight/Doc/Doxygen
OPTESTS = $(TOPDIR)/Tests OPTESTS = $(TOPDIR)/Tests
## PIOS Hardware ## PIOS Hardware

View File

@ -240,10 +240,6 @@ opfw: $(OUTDIR)/$(TARGET).opfw
# Display sizes of sections. # Display sizes of sections.
$(eval $(call SIZE_TEMPLATE, $(OUTDIR)/$(TARGET).elf)) $(eval $(call SIZE_TEMPLATE, $(OUTDIR)/$(TARGET).elf))
# Generate Doxygen documents
docs:
doxygen $(DOXYGENDIR)/doxygen.cfg
# Target: clean project # Target: clean project
clean: clean:
@echo $(MSG_CLEANING) @echo $(MSG_CLEANING)

View File

@ -38,7 +38,7 @@ PROJECT_NUMBER =
# If a relative path is entered, it will be relative to the location # If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used. # where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = Doc/Doxygen/ OUTPUT_DIRECTORY = build/docs/
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output # 4096 sub-directories (in 2 levels) under the output directory of each output
@ -574,7 +574,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = OpenPilot PiOS PiOS/STM32F10x PiOS/STM32F2xx INPUT = flight ground
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

View File

@ -120,6 +120,7 @@ JAR := jar
GIT := git GIT := git
CURL := curl CURL := curl
OPENSSL := openssl OPENSSL := openssl
DOXYGEN := doxygen
# Echo in recipes is a bit tricky in a Windows Git Bash window in some cases. # Echo in recipes is a bit tricky in a Windows Git Bash window in some cases.
# It does not work if make started under msysGit installed into a path with spaces. # It does not work if make started under msysGit installed into a path with spaces.