revamp packaging makefile, update URLs

More common code that's still GNU make is better for my
sanity.  Also, bogomips.org went on a URL diet recently.

11 files changed, 182 insertions, 156 deletions

diff --git a/.gitignore b/.gitignore
index 77c63dd..2368011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ pkg/
 tags
 TAGS
 /LATEST
+/tmp
diff --git a/.wrongdoc.yml b/.wrongdoc.yml
index 2c904c7..0688ff2 100644
--- a/.wrongdoc.yml
+++ b/.wrongdoc.yml
@@ -1,4 +1,4 @@
 ---
-cgit_url: http://git.bogomips.org/cgit/kgio.git
-git_url: git://git.bogomips.org/kgio.git
+cgit_url: http://bogomips.org/kgio.git
+git_url: git://bogomips.org/kgio.git
 rdoc_url: http://bogomips.org/kgio/
diff --git a/GNUmakefile b/GNUmakefile
index 5d5768c..e960d38 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,153 +1,10 @@
-# use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-RUBY = ruby
-RAKE = rake
-RSYNC = rsync
-
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-        @./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-ifeq ($(DLEXT),) # "so" for Linux
-  DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
-endif
-ifeq ($(RUBY_VERSION),)
-  RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
-endif
-
-install:
-        $(prep_setup_rb)
-        $(RM) -r .install-tmp
-        mkdir .install-tmp
-        $(RUBY) setup.rb all
-        $(RM) $^
-        $(RM) -r .install-tmp
-        $(prep_setup_rb)
-
-setup_rb_files := .config InstalledFiles
-prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean
-
-clean:
-        -$(MAKE) -C ext/kgio clean
-        $(RM) $(setup_rb_files) ext/kgio/Makefile
-
-pkg_extra := GIT-VERSION-FILE NEWS ChangeLog LATEST
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-        wrongdoc prepare
-
-.manifest: ChangeLog
-        (git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
-                LC_ALL=C sort > $@+
-        cmp $@+ $@ || mv $@+ $@
-        $(RM) $@+
-
-doc: .document .wrongdoc.yml
-        find lib ext -type f -name '*.rbc' -exec rm -f '{}' ';'
-        $(RM) -r doc
-        wrongdoc all
-        install -m644 COPYING doc/COPYING
-        install -m644 $(shell grep '^[A-Z]' .document) doc/
-
-ifneq ($(VERSION),)
+RSYNC_DEST := bogomips.org:/srv/bogomips/kgio
 rfproject := rainbows
 rfpackage := kgio
-pkggem := pkg/$(rfpackage)-$(VERSION).gem
-pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-        wrongdoc release_changes > $@+
-        $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(release_notes):
-        wrongdoc release_notes > $@+
-        $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-
-# ensures we're actually on the tagged $(VERSION), only used for release
-verify:
-        test x"$(shell umask)" = x0022
-        git rev-parse --verify refs/tags/v$(VERSION)^{}
-        git diff-index --quiet HEAD^0
-        test `git rev-parse --verify HEAD^0` = \
-             `git rev-parse --verify refs/tags/v$(VERSION)^{}`
-
-fix-perms:
-        -git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
-        -git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
-
-gem: $(pkggem)
-
-install-gem: $(pkggem)
-        gem install $(CURDIR)/$<
-
-$(pkggem): .manifest fix-perms
-        gem build $(rfpackage).gemspec
-        mkdir -p pkg
-        mv $(@F) $@
-
-$(pkgtgz): distdir = $(basename $@)
-$(pkgtgz): HEAD = v$(VERSION)
-$(pkgtgz): .manifest fix-perms
-        @test -n "$(distdir)"
-        $(RM) -r $(distdir)
-        mkdir -p $(distdir)
-        tar cf - `cat .manifest` | (cd $(distdir) && tar xf -)
-        cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
-        mv $@+ $@
-
-package: $(pkgtgz) $(pkggem)
-
-test-release: verify package $(release_notes) $(release_changes)
-release: verify package $(release_notes) $(release_changes)
-        # make tgz release on RubyForge
-        rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-          $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-        # push gem to RubyGems.org
-        gem push $(pkggem)
-        # in case of gem downloads from RubyForge releases page
-        -rubyforge add_file \
-          $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+include pkg.mk
+ifneq ($(VERSION),)
+release::
         $(RAKE) raa_update VERSION=$(VERSION)
         $(RAKE) publish_news VERSION=$(VERSION)
-else
-gem install-gem: GIT-VERSION-FILE
-        $(MAKE) $@ VERSION=$(GIT_VERSION)
 endif
-
-ext := ext/kgio/kgio_ext.$(DLEXT)
-ext/kgio/Makefile: ext/kgio/extconf.rb
-        cd $(@D) && $(RUBY) extconf.rb
-
-$(ext): $(wildcard ext/kgio/*.[ch] ext/kgio/*/*.h) ext/kgio/Makefile
-        $(MAKE) -C $(@D)
-
-all:: test
-
-build: $(ext)
-test_units := $(wildcard test/test_*.rb)
-test: test-unit
-test-unit: $(test_units)
-$(test_units): build
-        $(RUBY) -I lib:ext/kgio $@
-
-# this requires GNU coreutils variants
-publish_doc:
-        -git set-file-times
-        $(MAKE) doc
-        find doc/images -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/ bogomips.org:/srv/bogomips/kgio/
-        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:
-        for i in $(docs); do \
-          gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
-
-.PHONY: .FORCE-GIT-VERSION-FILE doc test $(test_units)
diff --git a/README b/README
index 0f1a71c..bd3f89d 100644
--- a/README
+++ b/README
@@ -45,13 +45,13 @@ You may also install it via RubyGems.org:
 You can get the latest source via git from the following locations
 (these versions may not be stable):
 
-  git://git.bogomips.org/kgio.git
+  git://bogomips.org/kgio.git
   git://repo.or.cz/kgio.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://git.bogomips.org/cgit/kgio.git (cgit)
+* http://bogomips.org/kgio.git (cgit)
 * http://repo.or.cz/w/kgio.git (gitweb)
 
 See the HACKING guide on how to contribute and build prerelease gems
diff --git a/Rakefile b/Rakefile
index ce294a7..0fe4be3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
-cgit_url = "http://git.bogomips.org/cgit/kgio.git"
-git_url = 'git://git.bogomips.org/kgio.git'
+cgit_url = "http://bogomips.org/kgio.git"
+git_url = 'git://bogomips.org/kgio.git'
 
 desc "post news article to rubyforge"
 task :publish_news do
diff --git a/ext/kgio/accept.c b/ext/kgio/accept.c
index 4856234..66c2712 100644
--- a/ext/kgio/accept.c
+++ b/ext/kgio/accept.c
@@ -1,5 +1,5 @@
 #include "kgio.h"
-#include "missing/accept4.h"
+#include "missing_accept4.h"
 #include "sock_for_fd.h"
 
 static VALUE localhost;
diff --git a/ext/kgio/missing/ancient_ruby.h b/ext/kgio/ancient_ruby.h
index 014e4b8..014e4b8 100644
--- a/ext/kgio/missing/ancient_ruby.h
+++ b/ext/kgio/ancient_ruby.h
diff --git a/ext/kgio/kgio.h b/ext/kgio/kgio.h
index 78445e3..dc270e6 100644
--- a/ext/kgio/kgio.h
+++ b/ext/kgio/kgio.h
@@ -17,7 +17,7 @@
 #include <arpa/inet.h>
 #include <assert.h>
 
-#include "missing/ancient_ruby.h"
+#include "ancient_ruby.h"
 #include "nonblock.h"
 #include "my_fileno.h"
 
diff --git a/ext/kgio/missing/accept4.h b/ext/kgio/missing_accept4.h
index 22bd9bc..22bd9bc 100644
--- a/ext/kgio/missing/accept4.h
+++ b/ext/kgio/missing_accept4.h
diff --git a/kgio.gemspec b/kgio.gemspec
index ec70c6b..ef523b5 100644
--- a/kgio.gemspec
+++ b/kgio.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir['test/test_*.rb']
   s.extensions = %w(ext/kgio/extconf.rb)
 
-  s.add_development_dependency('wrongdoc', '~> 1.0.1')
+  s.add_development_dependency('wrongdoc', '~> 1.4')
 
   # s.license = %w(LGPL) # disabled for compatibility with older RubyGems
 end
diff --git a/pkg.mk b/pkg.mk
new file mode 100644
index 0000000..fb71491
--- /dev/null
+++ b/pkg.mk
@@ -0,0 +1,168 @@
+RUBY = ruby
+RAKE = rake
+RSYNC = rsync
+WRONGDOC = wrongdoc
+
+GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+        @./GIT-VERSION-GEN
+-include GIT-VERSION-FILE
+-include local.mk
+DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
+RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
+RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
+lib := lib
+
+ifeq ($(shell test -f script/isolate_for_tests && echo t),t)
+isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/isolate.mk
+$(isolate_libs): script/isolate_for_tests
+        @$(RUBY) script/isolate_for_tests
+-include $(isolate_libs)
+lib := $(lib):$(ISOLATE_LIBS)
+endif
+
+ext := $(firstword $(wildcard ext/*))
+ifneq ($(ext),)
+ext_pfx := tmp/ext/$(RUBY_ENGINE)-$(RUBY_VERSION)
+ext_h := $(wildcard $(ext)/*/*.h $(ext)/*.h)
+ext_src := $(wildcard $(ext)/*.c $(ext_h))
+ext_pfx_src := $(addprefix $(ext_pfx)/,$(ext_src))
+ext_d := $(ext_pfx)/$(ext)/.d
+$(ext)/extconf.rb: $(wildcard $(ext)/*.h)
+        @>> $@
+$(ext_d):
+        @mkdir -p $(@D)
+        @> $@
+$(ext_pfx)/$(ext)/%: $(ext)/% $(ext_d)
+        install -m 644 $< $@
+$(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb $(ext_d) $(ext_h)
+        $(RM) -f $(@D)/*.o
+        cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb
+ext_sfx := _ext.$(DLEXT)
+ext_dl := $(ext_pfx)/$(ext)/$(notdir $(ext)_ext.$(DLEXT))
+$(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
+        @echo $^ == $@
+        $(MAKE) -C $(@D)
+lib := $(lib):$(ext_pfx)/$(ext)
+build: $(ext_dl)
+endif
+
+pkg_extra := GIT-VERSION-FILE NEWS ChangeLog LATEST
+ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
+        $(WRONGDOC) prepare
+
+manifest:
+        $(RM) .manifest
+        $(MAKE) .manifest
+
+.manifest: ChangeLog
+        (git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
+                LC_ALL=C sort > $@+
+        cmp $@+ $@ || mv $@+ $@
+        $(RM) $@+
+
+doc:: .document .wrongdoc.yml
+        find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
+        -find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
+        $(RM) -r doc
+        $(WRONGDOC) all
+        install -m644 COPYING doc/COPYING
+        install -m644 $(shell grep '^[A-Z]' .document) doc/
+
+ifneq ($(VERSION),)
+pkggem := pkg/$(rfpackage)-$(VERSION).gem
+pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
+release_notes := release_notes-$(VERSION)
+release_changes := release_changes-$(VERSION)
+
+release-notes: $(release_notes)
+release-changes: $(release_changes)
+$(release_changes):
+        $(WRONGDOC) release_changes > $@+
+        $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
+$(release_notes):
+        $(WRONGDOC) release_notes > $@+
+        $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
+
+# ensures we're actually on the tagged $(VERSION), only used for release
+verify:
+        test x"$(shell umask)" = x0022
+        git rev-parse --verify refs/tags/v$(VERSION)^{}
+        git diff-index --quiet HEAD^0
+        test $$(git rev-parse --verify HEAD^0) = \
+             $$(git rev-parse --verify refs/tags/v$(VERSION)^{})
+
+fix-perms:
+        -git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
+        -git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
+
+gem: $(pkggem)
+
+install-gem: $(pkggem)
+        gem install $(CURDIR)/$<
+
+$(pkggem): manifest fix-perms
+        gem build $(rfpackage).gemspec
+        mkdir -p pkg
+        mv $(@F) $@
+
+$(pkgtgz): distdir = $(basename $@)
+$(pkgtgz): HEAD = v$(VERSION)
+$(pkgtgz): manifest fix-perms
+        @test -n "$(distdir)"
+        $(RM) -r $(distdir)
+        mkdir -p $(distdir)
+        tar cf - $$(cat .manifest) | (cd $(distdir) && tar xf -)
+        cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
+        mv $@+ $@
+
+package: $(pkgtgz) $(pkggem)
+
+test-release:: verify package $(release_notes) $(release_changes)
+        # make tgz release on RubyForge
+        @echo rubyforge add_release -f \
+          -n $(release_notes) -a $(release_changes) \
+          $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+        @echo gem push $(pkggem)
+        @echo rubyforge add_file \
+          $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+release:: verify package $(release_notes) $(release_changes)
+        # make tgz release on RubyForge
+        rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
+          $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+        # push gem to RubyGems.org
+        gem push $(pkggem)
+        # in case of gem downloads from RubyForge releases page
+        rubyforge add_file \
+          $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+else
+gem install-gem: GIT-VERSION-FILE
+        $(MAKE) $@ VERSION=$(GIT_VERSION)
+endif
+
+all:: test
+test_units := $(wildcard test/test_*.rb)
+test: test-unit
+test-unit: $(test_units)
+$(test_units): build
+        $(RUBY) -I $(lib) $@
+
+# this requires GNU coreutils variants
+ifneq ($(RSYNC_DEST),)
+publish_doc:
+        -git set-file-times
+        $(MAKE) doc
+        find doc/images -type f | \
+                TZ=UTC xargs touch -d '1970-01-01 00:00:06' doc/rdoc.css
+        $(MAKE) doc_gz
+        $(RSYNC) -av doc/ $(RSYNC_DEST)/
+        git ls-files | xargs touch
+endif
+
+# 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:
+        for i in $(docs); do \
+          gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+
+.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest