cleanup makefiles, move publish_doc into main

Since the docs for this project are hosted on Rubyforge.org
(currently Apache), it can't use the nginx "gzip_static on"
configuration I normally use on on *.bogomips.org.

I never used the irb/sh wrappers in local.mk, either, and
the isolate bits have all been moved inside t/

2 files changed, 16 insertions, 36 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 4c4e783..32a1b8c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,6 +2,7 @@
 all::
 RUBY = ruby
 RAKE = rake
+RSYNC = rsync
 GIT_URL = git://git.bogomips.org/rainbows.git
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@@ -15,12 +16,6 @@ ifeq ($(RUBY_VERSION),)
   RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 endif
 
-# rake takes forever to start
-isolate: tmp/isolate/ruby-$(RUBY_VERSION)/.isolate
-tmp/isolate/ruby-$(RUBY_VERSION)/.isolate: config/isolate.rb
-        $(RAKE) isolate
-        > $@
-
 base_bins := rainbows
 bins := $(addprefix bin/, $(base_bins))
 man1_rdoc := $(addsuffix _1, $(base_bins))
@@ -111,6 +106,19 @@ doc: .document NEWS ChangeLog
         cat Documentation/comparison.css >> doc/rdoc.css
         $(RM) $(man1_rdoc)
 
+# publishes docs to http://rainbows.rubyforge.org
+publish_doc: NEWS
+        -git set-file-times
+        $(RM) -r doc ChangeLog NEWS
+        $(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
+        awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' \
+         < NEWS > doc/LATEST
+        -find doc/images doc/js -type f | \
+                TZ=UTC xargs touch -d '1970-01-01 00:00:01' doc/rdoc.css
+        chmod 644 $$(find doc -type f)
+        $(RSYNC) -av doc/ rubyforge.org:/var/www/gforge-projects/rainbows/
+        git ls-files | xargs touch
+
 ifneq ($(VERSION),)
 rfproject := rainbows
 rfpackage := rainbows
@@ -171,6 +179,8 @@ release: verify package $(release_notes) $(release_changes)
         # in case of gem downloads from RubyForge releases page
         -rubyforge add_file \
           $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+        $(RAKE) raa_update VERSION=$(VERSION)
+        $(RAKE) fm_update VERSION=$(VERSION)
 else
 gem install-gem: GIT-VERSION-FILE
         $(MAKE) $@ VERSION=$(GIT_VERSION)
diff --git a/local.mk.sample b/local.mk.sample
index 169f6ea..5b1e025 100644
--- a/local.mk.sample
+++ b/local.mk.sample
@@ -4,7 +4,6 @@
 #
 # This is depends on a bunch of GNU-isms from bash, sed, touch.
 
-RSYNC = rsync
 DLEXT := so
 
 # if you have a decent amount of RAM, setting TMPDIR to be on tmpfs
@@ -46,32 +45,3 @@ test-191:
         $(MAKE) test r19=T 2>&1 | sed -e 's!^!1.9.1 !'
 test-192:
         $(MAKE) test r192=T 2>&1 | sed -e 's!^!1.9.2 !'
-
-latest: NEWS
-        @awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' < $<
-
-# publishes docs to http://rainbows.rubyforge.org
-publish_doc:
-        -git set-file-times
-        $(RM) -r doc ChangeLog NEWS
-        $(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
-        $(MAKE) -s latest > doc/LATEST
-        find doc/images doc/js -type f | \
-                TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
-        $(MAKE) doc_gz
-        chmod 644 $$(find doc -type f)
-        $(RSYNC) -av doc/ rubyforge.org:/var/www/gforge-projects/rainbows/
-        $(RSYNC) -av doc/ dcvr:/srv/rainbows/
-        git ls-files | xargs touch
-
-# Create gzip variants of the same timestamp as the original so nginx
-# "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
-doc_gz:
-        touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"
-        for i in $(docs); do \
-          gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
-
-# launches any of the following shells with RUBYLIB set
-irb sh bash ksh:
-        $@