local.mk.sample in zbatery-0.3.0 vs local.mk.sample in zbatery-0.3.1

@@ -1,78 +1,47 @@
-
 # this is the local.mk file used by Eric Wong on his dev boxes.
 # GNUmakefile will source local.mk in the top-level source tree
 # if it is present.
 #
 # This is depends on a bunch of GNU-isms from bash, sed, touch.
 
-RSYNC = rsync
 DLEXT := so
-gems := rack-1.0.1
-# gems += unicorn-0.95.2 # installed via setup.rb
-# gems += rainbows-0.8.0 # installed via setup.rb
-gems += rev-0.3.1
-gems += iobuffer-0.1.1
-gems += eventmachine-0.12.10
-gems += async_sinatra-0.1.5 sinatra-0.9.4
 
+# if you have a decent amount of RAM, setting TMPDIR to be on tmpfs
+# can significantly improve performance because uploads take a lot
+# of disk I/O due to the rewindability requirement in Rack.
+# TMPDIR := /dev/shm
+# export TMPDIR
+
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 prefix = $(HOME)
-ifeq ($(r19),)
-  RUBY := $(prefix)/bin/ruby
-  gem_paths := $(addprefix $(prefix)/lib/ruby/gems/1.8/gems/,$(gems))
+
+ifeq ($(r192),)
+  ifeq ($(r19),)
+    RUBY := $(prefix)/bin/ruby
+  else
+    prefix := $(prefix)/ruby-1.9
+    export PATH := $(prefix)/bin:$(PATH)
+    RUBY := $(prefix)/bin/ruby --disable-gems
+  endif
 else
-  prefix := $(prefix)/ruby-1.9
+  prefix := $(prefix)/ruby-1.9.2
   export PATH := $(prefix)/bin:$(PATH)
   RUBY := $(prefix)/bin/ruby --disable-gems
-  gems += case-0.5 revactor-0.1.5
-  gem_paths := $(addprefix $(prefix)/lib/ruby/gems/1.9.1/gems/,$(gems))
 endif
 
-ifdef gem_paths
-  sp :=
-  sp +=
-  export RUBYLIB := $(subst $(sp),:,$(addsuffix /lib,$(gem_paths)))
-endif
-
 # pipefail is THE reason to use bash (v3+) or never revisions of ksh93
 # SHELL := /bin/bash -e -o pipefail
 SHELL := /bin/ksh93 -e -o pipefail
 
 # trace execution of tests
 # TRACER = strace -f -o $(t_pfx).strace -s 100000
 TRACER = /usr/bin/time -v -o $(t_pfx).time
 
-full-test: test-18 test-19
+full-test: test-18 test-191 test-192
 test-18:
 	$(MAKE) test 2>&1 | sed -e 's!^!1.8 !'
-test-19:
-	$(MAKE) test r19=t 2>&1 | sed -e 's!^!1.9 !'
-
-latest: NEWS
-	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' < $<
-
-# publishes docs to http://zbatery.bogomip.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/ dcvr:/srv/zbatery/
-	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:
-	$@
+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 !'