File ruby-1.8.6-htmldoc.patch of Package ruby

Overview Repositories Revisions Requests Users Attributes Meta

File ruby-1.8.6-htmldoc.patch of Package ruby

diff -ur ruby-1.8.6-p230.orig/common.mk ruby-1.8.6-p230/common.mk
--- ruby-1.8.6-p230.orig/common.mk	2007-02-28 08:23:42.000000000 -0500
+++ ruby-1.8.6-p230/common.mk	2008-07-31 09:04:37.000000000 -0400
@@ -10,6 +10,7 @@
 RBCONFIG      = ./.rbconfig.time
 LIBRUBY_EXTS  = ./.libruby-with-ext.time
 RDOCOUT       = $(EXTOUT)/rdoc
+HTMLOUT       = $(EXTOUT)/html
 
 DMYEXT	      = dmyext.$(OBJEXT)
 MAINOBJ	      = main.$(OBJEXT)
@@ -90,7 +91,7 @@
 ruby.imp: $(OBJS)
 	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
 
-install: install-nodoc $(RDOCTARGET)
+install: install-nodoc $(RDOCTARGET) $(HTMLTARGET)
 install-all: install-nodoc install-doc
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
@@ -249,6 +250,18 @@
 	@echo Generating RDoc documentation
 	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
 
+
+install-html-doc: rdoc-html pre-install-html-doc do-install-html-doc  post-install-html-doc
+pre-install-html-doc:: install-prereq
+do-install-html-doc: $(PROGRAM)
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=html --html-output="$(HTMLOUT)"
+post-install-html-doc::
+	@$(NULLCMD)
+
+rdoc-html: $(PROGRAM) PHONY
+	@echo Generating HTML documentation
+	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --fmt=html --charset=UTF-8 -p --inline-source --op "$(HTMLOUT)" "$(srcdir)"
+
 what-where-doc: no-install-doc
 no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
 pre-no-install-doc:: install-prereq
@@ -257,6 +270,14 @@
 post-no-install-doc::
 	@$(NULLCMD)
 
+what-where-html-doc: no-install-html-doc
+no-install-html-doc: pre-no-install-html-doc dont-install-html-doc post-no-install-html-doc
+pre-no-install-html-doc:: install-prereq
+dont-install-html-doc::
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=html --html-output="$(HTMLOUT)"
+post-no-install-html-doc::
+	@$(NULLCMD)
+
 install-prereq:
 	@exit > $(INSTALLED_LIST)
 
diff -ur ruby-1.8.6-p230.orig/configure.in ruby-1.8.6-p230/configure.in
--- ruby-1.8.6-p230.orig/configure.in	2008-07-31 09:02:02.000000000 -0400
+++ ruby-1.8.6-p230/configure.in	2008-07-31 09:02:42.000000000 -0400
@@ -1440,6 +1440,16 @@
 fi
 AC_SUBST(RDOCTARGET)
 
+dnl build rdoc html if requested
+HTMLTARGET=""
+AC_ARG_ENABLE(install-html-doc,
+       [  --enable-install-html-doc    build and install rdoc html files during install ],
+       [install_html=$enableval], [install_html=no])
+if test "$install_html" != no; then
+   HTMLTARGET="install-html-doc"
+fi
+AC_SUBST(HTMLTARGET)
+
 case "$target_os" in
     linux*)
 	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
diff -ur ruby-1.8.6-p230.orig/instruby.rb ruby-1.8.6-p230/instruby.rb
--- ruby-1.8.6-p230.orig/instruby.rb	2008-07-31 09:02:02.000000000 -0400
+++ ruby-1.8.6-p230/instruby.rb	2008-07-31 09:02:42.000000000 -0400
@@ -24,6 +24,7 @@
   $installed_list = nil
   $dryrun = false
   $rdocdir = nil
+  $htmloutdir= nil
   opt = OptionParser.new
   opt.on('-n') {$dryrun = true}
   opt.on('--dest-dir=DIR') {|dir| $destdir = dir}
@@ -37,11 +38,12 @@
     $mflags.concat(v)
   end
   opt.on('-i', '--install=TYPE',
-         [:local, :bin, :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc]) do |ins|
+         [:local, :bin, :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc, :html]) do |ins|
     $install << ins
   end
   opt.on('--installed-list [FILENAME]') {|name| $installed_list = name}
   opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir}
+  opt.on('--html-output [DIR]') {|dir| $htmloutdir = dir}
 
   opt.parse! rescue abort [$!.message, opt].join("\n")
 
@@ -77,6 +79,7 @@
   end
 
   $rdocdir ||= $mflags.defined?('RDOCOUT')
+  $htmloutdir ||= $mflags.defined?('HTMLOUT')
 end
 
 parse_args()
@@ -228,6 +231,17 @@
   end
 end
 
+install?(:html) do
+  if $htmloutdir
+    puts "installing html docs"
+
+    htmldir = CONFIG['htmldir']
+    Config.expand(htmldir)
+    makedirs [htmldir]
+    install_recursive($htmloutdir, htmldir)
+  end
+end
+
 install?(:local, :comm, :bin) do
   puts "installing command scripts"
 
--- ruby-1.8.6-p230/Makefile.in.orig	2008-06-04 03:41:47.000000000 -0400
+++ ruby-1.8.6-p230/Makefile.in	2008-07-31 11:31:35.000000000 -0400
@@ -28,6 +28,7 @@
 TESTUI = console
 TESTS =
 RDOCTARGET = @RDOCTARGET@
+HTMLTARGET = @HTMLTARGET@
 
 EXTOUT = @EXTOUT@
 RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system

Places

File ruby-1.8.6-htmldoc.patch of Package ruby

Places