kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add check for Doxygen

Browse Source 
The autoconf configuration system had a test for DOT but not for Doxygen.  I added the test for Doxygen and did an overhaul of the Makefile check to a much simpler process.

(issue ASTERISK-20259)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Andrew Latham
2012-10-13 15:06:39 +00:00
parent 0eab8b669d
commit 83b13ebc04
4 changed files with 569 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@@ -292,13 +292,6 @@ else
SUBMAKE:=$(MAKE) --quiet --no-print-directory SUBMAKE:=$(MAKE) --quiet --no-print-directory
endif endif
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)
HAVEDOT=yes
else
HAVEDOT=no
endif
# $(MAKE) is printed in several places, and we want it to be a # $(MAKE) is printed in several places, and we want it to be a
# fixed size string. Define a variable whose name has also the # fixed size string. Define a variable whose name has also the
# same size, so we can easily align text. # same size, so we can easily align text.
@@ -743,10 +736,25 @@ webvmail:
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
progdocs: progdocs:
doxygen -u contrib/asterisk-ng-doxygen # Note, Makefile conditionals must not be tabbed out. Wasted hours with that.
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \ ifeq ($(DOXYGEN),:)
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - @echo "Doxygen is not installed. Please install and re-run the configuration script."
rm -f contrib/asterisk-ng-doxygen.bak else
ifeq ($(DOT),:)
@echo "DOT is not installed. Doxygen will not produce any diagrams. Please install and re-run the configuration script."
else
# Enable DOT
@sed -i "/^HAVE_DOT/s/NO/YES/" contrib/asterisk-ng-doxygen
endif
# Set Doxygen PROJECT_NUMBER variable
@sed -i "/^PROJECT_NUMBER/s/PROJECT_NUMBER.*/PROJECT_NUMBER = "$(ASTERISKVERSION)"/" contrib/asterisk-ng-doxygen
# Validate Doxygen Configuration
@doxygen -u contrib/asterisk-ng-doxygen
# Run Doxygen
@doxygen contrib/asterisk-ng-doxygen
# Remove configuration backup file
@rm -f contrib/asterisk-ng-doxygen.bak
endif
install-logrotate: install-logrotate:
if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \ if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \

1083
configure vendored
View File

File diff suppressed because it is too large Load Diff

1
configure.ac
View File

@@ -254,6 +254,7 @@ AC_PATH_PROG([BASENAME], [basename], :)
AC_PATH_PROG([DIRNAME], [dirname], :) AC_PATH_PROG([DIRNAME], [dirname], :)
AC_PATH_PROG([SHELL], [sh], :) AC_PATH_PROG([SHELL], [sh], :)
AC_PATH_PROG([LN], [ln], :) AC_PATH_PROG([LN], [ln], :)
AC_PATH_PROG([DOXYGEN], [doxygen], :)
AC_PATH_PROG([DOT], [dot], :) AC_PATH_PROG([DOT], [dot], :)
AC_PATH_PROG([WGET], [wget], :) AC_PATH_PROG([WGET], [wget], :)
AC_PATH_PROG([CURL], [curl], :) AC_PATH_PROG([CURL], [curl], :)

1
makeopts.in
View File

@@ -21,6 +21,7 @@ COMPRESS=@COMPRESS@
BASENAME=@BASENAME@ BASENAME=@BASENAME@
SHELL=@SHELL@ SHELL=@SHELL@
LN=@LN@ LN=@LN@
DOXYGEN=@DOXYGEN@
DOT=@DOT@ DOT=@DOT@
STRIP=@STRIP@ STRIP=@STRIP@
WGET=@WGET@ WGET=@WGET@