Try to preserve timestamps. Fix ChangeLog generation.

[gnu-emacs-elpa] / Makefile

diff --git a/Makefile b/Makefile
index f62ab67cc0bf3f3c82a88a2425aaa9f64c6bbf4f..7b352b424a3b4a189a98d057fe3e39b6d0b648ad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ EMACS=emacs
 ARCHIVE_TMP=archive-tmp
 SITE_DIR=site
 
-.PHONY: archive-tmp process-archive archive-full org-fetch clean all
+.PHONY: archive-tmp process-archive archive-full org-fetch clean all do-it
 
 ## Set up the source files for direct usage, by pointing
 ## `package-directory-list' to the site/ directory.
@@ -14,6 +14,10 @@ site: packages
        $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
          --eval "(batch-make-site-dir \"packages\" \"$(SITE_DIR)\")"
 
+site/%: do-it
+       $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
+         --eval "(progn (setq debug-on-error t) (batch-make-site-package \"$@\"))"
+
 ## Deploy the package archive to archive/, with packages in
 ## archive/packages/:
 archive: archive-tmp
@@ -21,9 +25,17 @@ archive: archive-tmp
 
 archive-tmp: packages
        mkdir -p $(ARCHIVE_TMP)
-       cp -r packages $(ARCHIVE_TMP)
+       cp -a packages/. $(ARCHIVE_TMP)/packages
 
 process-archive:
+       # First, refresh the ChangeLog files.  This needs to be done in
+       # the source tree, because it needs the Bzr data!
+       cd packages; \
+       $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
+                       -f batch-prepare-packages
+       # FIXME, we could probably speed this up significantly with
+       # rules like "%.tar: ../%/ChangeLog" so we only rebuild the packages
+       # that have indeed changed.
        cd $(ARCHIVE_TMP)/packages; $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el -f batch-make-archive
        @cd $(ARCHIVE_TMP)/packages; \
        for pt in *; do \
@@ -39,17 +51,16 @@ process-archive:
        rm -rf archive/packages-old
        rm -rf $(ARCHIVE_TMP)
 
-## Deploy the package archive to archive/ including the Org daily and
-## admin scripts:
+## Deploy the package archive to archive/ including the Org daily:
 archive-full: archive-tmp org-fetch
        $(MAKE) $(MFLAGS) process-archive
-       mkdir -p archive/admin
-       cp admin/* archive/admin/
+       #mkdir -p archive/admin
+       #cp admin/* archive/admin/
 
 org-fetch: archive-tmp
-       cd archive-tmp/packages; \
-       pkgname=`curl -s http://orgmode.org/pkg/daily/|perl -ne 'push @f, $$1 if m/(org-\d{8})\.tar/; END { @f = sort @f; print "$$f[-1]\n"}'`; \
-       wget http://orgmode.org/pkg/daily/$${pkgname}.tar -O $${pkgname}.tar; \
+       cd $(ARCHIVE_TMP)/packages; \
+       pkgname=`curl -s http://orgmode.org/elpa/|perl -ne 'push @f, $$1 if m/(org-\d{8})\.tar/; END { @f = sort @f; print "$$f[-1]\n"}'`; \
+       wget -q http://orgmode.org/elpa/$${pkgname}.tar -O $${pkgname}.tar; \
        if [ -f $${pkgname}.tar ]; then \
                tar xf $${pkgname}.tar; \
                rm -f $${pkgname}.tar; \