update packaging

I like make so I wrote pkg.mk

6 files changed, 220 insertions, 116 deletions

diff --git a/.gitignore b/.gitignore
index aa0451d..6ec99be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,9 @@
 /ChangeLog
 /LATEST
 /doc
+/tmp
+/GIT-VERSION-FILE
+*.so
+*.o
+Makefile
+/.manifest
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
new file mode 100755
index 0000000..2b14a69
--- /dev/null
+++ b/GIT-VERSION-GEN
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+GVF=GIT-VERSION-FILE
+DEF_VER=v0.0.1.GIT
+
+LF='
+'
+
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -f version
+then
+        VN=$(cat version) || VN="$DEF_VER"
+elif test -d .git -o -f .git &&
+        VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+        case "$VN" in
+        *$LF*) (exit 1) ;;
+        v[0-9]*)
+                git update-index -q --refresh
+                test -z "$(git diff-index --name-only HEAD --)" ||
+                VN="$VN-dirty" ;;
+        esac
+then
+        VN=$(echo "$VN" | sed -e 's/-/./g');
+else
+        VN="$DEF_VER"
+fi
+
+VN=$(expr "$VN" : v*'\(.*\)')
+
+if test -r $GVF
+then
+        VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)
+else
+        VC=unset
+fi
+test "$VN" = "$VC" || {
+        echo >&2 "GIT_VERSION = $VN"
+        echo "GIT_VERSION = $VN" >$GVF
+}
diff --git a/GNUmakefile b/GNUmakefile
index 9593de5..78b4aef 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,108 +1,9 @@
-RUBY = ruby
-RSYNC = rsync
-all: ext/mall/mall.so
-
-ext/mall/Makefile: ext/mall/mall.c ext/mall/extconf.rb
-        cd ext/mall && ruby extconf.rb
-
-ext/mall/mall.so: ext/mall/Makefile
-        $(MAKE) -C ext/mall
-
+all::
+RSYNC_DEST := bogomips.org:/srv/bogomips/mall
+pkg_extra += ext/mall/mall.c
 ext/mall/mall.c: ext/mall/mall.c.erb
         erb < $< > $@+
         mv $@+ $@
-clean:
-        -$(MAKE) -C ext/mall clean
-
-test: ext/mall/mall.so
-        $(RUBY) -Iext/mall -rmall test/test_mall.rb
-
-pkg_extra := ChangeLog LATEST NEWS
-doc: .document .wrongdoc.yml ext/mall/mall.c
-        find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
-        $(RM) -r doc
-        wrongdoc all
-        install -m644 COPYING doc/
-        install -m644 $(shell grep '^[A-Z]' .document) doc/
-
-.manifest: ChangeLog
-        (git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \
-          LC_ALL=C sort > $@+
-        mv $@+ $@
-
-publish_doc:
-        -git set-file-times
-        $(MAKE) doc
-        find doc/images -type f | \
-                TZ=UTC xargs touch -d '1970-01-01 00:00:02' doc/rdoc.css
-        chmod 644 $$(find doc -type f)
-        $(RSYNC) -av doc/ bogomips.org:/srv/bogomips/mall/
-        git ls-files | xargs touch
-
-ifneq ($(VERSION),)
 rfproject := qrp
 rfpackage := mall
-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)
-else
-gem install-gem: GIT-VERSION-FILE
-        $(MAKE) $@ VERSION=$(GIT_VERSION)
-endif
-
-.PHONY: test doc
+include pkg.mk
diff --git a/ext/mall/extconf.rb b/ext/mall/extconf.rb
index 9ba1c32..a180c71 100644
--- a/ext/mall/extconf.rb
+++ b/ext/mall/extconf.rb
@@ -1,15 +1,5 @@
 require 'mkmf'
 
-st_r = File.stat('mall.c.erb')
-st_c = File.stat('mall.c') rescue nil
-if st_c.nil? || st_c.ctime < st_r.ctime
-  require 'erb'
-  File.open('mall.c+', 'wb') { |fp|
-    fp.syswrite(ERB.new(File.read('mall.c.erb')).result)
-  }
-  File.rename('mall.c+', 'mall.c')
-end
-
 have_header('malloc.h') or abort "malloc.h header missing"
 have_type('struct mallinfo', 'malloc.h') or abort 'struct mallinfo missing'
 have_func('malloc_trim', 'malloc.h')
diff --git a/mall.gemspec b/mall.gemspec
index 036f4ce..cd96a5e 100644
--- a/mall.gemspec
+++ b/mall.gemspec
@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = Wrongdoc.config[:rdoc_url]
   s.summary = summary
   s.rdoc_options = rdoc_options
-  s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{qrp}
-  s.test_files = test_files
-  s.add_development_dependency(%q<wrongdoc>, "~> 1.0.1")
+  s.test_files = Dir["test/test_*.rb"]
+  s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
 end
diff --git a/pkg.mk b/pkg.mk
new file mode 100644
index 0000000..247fa69
--- /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 RbConfig::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