From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: how to use contrib packages through ELPA (specifically org-export) Date: Sun, 19 Aug 2012 13:45:18 +0200 Message-ID: <87628faywh.fsf@Rainer.invalid> References: <871uj4xhzq.fsf@gmx.com> <87k3ww2e3e.fsf@gmail.com> <87vcggvskv.fsf@gmx.com> <87d32nj3h2.fsf@gmail.com> <87mx1rb8io.fsf@Rainer.invalid> <87harz6to9.fsf@gmail.com> <87ipcfb0ld.fsf@Rainer.invalid> <87y5lb5cz5.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:37896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T33wk-0006oh-Os for emacs-orgmode@gnu.org; Sun, 19 Aug 2012 07:45:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T33wj-0000UV-43 for emacs-orgmode@gnu.org; Sun, 19 Aug 2012 07:45:34 -0400 Received: from plane.gmane.org ([80.91.229.3]:52036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T33wi-0000TI-TB for emacs-orgmode@gnu.org; Sun, 19 Aug 2012 07:45:33 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1T33wg-0003qK-P6 for emacs-orgmode@gnu.org; Sun, 19 Aug 2012 13:45:30 +0200 Received: from pd9eb301f.dip.t-dialin.net ([217.235.48.31]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 19 Aug 2012 13:45:30 +0200 Received: from Stromeko by pd9eb301f.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 19 Aug 2012 13:45:30 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Jambunathan K writes: > If I am not mistaken, you are talking about release tar and not the ELPA > tar. They are not the same. I know. > Run rgrep like so. > (rgrep "pkg" "*.mk" "~/src/org-mode/" nil) > > and I see no references to 'org-pkg.el'. (Note the `-pkg.el') It's not pushed to the orgmode repository yet. Please have a look at the ELPA tar produced with the following patch (after including UTILITIES/server.mk from your local.mk): --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-server.mk-implement-ELPA.patch Content-Description: Implement ELPA >From 0bf94de6edfa99a1f47dedbb9ccbbde44417c259 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 19 Aug 2012 12:04:58 +0200 Subject: [PATCH] server.mk: implement ELPA * UTILITIES/server.mk: Add ELPA archive generation. --- UTILITIES/server.mk | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/UTILITIES/server.mk b/UTILITIES/server.mk index 67f5155..a9ae010 100644 --- a/UTILITIES/server.mk +++ b/UTILITIES/server.mk @@ -1,38 +1,55 @@ #---------------------------------------------------------------------- # This file is used for maintenance of org on the server. #---------------------------------------------------------------------- -.PHONY: helpserver reltest rel-dirty warn +.PHONY: helpserver release rel-dirty tagwarn help helpall helpserver:: $(info ) $(info Maintenance) $(info ===========) - $(info reltest - clean up and create TAR/ZIP release archives) + $(info release - clean up and create TAR/ZIP release archives) + $(info elpa - clean up and create ELPA TAR archive) helpserver:: @echo "" #---------------------------------------------------------------------- -ORGDIR = org-$(GITVERSION) -ORGTAR = $(ORGDIR).tar.gz -ORGZIP = $(ORGDIR).zip -ORGDIST = README Makefile default.mk targets.mk request-assign-future.txt \ - lisp/ etc/ doc/ contrib/ +ORGCOMM = README request-assign-future.txt lisp/ doc/ +ORGFULL = $(ORGCOMM) Makefile default.mk targets.mk etc/ contrib/ +ORGELPA = $(ORGCOMM) etc/styles/ org-pkg.el -ORG_MAKE_DOC = info pdf card # do not make HTML documentation for release - -reltest: cleanall doc autoloads rel-dirty +release: ORG_MAKE_DOC=info pdf card # do not make HTML documentation +release: cleanall doc autoloads rel-dirty +rel-dirty: ORGRDIR=org-$(GITVERSION) rel-dirty: + -@$(RM) $(ORGRDIR) $(ORGRTAR) $(ORGRZIP) + ln -s . $(ORGRDIR) + tar -zcf $(ORGDIR).tar.gz $(foreach dist, $(ORGFULL), $(ORGRDIR)/$(dist)) + zip -r9 $(ORGDIR).zip $(foreach dist, $(ORGFULL), $(ORGRDIR)/$(dist)) + -@$(RM) $(ORGRDIR) + $(if $(filter-out $(ORGVERSION), $(GITVERSION)), \ + @$(MAKE) tagwarn) + @echo ORGVERSION=$(ORGVERSION) GITVERSION=$(GITVERSION) + +PKG_TAG = $(shell date +%Y%m%d) +PKG_DOC = "Outline-based notes management and organizer" +PKG_REQ = "nil" + +elpa: ORG_MAKE_DOC=info pdf card # do not make HTML documentation +elpa: cleanall doc autoloads elpa-dirty +elpa-dirty: ORGDIR=org-$(PKG_TAG) +elpa-dirty: -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) ln -s . $(ORGDIR) - tar -zcf $(ORGTAR) $(foreach dist, $(ORGDIST), $(ORGDIR)/$(dist)) - zip -r9 $(ORGZIP) $(foreach dist, $(ORGDIST), $(ORGDIR)/$(dist)) - -@$(RM) $(ORGDIR) + echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" >org-pkg.el + tar --exclude=Makefile -zcf $(ORGDIR).tar.gz \ + $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) + -@$(RM) $(ORGDIR) org-pkg.el $(if $(filter-out $(ORGVERSION), $(GITVERSION)), \ - @$(MAKE) warn) + @$(MAKE) tagwarn) @echo ORGVERSION=$(ORGVERSION) GITVERSION=$(GITVERSION) -warn: +tagwarn: $(info ======================================================) $(info = =) $(info = A release should only be made from a revision that =) -- 1.7.11.5 --=-=-= Content-Type: text/plain Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptations for KORG EX-800 and Poly-800MkII V0.9: http://Synth.Stromeko.net/Downloads.html#KorgSDada --=-=-=--