diff options
author | Bastien Guerry <bzg@altern.org> | 2012-09-26 17:50:20 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-09-26 17:50:20 +0200 |
commit | 0955505324bd0149e8bd2cd74687074c993c6822 (patch) | |
tree | ed6243d7b36127954fd35f1067cc54da8acfb7db /mk | |
parent | c1b6920568791989b58ee599291a7fa33c9f1cbf (diff) |
mk/server.mk: Add an "archive-contents" target
Based on the proposal by Eric Schulte on the mailing list.
Also use the /var/www/orgmode.org/elpa/ directory as the
place where to store ELPA archives (whether they are further
downloaded to the elpa.gnu.org server or not.)
Diffstat (limited to 'mk')
-rw-r--r-- | mk/server.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mk/server.mk b/mk/server.mk index a3cb530b7..22523cb4b 100644 --- a/mk/server.mk +++ b/mk/server.mk @@ -70,9 +70,12 @@ elpa-dirty: tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) -@$(RM) $(ORGDIR) org-pkg.el -elpa-up: info card elpa-dirty - $(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/ +elpa-up: info card elpa-dirty archive-contents + $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/elpa/ +archive-contents: + echo -e "(1 (org . [($(PKG_TAG)) nil \"$(PKG_DOC)\"])\n" > $@ \ + " (org-plus-contrib . [($(PKG_TAG)) nil \"$(PKG_DOC)\"]))" >> $@ elpaplus: cleanall info card elpaplus-dirty elpaplus-dirty elpaplus-up: ORG_ADD_CONTRIB=org-* @@ -87,8 +90,8 @@ elpaplus-dirty: $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist)) -@$(RM) $(ORGDIR) org-plus-contrib-pkg.el @$(MAKE) cleanlisp -elpaplus-up: info card elpaplus-dirty - $(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/ +elpaplus-up: info card elpaplus-dirty archive-contents + $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/elpa/ tagwarn: $(if $(filter-out $(ORGVERSION), $(GITVERSION)), \ @@ -106,7 +109,7 @@ version: cleanall clean: cleanrel cleanrel: - -$(RM) org-$(PKG_TAG)* org-$(DISTVERSION)* org-*.zip org-*.tar* mk/version.mk + -$(RM) archive-contents org-$(PKG_TAG)* org-$(DISTVERSION)* org-*.zip org-*.tar* mk/version.mk doc-up: info pdf card html $(MAKE) -C doc manual guide @@ -114,7 +117,7 @@ doc-up: info pdf card html $(CP) doc/manual/* $(SERVROOT)/manual $(CP) doc/guide/* $(SERVROOT)/guide -upload: cleanall elpa-up rel-up doc-up elpaplus-up +upload: cleanall rel-up doc-up elpa-up elpaplus-up upload-elpa: cleanall elpa-up upload-elpaplus: cleanall elpaplus-up upload-release: cleanall rel-up |