about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-11-23 23:42:26 -0800
committerEric Wong <normalperson@yhbt.net>2009-11-23 23:42:26 -0800
commit9804cd197e64d22d613575b7a4db10daf01bb683 (patch)
treebaff9f6e28f72c9094e02f769cdb72c2d3699084
parent253f0ab4599030cc18eebbab1611c7c83cc2262e (diff)
downloadunicorn-9804cd197e64d22d613575b7a4db10daf01bb683.tar.gz
-rw-r--r--GNUmakefile5
-rw-r--r--local.mk.sample8
2 files changed, 7 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 190824f..cd879c5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -157,9 +157,10 @@ NEWS: GIT-VERSION-FILE
         mv $@+ $@
 
 SINCE = 0.94.0
-ChangeLog: log_range = $(shell test -n "$(SINCE)" && echo v$(SINCE)..)
+ChangeLog: LOG_VERSION = $(GIT_VERSION)
+ChangeLog: log_range = v$(SINCE)..$(LOG_VERSION)
 ChangeLog: GIT-VERSION-FILE
-        @echo "ChangeLog from $(GIT_URL) ($(SINCE)..$(GIT_VERSION))" > $@+
+        @echo "ChangeLog from $(GIT_URL) ($(log_range))" > $@+
         @echo >> $@+
         git log $(log_range) | sed -e 's/^/    /' >> $@+
         mv $@+ $@
diff --git a/local.mk.sample b/local.mk.sample
index f351be2..1746320 100644
--- a/local.mk.sample
+++ b/local.mk.sample
@@ -42,19 +42,19 @@ latest: NEWS
 # publishes docs to http://unicorn.bogomips.org
 publish_doc:
         -git set-file-times
-        $(RM) -r doc
-        $(MAKE) doc
+        $(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
+        tar cf - $$(git ls-files examples/) | (cd doc && tar xf -)
         chmod 644 $$(find doc -type f)
-        rsync -av --delete doc/ dcvr:/srv/unicorn/
+        rsync -av doc/ dcvr:/srv/unicorn/
         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: suf := html js css
 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)"