From cc08315b7821cf7178d233451fd6bbe84eb90dcc Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 21 Jan 2011 15:34:15 -0800
Subject: extract common tasks to pkg.mk to simplify our makefile

---
 GNUmakefile | 140 ++++++------------------------------------------------------
 1 file changed, 13 insertions(+), 127 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 6b392e2..d935d26 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,18 +1,15 @@
 # use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-MRI = ruby
-RUBY = ruby
-RAKE = rake
-RSYNC = rsync
-
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-ifeq ($(RUBY_VERSION),)
-  RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
+RSYNC_DEST := rubyforge.org:/var/www/gforge-projects/rainbows
+rfproject := rainbows
+rfpackage := rainbows
+include pkg.mk
+ifneq ($(VERSION),)
+release::
+	$(RAKE) raa_update VERSION=$(VERSION)
+	$(RAKE) publish_news VERSION=$(VERSION)
+	$(RAKE) fm_update VERSION=$(VERSION)
 endif
-RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 
 base_bins := rainbows
 bins := $(addprefix bin/, $(base_bins))
@@ -20,134 +17,23 @@ man1_rdoc := $(addsuffix _1, $(base_bins))
 man1_bins := $(addsuffix .1, $(base_bins))
 man1_paths := $(addprefix man/man1/, $(man1_bins))
 
-install: $(bins)
-	$(prep_setup_rb)
-	$(RM) -r .install-tmp
-	mkdir .install-tmp
-	cp -p bin/* .install-tmp
-	$(RUBY) setup.rb all
-	$(RM) $^
-	mv .install-tmp/* bin/
-	$(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) clean
 	-$(MAKE) -C Documentation clean
-	$(RM) $(setup_rb_files) $(t_log)
 
 man html:
 	$(MAKE) -C Documentation install-$@
 
-pkg_extra := GIT-VERSION-FILE ChangeLog LATEST NEWS $(man1_paths)
-
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	wrongdoc prepare
-
-manifest: ChangeLog GIT-VERSION-FILE
-	$(RM) -f .manifest
-	$(MAKE) .manifest
-
-.manifest:
-	(git ls-files && for i in $@ $(pkg_extra) ; do echo $$i; done) | \
-	  LC_ALL=C sort > $@+
-	cmp $@+ $@ || mv $@+ $@
-	$(RM) $@+
+pkg_extra += $(man1_paths)
 
-doc: .document man html .wrongdoc.yml
+man-rdoc: man html
 	$(MAKE) -C Documentation comparison.html
 	for i in $(man1_rdoc); do echo > $$i; done
-	find bin lib -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/
-	install -m644 $(man1_paths) doc/
+doc:: man-rdoc
 	cat Documentation/comparison.css >> doc/rdoc.css
 	$(RM) $(man1_rdoc)
 
-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/ rubyforge.org:/var/www/gforge-projects/rainbows/
-	git ls-files | xargs touch
-
-ifneq ($(VERSION),)
-rfproject := rainbows
-rfpackage := rainbows
-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)
-
-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)
-	$(RAKE) raa_update VERSION=$(VERSION)
-	$(RAKE) fm_update VERSION=$(VERSION)
-	$(RAKE) publish_news VERSION=$(VERSION)
-else
-gem install-gem: GIT-VERSION-FILE
-	$(MAKE) $@ VERSION=$(GIT_VERSION)
-endif
-
 all:: test
 test:
 	$(MAKE) -C t
 
-.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test html
+.PHONY: man html
-- 
cgit v1.2.3-24-ge0c7