From: Jambunathan K <kjambunathan@gmail.com>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: ELPA/server.mk
Date: Tue, 21 Aug 2012 23:49:09 +0530 [thread overview]
Message-ID: <87393gaz1e.fsf_-_@gmail.com> (raw)
In-Reply-To: <87628faywh.fsf@Rainer.invalid> (Achim Gratz's message of "Sun, 19 Aug 2012 13:45:18 +0200")
I added the diff below to Makefile and did a
$ make elpa
Quick comments: It is far from OK.
1. The bundle is a tar file not tar.gz file.
2. The lisp files should be right in the root not in lisp/ subdir.
Best way to test the ELPA tar is to do a
M-x package-install-file RET org-*.tar.
and point in to the tar.
May be you should just reproduce my recipe from the mainline Makefile or
better still org-jambu.git.
diff --git a/Makefile b/Makefile
index a1902a1..6a33ece 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@
include default.mk # defaults, customizable via "local.mk"
-include local.mk # optional local customization, use default.mk as template
+include UTILITIES/server.mk
+
# default target is "all" unless overridden in local.mk
all::
> 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):
>
>
> From 0bf94de6edfa99a1f47dedbb9ccbbde44417c259 Mon Sep 17 00:00:00 2001
> From: Achim Gratz <Stromeko@Stromeko.DE>
> 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
>
>
>
>
> Regards,
> Achim.
--
next prev parent reply other threads:[~2012-08-21 18:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-18 16:49 how to use contrib packages through ELPA (specifically org-export) Eric Schulte
2012-08-18 19:29 ` Jambunathan K
2012-08-18 20:44 ` Eric Schulte
2012-08-18 21:27 ` Jambunathan K
2012-08-19 0:00 ` Jambunathan K
2012-08-19 7:17 ` Bastien
2012-08-19 8:17 ` Achim Gratz
2012-08-19 10:51 ` Jambunathan K
2012-08-19 11:08 ` Achim Gratz
2012-08-19 11:37 ` Jambunathan K
2012-08-19 11:45 ` Achim Gratz
2012-08-19 11:55 ` Jambunathan K
2012-08-20 12:14 ` Bastien
2012-08-21 18:19 ` Jambunathan K [this message]
2012-08-21 19:19 ` ELPA/server.mk Achim Gratz
2012-08-19 11:51 ` how to use contrib packages through ELPA (specifically org-export) Jambunathan K
2012-08-19 23:36 ` Eric Schulte
2012-08-19 7:27 ` Bastien
2012-08-19 7:14 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87393gaz1e.fsf_-_@gmail.com \
--to=kjambunathan@gmail.com \
--cc=Stromeko@nexgo.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).