Compare commits
5 Commits
| Author | SHA1 | Date |
|---|---|---|
Fedora Release Engineering
|
18ca0c1326 | |
Bill Nottingham
|
6f68205367 | |
Than Ngo
|
a4dd4f370d | |
|
Than Ngo
|
b3007c6556 | |
Jesse Keating
|
8140fddb65 |
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: doxygen
|
||||
# $Id: Makefile,v 1.1 2004/09/09 04:21:20 cvsdist Exp $
|
||||
NAME := doxygen
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf.libdir 2005-11-18 22:12:21.000000000 -0500
|
||||
+++ doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf 2005-11-18 22:12:46.000000000 -0500
|
||||
@@ -27,12 +27,12 @@
|
||||
|
||||
TMAKE_INCDIR =
|
||||
TMAKE_LIBDIR =
|
||||
-TMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+TMAKE_INCDIR_X11 = /usr/include
|
||||
+TMAKE_LIBDIR_X11 = /usr/lib
|
||||
TMAKE_INCDIR_QT = $(QTDIR)/include
|
||||
TMAKE_LIBDIR_QT = $(QTDIR)/lib
|
||||
-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+TMAKE_INCDIR_OPENGL = /usr/include
|
||||
+TMAKE_LIBDIR_OPENGL = /usr/lib
|
||||
|
||||
TMAKE_LINK = g++
|
||||
TMAKE_LINK_SHLIB = g++
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf.libdir 2005-11-18 22:12:21.000000000 -0500
|
||||
+++ doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf 2005-11-18 22:12:46.000000000 -0500
|
||||
@@ -27,12 +27,12 @@
|
||||
|
||||
TMAKE_INCDIR =
|
||||
TMAKE_LIBDIR =
|
||||
-TMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
+TMAKE_INCDIR_X11 = /usr/include
|
||||
+TMAKE_LIBDIR_X11 = /usr/lib64
|
||||
TMAKE_INCDIR_QT = $(QTDIR)/include
|
||||
TMAKE_LIBDIR_QT = $(QTDIR)/lib
|
||||
-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+TMAKE_INCDIR_OPENGL = /usr/include
|
||||
+TMAKE_LIBDIR_OPENGL = /usr/lib64
|
||||
|
||||
TMAKE_LINK = g++
|
||||
TMAKE_LINK_SHLIB = g++
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
|
||||
--- doxygen-1.5.5/Makefile.in.me 2008-02-20 14:36:50.000000000 +0100
|
||||
+++ doxygen-1.5.5/Makefile.in 2008-02-20 14:37:12.000000000 +0100
|
||||
@@ -7,7 +7,6 @@ clean: FORCE
|
||||
cd doc ; $(MAKE) clean
|
||||
cd qtools ; $(MAKE) clean
|
||||
cd src ; $(MAKE) clean
|
||||
- cd libpng ; $(MAKE) clean
|
||||
cd libmd5 ; $(MAKE) clean
|
||||
cd addon/doxywizard ; $(MAKE) clean
|
||||
cd addon/doxmlparser/src ; $(MAKE) clean
|
||||
@@ -18,7 +17,6 @@ clean: FORCE
|
||||
|
||||
distclean: clean
|
||||
cd src ; $(MAKE) distclean
|
||||
- cd libpng ; $(MAKE) distclean
|
||||
cd libmd5 ; $(MAKE) distclean
|
||||
cd addon/doxywizard ; $(MAKE) distclean
|
||||
cd addon/doxmlparser/src ; $(MAKE) distclean
|
||||
@@ -32,11 +30,10 @@ distclean: clean
|
||||
-rm -f objects/*.o
|
||||
-rm -f src/Makefile.doxygen src/Makefile.libdoxygen
|
||||
-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
|
||||
- -rm -f libpng/Makefile.libpng
|
||||
-rm -f libmd5/Makefile.libmd5
|
||||
-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile
|
||||
-rm -f .makeconfig .tmakeconfig
|
||||
- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
|
||||
+ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
|
||||
-rm -f src/version.cpp
|
||||
-rm -r addon/doxywizard/Makefile
|
||||
-rm -f addon/doxywizard/Makefile.doxywizard
|
||||
@@ -83,7 +80,7 @@ docs: FORCE
|
||||
pdf: docs
|
||||
cd latex ; $(MAKE)
|
||||
|
||||
-DISTFILES = Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \
|
||||
+DISTFILES = Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \
|
||||
qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
|
||||
Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \
|
||||
VERSION packages winbuild
|
||||
diff -up doxygen-1.5.5/configure.me doxygen-1.5.5/configure
|
||||
--- doxygen-1.5.5/configure.me 2008-02-20 14:35:56.000000000 +0100
|
||||
+++ doxygen-1.5.5/configure 2008-02-20 14:36:42.000000000 +0100
|
||||
@@ -540,7 +540,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY
|
||||
EOF
|
||||
fi
|
||||
|
||||
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
|
||||
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
|
||||
|
||||
for i in $f_inmakefiles ; do
|
||||
SRC=$i
|
||||
@@ -557,7 +557,6 @@ EOF
|
||||
echo "" >> $DST
|
||||
echo "all: src/version.cpp " >> $DST
|
||||
echo " \$(MAKE) -C qtools" >> $DST
|
||||
- echo " \$(MAKE) -C libpng" >> $DST
|
||||
echo " \$(MAKE) -C libmd5" >> $DST
|
||||
echo " \$(MAKE) -C src" >> $DST
|
||||
if test $f_wizard = YES; then
|
||||
@@ -577,7 +576,7 @@ EOF
|
||||
echo " Created $DST from $SRC..."
|
||||
done
|
||||
|
||||
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
|
||||
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
|
||||
|
||||
for i in $f_inprofiles ; do
|
||||
SRC=$i
|
||||
diff -up doxygen-1.5.5/src/pngenc.cpp.me doxygen-1.5.5/src/pngenc.cpp
|
||||
--- doxygen-1.5.5/src/pngenc.cpp.me 2008-02-20 14:38:46.000000000 +0100
|
||||
+++ doxygen-1.5.5/src/pngenc.cpp 2008-02-20 14:39:11.000000000 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
#endif
|
||||
|
||||
#define ALL_STATIC
|
||||
-#include <../libpng/png.h>
|
||||
+#include <png.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
diff -up doxygen-1.5.5/src/libdoxygen.pro.in.me doxygen-1.5.5/src/libdoxygen.pro.in
|
||||
--- doxygen-1.5.5/src/libdoxygen.pro.in.me 2008-02-20 14:38:08.000000000 +0100
|
||||
+++ doxygen-1.5.5/src/libdoxygen.pro.in 2008-02-20 14:38:29.000000000 +0100
|
||||
@@ -224,7 +224,6 @@ win32-msvc:TMAKE_CXXFLAGS += -Zm200
|
||||
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
INCLUDEPATH += ../qtools
|
||||
-INCLUDEPATH += ../libpng
|
||||
INCLUDEPATH += ../libmd5
|
||||
win32:INCLUDEPATH += .
|
||||
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
|
||||
diff -up doxygen-1.5.5/src/doxygen.pro.in.me doxygen-1.5.5/src/doxygen.pro.in
|
||||
--- doxygen-1.5.5/src/doxygen.pro.in.me 2008-02-20 14:37:34.000000000 +0100
|
||||
+++ doxygen-1.5.5/src/doxygen.pro.in 2008-02-20 14:37:54.000000000 +0100
|
||||
@@ -28,7 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
|
||||
win32:TMAKE_CXXFLAGS += -DQT_NODLL
|
||||
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
|
||||
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
-INCLUDEPATH += ../qtools ../libpng ../libmd5 .
|
||||
+INCLUDEPATH += ../qtools ../libmd5 .
|
||||
#win32-g++:INCLUDEPATH -= ../libpng
|
||||
DESTDIR = ../bin
|
||||
TARGET = doxygen
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
diff -up doxygen-1.5.6/addon/doxywizard/Makefile.in.redhat doxygen-1.5.6/addon/doxywizard/Makefile.in
|
||||
--- doxygen-1.5.6/addon/doxywizard/Makefile.in.redhat 2008-05-19 11:28:20.000000000 +0200
|
||||
+++ doxygen-1.5.6/addon/doxywizard/Makefile.in 2008-05-19 11:28:42.000000000 +0200
|
||||
@@ -41,7 +41,7 @@ clean: Makefile.doxywizard
|
||||
distclean: clean
|
||||
$(RM) Makefile.doxywizard version.cpp config.l config.h portable.h portable.cpp
|
||||
|
||||
-MAN1DIR = man/man1
|
||||
+MAN1DIR = share/man/man1
|
||||
|
||||
install:
|
||||
$(INSTTOOL) -d $(INSTALL)/bin
|
||||
diff -up doxygen-1.5.6/Makefile.in.redhat doxygen-1.5.6/Makefile.in
|
||||
--- doxygen-1.5.6/Makefile.in.redhat 2008-04-20 09:59:24.000000000 +0200
|
||||
+++ doxygen-1.5.6/Makefile.in 2008-05-19 11:18:09.000000000 +0200
|
||||
@@ -50,7 +47,7 @@ distclean: clean
|
||||
|
||||
DATE=$(shell date "+%B %Y")
|
||||
|
||||
-MAN1DIR = man/man1
|
||||
+MAN1DIR = share/man/man1
|
||||
|
||||
install: doxywizard_install
|
||||
$(INSTTOOL) -d $(INSTALL)/bin
|
||||
diff -up doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf.redhat doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf
|
||||
--- doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf.redhat 2006-07-21 21:54:13.000000000 +0200
|
||||
+++ doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf 2008-05-19 11:18:09.000000000 +0200
|
||||
@@ -11,7 +11,7 @@ TMAKE_CC = gcc
|
||||
TMAKE_CFLAGS = -pipe
|
||||
TMAKE_CFLAGS_WARN_ON = -Wall -W -fno-exceptions
|
||||
TMAKE_CFLAGS_WARN_OFF =
|
||||
-TMAKE_CFLAGS_RELEASE = -O2
|
||||
+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS)
|
||||
TMAKE_CFLAGS_DEBUG = -g
|
||||
TMAKE_CFLAGS_SHLIB = -fPIC
|
||||
TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
|
||||
@@ -50,7 +50,7 @@ TMAKE_LIBS_QT_MT = -lqt-mt
|
||||
TMAKE_LIBS_QT_OPENGL = -lqgl
|
||||
TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
|
||||
|
||||
-TMAKE_MOC = moc
|
||||
+TMAKE_MOC = $(QTDIR)/bin/moc
|
||||
|
||||
TMAKE_AR = ar cqs
|
||||
TMAKE_RANLIB =
|
||||
|
|
@ -0,0 +1,95 @@
|
|||
diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
|
||||
--- doxygen-1.6.0/addon/doxywizard/Makefile.in.config 2009-07-13 22:09:03.000000000 +0200
|
||||
+++ doxygen-1.6.0/addon/doxywizard/Makefile.in 2009-08-21 16:42:13.000000000 +0200
|
||||
@@ -10,8 +10,6 @@
|
||||
# See the GNU General Public License for more details.
|
||||
#
|
||||
|
||||
-QMAKE=qmake
|
||||
-
|
||||
all: Makefile.doxywizard
|
||||
$(MAKE) -f Makefile.doxywizard
|
||||
|
||||
@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
|
||||
$(RM) Makefile.doxywizard
|
||||
|
||||
install:
|
||||
- $(INSTTOOL) -d $(INSTALL)/bin
|
||||
- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin
|
||||
- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
|
||||
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
|
||||
+ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin
|
||||
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
|
||||
cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
|
||||
- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
|
||||
+ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
|
||||
rm doxywizard.1
|
||||
|
||||
FORCE:
|
||||
diff -up doxygen-1.6.0/configure.config doxygen-1.6.0/configure
|
||||
--- doxygen-1.6.0/configure.config 2009-08-20 14:15:07.000000000 +0200
|
||||
+++ doxygen-1.6.0/configure 2009-08-21 16:41:36.000000000 +0200
|
||||
@@ -268,9 +268,10 @@ if test "$f_wizard" = YES; then
|
||||
if test -z "$QTDIR"; then
|
||||
echo " QTDIR environment variable not set!"
|
||||
echo -n " Checking for Qt..."
|
||||
- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
|
||||
+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
|
||||
if test -x "$d/bin/qmake"; then
|
||||
QTDIR=$d
|
||||
+ QMAKE=$d/bin/qmake
|
||||
fi
|
||||
done
|
||||
else
|
||||
@@ -485,6 +486,8 @@ INSTTOOL = $f_insttool
|
||||
DOXYDOCS = ..
|
||||
DOCDIR = $f_docdir
|
||||
QTDIR = $QTDIR
|
||||
+QMAKE = $QMAKE
|
||||
+MAN1DIR = share/man/man1
|
||||
EOF
|
||||
|
||||
if test "$f_dot" != NO; then
|
||||
diff -up doxygen-1.6.0/Makefile.in.config doxygen-1.6.0/Makefile.in
|
||||
--- doxygen-1.6.0/Makefile.in.config 2009-08-14 15:58:42.000000000 +0200
|
||||
+++ doxygen-1.6.0/Makefile.in 2009-08-21 16:34:02.000000000 +0200
|
||||
@@ -44,8 +44,6 @@ distclean: clean
|
||||
|
||||
DATE=$(shell date "+%B %Y")
|
||||
|
||||
-MAN1DIR = man/man1
|
||||
-
|
||||
install: doxywizard_install
|
||||
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
|
||||
$(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
|
||||
diff -up doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf
|
||||
--- doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config 2008-12-06 14:16:20.000000000 +0100
|
||||
+++ doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf 2009-08-21 16:34:02.000000000 +0200
|
||||
@@ -11,7 +11,7 @@ TMAKE_CC = gcc
|
||||
TMAKE_CFLAGS = -pipe
|
||||
TMAKE_CFLAGS_WARN_ON = -Wall -W -fno-exceptions
|
||||
TMAKE_CFLAGS_WARN_OFF =
|
||||
-TMAKE_CFLAGS_RELEASE = -O2
|
||||
+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS)
|
||||
TMAKE_CFLAGS_DEBUG = -g
|
||||
TMAKE_CFLAGS_SHLIB = -fPIC
|
||||
TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
|
||||
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC
|
||||
|
||||
TMAKE_INCDIR =
|
||||
TMAKE_LIBDIR =
|
||||
-TMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
-TMAKE_INCDIR_QT = $(QTDIR)/include
|
||||
-TMAKE_LIBDIR_QT = $(QTDIR)/lib
|
||||
-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+TMAKE_INCDIR_X11 =
|
||||
+TMAKE_LIBDIR_X11 =
|
||||
+TMAKE_INCDIR_QT =
|
||||
+TMAKE_LIBDIR_QT =
|
||||
+TMAKE_INCDIR_OPENGL =
|
||||
+TMAKE_LIBDIR_OPENGL =
|
||||
|
||||
TMAKE_LINK = g++
|
||||
TMAKE_LINK_SHLIB = g++
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
diff -up doxygen-1.6.0/src/config.cpp.orig doxygen-1.6.0/src/config.cpp
|
||||
diff -up doxygen-1.6.0/src/config.l.orig doxygen-1.6.0/src/config.l
|
||||
diff -up doxygen-1.6.0/src/configoptions.cpp.orig doxygen-1.6.0/src/configoptions.cpp
|
||||
--- doxygen-1.6.0/src/configoptions.cpp.orig 2009-08-24 12:04:45.000000000 +0200
|
||||
+++ doxygen-1.6.0/src/configoptions.cpp 2009-08-24 12:06:34.000000000 +0200
|
||||
@@ -1072,6 +1072,14 @@ void addConfigOptions(Config *cfg)
|
||||
cs->setWidgetType(ConfigString::File);
|
||||
cs->addDependency("GENERATE_HTML");
|
||||
//----
|
||||
+ cb = cfg->addBool(
|
||||
+ "HTML_TIMESTAMP",
|
||||
+ "If the HTML_TIMESTAMP tag is set to YES then the generated HTML\n"
|
||||
+ "documentation will contain the timesstamp.",
|
||||
+ FALSE
|
||||
+ );
|
||||
+ cb->addDependency("GENERATE_HTML");
|
||||
+ //----
|
||||
cs = cfg->addString(
|
||||
"HTML_STYLESHEET",
|
||||
"The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n"
|
||||
diff -up doxygen-1.6.0/src/config.xml.orig doxygen-1.6.0/src/config.xml
|
||||
--- doxygen-1.6.0/src/config.xml.orig 2009-08-24 11:55:46.000000000 +0200
|
||||
+++ doxygen-1.6.0/src/config.xml 2009-08-24 12:03:06.000000000 +0200
|
||||
@@ -751,6 +751,10 @@ The HTML_FOOTER tag can be used to speci
|
||||
each generated HTML page. If it is left blank doxygen will generate a
|
||||
standard footer.
|
||||
' defval='' depends='GENERATE_HTML'/>
|
||||
+ <option type='bool' id='HTML_TIMESTAMP' docs='
|
||||
+If the HTML_TIMESTAMP tag is set to YES then the generated HTML
|
||||
+documentation will contain the timesstamp.
|
||||
+' defval='' depends='GENERATE_HTML'/>
|
||||
<option type='string' id='HTML_STYLESHEET' format='file' docs='
|
||||
The HTML_STYLESHEET tag can be used to specify a user-defined cascading
|
||||
style sheet that is used by each HTML page. It can be used to
|
||||
diff -up doxygen-1.6.0/src/htmlgen.cpp.orig doxygen-1.6.0/src/htmlgen.cpp
|
||||
--- doxygen-1.6.0/src/htmlgen.cpp.orig 2009-08-24 11:55:20.000000000 +0200
|
||||
+++ doxygen-1.6.0/src/htmlgen.cpp 2009-08-24 11:53:29.000000000 +0200
|
||||
@@ -56,6 +56,7 @@ static const char search_script[]=
|
||||
|
||||
static QCString g_header;
|
||||
static QCString g_footer;
|
||||
+static bool timestamp=false;
|
||||
|
||||
//------------------------- Pictures for the Tabs ------------------------
|
||||
|
||||
@@ -640,6 +641,8 @@ void HtmlGenerator::init()
|
||||
if (!Config_getString("HTML_FOOTER").isEmpty())
|
||||
{
|
||||
g_footer=fileToString(Config_getString("HTML_FOOTER"));
|
||||
+ if (Config_getBool("HTML_TIMESTAMP"))
|
||||
+ timestamp=true;
|
||||
//printf("g_footer='%s'\n",g_footer.data());
|
||||
}
|
||||
createSubDirs(d);
|
||||
@@ -864,7 +867,7 @@ static void writePageFooter(QTextStream
|
||||
{
|
||||
t << "<hr size=\"1\"/><address style=\"text-align: right;\"><small>";
|
||||
t << theTranslator->trGeneratedAt(
|
||||
- dateToString(TRUE),
|
||||
+ dateToString(timestamp),
|
||||
Config_getString("PROJECT_NAME")
|
||||
);
|
||||
t << " " << endl << "<a href=\"http://www.doxygen.org/index.html\">";
|
||||
67
doxygen.spec
67
doxygen.spec
|
|
@ -1,24 +1,20 @@
|
|||
%define _default_patch_fuzz 2
|
||||
|
||||
%define qt_version 3.3.8
|
||||
%define qt_version 4.4
|
||||
%{!?with_qt:%define with_qt 1}
|
||||
|
||||
Summary: A documentation system for C/C++.
|
||||
Name: doxygen
|
||||
Version: 1.5.7.1
|
||||
Version: 1.6.1
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Url: http://www.stack.nl/~dimitri/doxygen/index.html
|
||||
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
|
||||
|
||||
Patch0: doxygen-1.5.6-config.patch
|
||||
Patch2: doxygen-1.2.18-libdir.patch
|
||||
Patch3: doxygen-1.2.18-libdir64.patch
|
||||
Patch4: doxygen-1.5.5-system-png.patch
|
||||
|
||||
Patch1: doxygen-1.6.0-config.patch
|
||||
Patch2: doxygen-1.6.0-timestamp.patch
|
||||
Group: Development/Tools
|
||||
# No version is specified.
|
||||
License: GPL+
|
||||
Url: http://www.stack.nl/~dimitri/doxygen/index.html
|
||||
|
||||
BuildRequires: perl
|
||||
BuildRequires: texlive-dvips
|
||||
|
|
@ -43,7 +39,7 @@ source files.
|
|||
Summary: A GUI for creating and editing configuration files.
|
||||
Group: User Interface/X
|
||||
Requires: %{name} = %{epoch}:%{version}
|
||||
BuildRequires: qt3-devel => %{qt_version}
|
||||
BuildRequires: qt-devel => %{qt_version}
|
||||
|
||||
%description doxywizard
|
||||
Doxywizard is a GUI for creating and editing configuration files that
|
||||
|
|
@ -52,28 +48,26 @@ are used by doxygen.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .config
|
||||
|
||||
%if "%{_lib}" != "lib"
|
||||
%patch3 -p1 -b .libdir
|
||||
%else
|
||||
%patch2 -p1 -b .libdir
|
||||
%endif
|
||||
%patch4 -p1 -b .system-png
|
||||
%patch1 -p1 -b .config
|
||||
%patch2 -p1 -b .timestamp
|
||||
|
||||
%build
|
||||
%if %{with_qt}
|
||||
QTDIR="" && . /etc/profile.d/qt.sh
|
||||
%endif
|
||||
unset QTDIR
|
||||
|
||||
./configure \
|
||||
--prefix %{_prefix} \
|
||||
--shared \
|
||||
--release \
|
||||
%if %{with_qt}
|
||||
--with-doxywizard \
|
||||
%endif
|
||||
--install %{_bindir}/install
|
||||
--release
|
||||
|
||||
# workaround for "Error: operand out of range", language.cpp needs to be splitted
|
||||
%ifarch ppc64
|
||||
make -C src Makefile.libdoxygen
|
||||
sed -i -e "s|-o ../objects/language.o|-fno-merge-constants -fsection-anchors -o ../objects/language.o|" src/Makefile.libdoxygen
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags} all
|
||||
make docs
|
||||
|
|
@ -81,7 +75,7 @@ make docs
|
|||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
make install INSTALL=%{buildroot}%{_prefix}
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
%if !%{with_qt}
|
||||
rm -rf %{buildroot}%{_mandir}/man1/doxywizard*
|
||||
|
|
@ -107,6 +101,31 @@ rm -rf %{buildroot}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Aug 25 2009 Than Ngo <than@redhat.com> - 1.6.1-1
|
||||
- 1.6.1
|
||||
|
||||
* Mon Aug 24 2009 Than Ngo <than@redhat.com> - 1.6.0-2
|
||||
- fix #516339, allow to enable/disable timstamp to avoid the multilib issue
|
||||
HTMP_TIMESTAMP is disable by default
|
||||
|
||||
* Fri Aug 21 2009 Than Ngo <than@redhat.com> - 1.6.0-1
|
||||
- 1.6.0
|
||||
|
||||
* Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5.9-3
|
||||
- Convert specfile to UTF-8.
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.5.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Jul 03 2009 Than Ngo <than@redhat.com> - 1.5.9-1
|
||||
- 1.5.9
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.5.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Thu Feb 05 2009 Than Ngo <than@redhat.com> 1.5.8-1
|
||||
- 1.5.8
|
||||
|
||||
* Mon Oct 06 2008 Than Ngo <than@redhat.com> 1.5.7.1-1
|
||||
- 1.5.7.1
|
||||
|
||||
|
|
@ -314,7 +333,7 @@ rm -rf %{buildroot}
|
|||
* Wed Mar 14 2001 Jeff Johnson <jbj@redhat.com>
|
||||
- update to 1.2.6
|
||||
|
||||
* Wed Feb 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
* Wed Feb 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- rebuild
|
||||
|
||||
* Tue Dec 26 2000 Than Ngo <than@redhat.com>
|
||||
|
|
|
|||
Loading…
Reference in New Issue