From 42e0d76c25a8a3875d194579bf2a795cbac2772d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 2 Feb 2009 23:10:28 +0000
Subject: [PATCH] * common.mk (Doxyfile): moved from Makefile.in.

* template/Doxyfile.tmpl: split from Doxyfile.in.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  6 ++++++
 Doxyfile.in            |  9 ++-------
 Makefile.in            |  2 --
 common.mk              |  4 ++++
 configure.in           |  1 -
 template/Doxyfile.tmpl | 22 ++++++++++++++++++++++
 6 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 template/Doxyfile.tmpl

diff --git a/ChangeLog b/ChangeLog
index 7f7fc2d5af..1af0bfe29f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb  3 08:10:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (Doxyfile): moved from Makefile.in.
+
+	* template/Doxyfile.tmpl: split from Doxyfile.in.
+
 Tue Feb  3 08:01:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_write): use of cast expressions as lvalues
diff --git a/Doxyfile.in b/Doxyfile.in
index da1019ae52..ec27d2c054 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -5,7 +5,6 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = Ruby
-PROJECT_NUMBER         = @MAJOR@.@MINOR@.@TEENY@
 OUTPUT_DIRECTORY       = doc/capi
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -15,7 +14,6 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = YES
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = @srcdir@
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
@@ -69,7 +67,6 @@ SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = NO
 SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
-FILE_VERSION_FILTER    = "@MINIRUBY@ @srcdir@/tool/file2lastrev.rb -q"
 LAYOUT_FILE            = 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -84,19 +81,17 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = @srcdir@
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c *.h *.y
 RECURSIVE              = YES
 EXCLUDE                = newline.c 
-EXCLUDE_SYMLINKS       = NO
+EXCLUDE_SYMLINKS       = YES
 EXCLUDE_PATTERNS       = *.src doc build tmp test yarvtest lib bootstraptest spec .ext .git .svn
 EXCLUDE_SYMBOLS        = 
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = 
-INPUT_FILTER           = "@MINIRUBY@ @srcdir@/tool/strip-rdoc.rb"
 FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = YES
 #---------------------------------------------------------------------------
@@ -143,7 +138,7 @@ QHP_VIRTUAL_FOLDER     = doc
 QHG_LOCATION           = 
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NONE
+GENERATE_TREEVIEW      = NO
 TREEVIEW_WIDTH         = 250
 FORMULA_FONTSIZE       = 10
 #---------------------------------------------------------------------------
diff --git a/Makefile.in b/Makefile.in
index fc593c0f7a..d4c42e3d0d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -166,8 +166,6 @@ fake.rb:	Makefile
 		' > $@
 
 Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
-Doxyfile:	$(srcdir)/Doxyfile.in config.status
-	MAKE=$(MAKE) $(SHELL) ./config.status
 
 $(MKFILES): config.status
 		MAKE=$(MAKE) $(SHELL) ./config.status
diff --git a/common.mk b/common.mk
index 0b4f6e307b..abbd1818f0 100644
--- a/common.mk
+++ b/common.mk
@@ -141,6 +141,10 @@ capi: Doxyfile PHONY
 	@$(MAKEDIRS) doc/capi
 	@doxygen
 
+Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/Doxyfile.tmpl $(RBCONFIG)
+	$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
+	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
+
 program: $(PROGRAM)
 
 $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
diff --git a/configure.in b/configure.in
index 54066e90d9..a0ac2e6e46 100644
--- a/configure.in
+++ b/configure.in
@@ -2171,7 +2171,6 @@ AC_SUBST(BUILTIN_TRANSOBJS)
 PACKAGE=$RUBY_INSTALL_NAME
 AC_SUBST(PACKAGE)
 
-AC_CONFIG_FILES(Doxyfile)
 AC_CONFIG_FILES($FIRSTMAKEFILE)
 AC_CONFIG_FILES(Makefile, [{
 	if test -d "$srcdir/.svn"; then
diff --git a/template/Doxyfile.tmpl b/template/Doxyfile.tmpl
new file mode 100644
index 0000000000..fd9fcc4d7f
--- /dev/null
+++ b/template/Doxyfile.tmpl
@@ -0,0 +1,22 @@
+# Doxyfile 1.5.7
+<%
+srcdir = miniruby = nil
+opt = OptionParser.new do |o|
+  o.on('--srcdir=SRCDIR') {|v| srcdir = v}
+  o.on('--miniruby=MINIRUBY') {|v| miniruby = v}
+  o.order!(ARGV)
+end
+srcdir ||= File.dirname(File.dirname(__FILE__))
+unless miniruby
+  load 'rbconfig.rb'
+  miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
+  RbConfig.expand(miniruby, RbConfig::CONFIG.merge("srcdir"=>srcdir))
+end
+%>
+@INCLUDE_PATH = <%=srcdir%>
+@INCLUDE = Doxyfile.in
+PROJECT_NUMBER         = <%=RUBY_VERSION%>
+STRIP_FROM_PATH        = <%=srcdir%>
+FILE_VERSION_FILTER    = "<%=miniruby%> <%=srcdir%>/tool/file2lastrev.rb -q"
+INPUT                  = <%=srcdir%>
+INPUT_FILTER           = "<%=miniruby%> <%=srcdir%>/tool/strip-rdoc.rb"