summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-09-15 18:49:18 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2012-09-15 18:54:32 +0200
commitf6f9d3a5cd040d8e605758eee68d135023aa8831 (patch)
treedba2a6a2ce169c67ee1065695972a5718b7a2a41
parent400bb88f9cab27393b5134b04d4d0e6e0245af61 (diff)
downloadorg-mode-f6f9d3a5cd040d8e605758eee68d135023aa8831.tar.gz
mk/server.mk: implement ELPA archive including all contrib files - "orgplus"
* mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty and upload-eplaplus as copy of respective epla targets, but with all files from contrib added. * .gitignore: Add orgplus EPLA archive to the patterns.
-rw-r--r--.gitignore1
-rw-r--r--mk/server.mk26
2 files changed, 23 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index cc4ac33..32185ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ org-install.el
org-version.el
doc/org-version.inc
org-*.tar*
+orgplus-*.tar*
org-*.zip
version.mk
manual
diff --git a/mk/server.mk b/mk/server.mk
index 70e18d6..e4dc2ae 100644
--- a/mk/server.mk
+++ b/mk/server.mk
@@ -69,6 +69,23 @@ elpa-dirty:
elpa-up: info card elpa-dirty
$(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
+
+elpaplus: cleanall info card elpaplus-dirty
+elpaplus-dirty elpaplus-up: ORG_ADD_CONTRIB=org-*
+elpaplus-dirty elpaplus-up: ORGDIR=orgplus-$(PKG_TAG)
+elpaplus-dirty:
+ @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads
+ -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
+ ln -s . $(ORGDIR)
+ echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
+ > org-pkg.el
+ tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
+ $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
+ -@$(RM) $(ORGDIR) org-pkg.el
+ @$(MAKE) cleanlisp
+elpaplus-up: info card elpaplus-dirty
+ $(CP) $(ORGDIR).tar $(SERVROOT)/pkg/daily/
+
tagwarn:
$(if $(filter-out $(ORGVERSION), $(GITVERSION)), \
$(info ======================================================) \
@@ -93,7 +110,8 @@ doc-up: info pdf card html
$(CP) doc/manual/* $(SERVROOT)/manual
$(CP) doc/guide/* $(SERVROOT)/guide
-upload: cleanall elpa-up rel-up doc-up
-upload-elpa: cleanall elpa-up
-upload-release: cleanall rel-up
-upload-doc: cleanall doc-up
+upload: cleanall elpa-up rel-up doc-up elpaplus-up
+upload-elpa: cleanall elpa-up
+upload-elpaplus: cleanall elpaplus-up
+upload-release: cleanall rel-up
+upload-doc: cleanall doc-up