* how to use contrib packages through ELPA (specifically org-export) @ 2012-08-18 16:49 Eric Schulte 2012-08-18 19:29 ` Jambunathan K 2012-08-19 7:14 ` Bastien 0 siblings, 2 replies; 19+ messages in thread From: Eric Schulte @ 2012-08-18 16:49 UTC (permalink / raw) To: Org Mode Mailing List Hi, I'd like to put together an ELPA package for org-ehtml [1], but it has dependencies not only on Org-mode but also on org-export (which is in contrib). Is there a way to require contrib packages through ELPA, or should I just package up org-export into its own ELPA package? Thanks, Footnotes: [1] https://github.com/eschulte/org-ehtml -- Eric Schulte http://cs.unm.edu/~eschulte ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 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-19 7:14 ` Bastien 1 sibling, 1 reply; 19+ messages in thread From: Jambunathan K @ 2012-08-18 19:29 UTC (permalink / raw) To: Eric Schulte; +Cc: Org Mode Mailing List Eric Schulte <eric.schulte@gmx.com> writes: > Hi, > > I'd like to put together an ELPA package for org-ehtml [1], but it has > dependencies not only on Org-mode but also on org-export (which is in > contrib). Is there a way to require contrib packages through ELPA, or > should I just package up org-export into its own ELPA package? Names org-e-html and org-ehtml are confusing. Could you please choose a different name for your package? > Thanks, > > Footnotes: > [1] https://github.com/eschulte/org-ehtml -- ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-18 19:29 ` Jambunathan K @ 2012-08-18 20:44 ` Eric Schulte 2012-08-18 21:27 ` Jambunathan K 2012-08-19 7:27 ` Bastien 0 siblings, 2 replies; 19+ messages in thread From: Eric Schulte @ 2012-08-18 20:44 UTC (permalink / raw) To: Jambunathan K; +Cc: Org Mode Mailing List Jambunathan K <kjambunathan@gmail.com> writes: > Eric Schulte <eric.schulte@gmx.com> writes: > >> Hi, >> >> I'd like to put together an ELPA package for org-ehtml [1], but it has >> dependencies not only on Org-mode but also on org-export (which is in >> contrib). Is there a way to require contrib packages through ELPA, or >> should I just package up org-export into its own ELPA package? > > Names org-e-html and org-ehtml are confusing. Could you please choose a > different name for your package? > I believe org-e-html will be renamed org-html, so the conflict will not last for long. However if you have any suggestions for other names for org-ehtml I'm happy to hear them. Any thoughts on the topic of packaging elements of contrib? If no-one objects I will submit an org-export package to marmalade [1]. Thanks, > >> Thanks, >> >> Footnotes: >> [1] https://github.com/eschulte/org-ehtml Footnotes: [1] http://marmalade-repo.org/ -- Eric Schulte http://cs.unm.edu/~eschulte ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-18 20:44 ` Eric Schulte @ 2012-08-18 21:27 ` Jambunathan K 2012-08-19 0:00 ` Jambunathan K ` (3 more replies) 2012-08-19 7:27 ` Bastien 1 sibling, 4 replies; 19+ messages in thread From: Jambunathan K @ 2012-08-18 21:27 UTC (permalink / raw) To: Eric Schulte; +Cc: Org Mode Mailing List Eric Schulte <eric.schulte@gmx.com> writes: > Jambunathan K <kjambunathan@gmail.com> writes: > >> Eric Schulte <eric.schulte@gmx.com> writes: >> >>> Hi, >>> >>> I'd like to put together an ELPA package for org-ehtml [1], but it has >>> dependencies not only on Org-mode but also on org-export (which is in >>> contrib). Is there a way to require contrib packages through ELPA, or >>> should I just package up org-export into its own ELPA package? >> >> Names org-e-html and org-ehtml are confusing. Could you please choose a >> different name for your package? >> > > I believe org-e-html will be renamed org-html, so the conflict will not > last for long. However if you have any suggestions for other names for > org-ehtml I'm happy to hear them. It is better to avoid naming conflicts. org-e-html.el took it's birth last November. It has been around for close to 9 months now. That's a long time already. I am not sure when merge and renames are going to happen. I will probably give it another 6 months without any hesitation. I haven't used your package. `e', I believe stands for `editable'. I believe it is really editing the underlying Org file (and not the HTML file) with HTTP used for transport. If the user experience is Wiki-like call it org-wiki-client and org-wiki-server and the whole bundle org-wiki. If you want something cool, call it org-whatever-app. If you want to "promote", elnode just call it elnode_mod_org or elnode_mod_elisp. Take inspiration from apache modules. > Any thoughts on the topic of packaging elements of contrib? If no-one > objects I will submit an org-export package to marmalade [1]. Nic Ferrier hasn't responded to the question of whether he would want to have elnode in GNU ELPA. As far as your editable app is concerned, I believe it can go anywhere. Marmalade seems a natural choice. If org-export.el and org-e-backends are bundled as ELPA packages, I would insist that go in GNU ELPA and not elsewhere. Nicolas and I are signed contributors. (Sometime back, I had made a request to Achim to port my ELPA changes to the new build system. I hope it is in his TODO list. Achim, are you there?) > Thanks, > >> >>> Thanks, >>> >>> Footnotes: >>> [1] https://github.com/eschulte/org-ehtml > > > Footnotes: > [1] http://marmalade-repo.org/ ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-18 21:27 ` Jambunathan K @ 2012-08-19 0:00 ` Jambunathan K 2012-08-19 7:17 ` Bastien ` (2 subsequent siblings) 3 siblings, 0 replies; 19+ messages in thread From: Jambunathan K @ 2012-08-19 0:00 UTC (permalink / raw) To: Eric Schulte; +Cc: Org Mode Mailing List Jambunathan K <kjambunathan@gmail.com> writes: > If the user experience is Wiki-like call it org-wiki-client and > org-wiki-server and the whole bundle org-wiki. > > If you want something cool, call it org-whatever-app. > > If you want to "promote", elnode just call it elnode_mod_org or > elnode_mod_elisp. Take inspiration from apache modules. You can also call it org-elnode.el or elnode-org.el. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 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 23:36 ` Eric Schulte 3 siblings, 0 replies; 19+ messages in thread From: Bastien @ 2012-08-19 7:17 UTC (permalink / raw) To: Jambunathan K; +Cc: Achim Gratz, Org Mode Mailing List, Eric Schulte Hi Jambunathan, Jambunathan K <kjambunathan@gmail.com> writes: > (Sometime back, I had made a request to Achim to > port my ELPA changes to the new build system. I hope it is in his TODO > list. Achim, are you there?) I'm copying Achim just to make sure he reads this. (Better start a new thread for such requests.) -- Bastien ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 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:51 ` how to use contrib packages through ELPA (specifically org-export) Jambunathan K 2012-08-19 23:36 ` Eric Schulte 3 siblings, 2 replies; 19+ messages in thread From: Achim Gratz @ 2012-08-19 8:17 UTC (permalink / raw) To: emacs-orgmode Jambunathan K writes: > (Sometime back, I had made a request to Achim to > port my ELPA changes to the new build system. I hope it is in his TODO > list. Achim, are you there?) These changes are just what's in 395098f6f1 or is there more? Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 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:51 ` how to use contrib packages through ELPA (specifically org-export) Jambunathan K 1 sibling, 1 reply; 19+ messages in thread From: Jambunathan K @ 2012-08-19 10:51 UTC (permalink / raw) To: Achim Gratz; +Cc: emacs-orgmode Achim Gratz <Stromeko@nexgo.de> writes: > Jambunathan K writes: >> (Sometime back, I had made a request to Achim to >> port my ELPA changes to the new build system. I hope it is in his TODO >> list. Achim, are you there?) > > These changes are just what's in 395098f6f1 or is there more? You may want to start with what is in: http://repo.or.cz/w/org-mode/org-jambu.git/blob_plain/777f5cbe42084a8bbd711c54f519f7d5d987d7ec:/Makefile The target to look for is `pkg'. Mainline version 1. Doesn't update `archive-contents' which is necessary in order to browse packages in the repo with `list-packages'. My private version does it with `package-upload-file'. 2. Doesn't create README file. 3. Packs the whole repo. My private version packs just the "original" org-odt.el and style files. Send me a private mail if you have questions. -- ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-19 10:51 ` Jambunathan K @ 2012-08-19 11:08 ` Achim Gratz 2012-08-19 11:37 ` Jambunathan K 0 siblings, 1 reply; 19+ messages in thread From: Achim Gratz @ 2012-08-19 11:08 UTC (permalink / raw) To: emacs-orgmode Jambunathan K writes: > Mainline version > > 1. Doesn't update `archive-contents' which is necessary in order to > browse packages in the repo with `list-packages'. My private version > does it with `package-upload-file'. That's the right place to do it, so that'll be implemented with the upload. > 2. Doesn't create README file. Can't do either, since the source for the new README isn't included in Git. I do package the README, though. > 3. Packs the whole repo. My private version packs just the "original" > org-odt.el and style files. Wait, are we talking about the same ELPA Org package? I don't pack the whole repo either, just lisp/, etc/styles, doc and a few files from toplevel. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Waldorf MIDI Implementation & additional documentation: http://Synth.Stromeko.net/Downloads.html#WaldorfDocs ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-19 11:08 ` Achim Gratz @ 2012-08-19 11:37 ` Jambunathan K 2012-08-19 11:45 ` Achim Gratz 0 siblings, 1 reply; 19+ messages in thread From: Jambunathan K @ 2012-08-19 11:37 UTC (permalink / raw) To: Achim Gratz; +Cc: emacs-orgmode Achim Gratz <Stromeko@nexgo.de> writes: > Jambunathan K writes: >> Mainline version >> >> 1. Doesn't update `archive-contents' which is necessary in order to >> browse packages in the repo with `list-packages'. My private version >> does it with `package-upload-file'. > > That's the right place to do it, so that'll be implemented with the > upload. > >> 2. Doesn't create README file. > > Can't do either, since the source for the new README isn't included in > Git. I do package the README, though. > >> 3. Packs the whole repo. My private version packs just the "original" >> org-odt.el and style files. > > Wait, are we talking about the same ELPA Org package? I don't pack the > whole repo either, just lisp/, etc/styles, doc and a few files from > toplevel. If I am not mistaken, you are talking about release tar and not the ELPA tar. They are not the same. Run rgrep like so. (rgrep "pkg" "*.mk" "~/src/org-mode/" nil) and I see no references to 'org-pkg.el'. (Note the `-pkg.el') Look at following info node in Emacs-24+ (info "(elisp) Multi-file Packages") specifically this paragraph: ,---- | For example, if we distribute version 1.3 of the superfrobnicator | as a multi-file package, the tar file would be | `superfrobnicator-1.3.tar'. Its contents would extract into the | directory `superfrobnicator-1.3', and one of these would be the file | `superfrobnicator-pkg.el'. `---- You can also look at http://elpa.gnu.org/packages/ to understand how things are packaged. > > > Regards, > Achim. -- ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-19 11:37 ` Jambunathan K @ 2012-08-19 11:45 ` Achim Gratz 2012-08-19 11:55 ` Jambunathan K ` (2 more replies) 0 siblings, 3 replies; 19+ messages in thread From: Achim Gratz @ 2012-08-19 11:45 UTC (permalink / raw) To: emacs-orgmode [-- Attachment #1: Type: text/plain, Size: 452 bytes --] 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): [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: Implement ELPA --] [-- Type: text/x-patch, Size: 3340 bytes --] 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 [-- Attachment #3: Type: text/plain, Size: 197 bytes --] 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 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 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 ` ELPA/server.mk Jambunathan K 2 siblings, 0 replies; 19+ messages in thread From: Jambunathan K @ 2012-08-19 11:55 UTC (permalink / raw) To: Achim Gratz; +Cc: emacs-orgmode Achim Gratz <Stromeko@nexgo.de> writes: > 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): Let me look at it. -- ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 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 ` ELPA/server.mk Jambunathan K 2 siblings, 0 replies; 19+ messages in thread From: Bastien @ 2012-08-20 12:14 UTC (permalink / raw) To: Achim Gratz; +Cc: emacs-orgmode Hi Achim, Achim Gratz <Stromeko@nexgo.de> writes: > 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): Please feel free to apply this as soon as Jambunathan confirms it is okay. Thanks! -- Bastien ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: ELPA/server.mk 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 2012-08-21 19:19 ` ELPA/server.mk Achim Gratz 2 siblings, 1 reply; 19+ messages in thread From: Jambunathan K @ 2012-08-21 18:19 UTC (permalink / raw) To: Achim Gratz; +Cc: emacs-orgmode 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. -- ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: ELPA/server.mk 2012-08-21 18:19 ` ELPA/server.mk Jambunathan K @ 2012-08-21 19:19 ` Achim Gratz 0 siblings, 0 replies; 19+ messages in thread From: Achim Gratz @ 2012-08-21 19:19 UTC (permalink / raw) To: emacs-orgmode Jambunathan K writes: > I added the diff below to Makefile and did a > $ make elpa I said edit local.mk... :-) Really, leave Makefile alone. > Quick comments: It is far from OK. Close enough for me. > 1. The bundle is a tar file not tar.gz file. I hadn't considered that package manager cannot process a compressed tar. > 2. The lisp files should be right in the root not in lisp/ subdir. The documentation just as well, otherwise it is not correctly registered. Well, not really a problem. > Best way to test the ELPA tar is to do a > M-x package-install-file RET org-*.tar. Thanks. I'll push a new version of server.mk that has the changes above and installs and activates OK on my local version of Emacs. Please test again, hopefully further changes won't be needed. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Wavetables for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldUserWavetables ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-19 8:17 ` Achim Gratz 2012-08-19 10:51 ` Jambunathan K @ 2012-08-19 11:51 ` Jambunathan K 1 sibling, 0 replies; 19+ messages in thread From: Jambunathan K @ 2012-08-19 11:51 UTC (permalink / raw) To: Achim Gratz; +Cc: emacs-orgmode Achim Gratz <Stromeko@nexgo.de> writes: > Jambunathan K writes: >> (Sometime back, I had made a request to Achim to >> port my ELPA changes to the new build system. I hope it is in his TODO >> list. Achim, are you there?) > > These changes are just what's in 395098f6f1 or is there more? Yes. (Just to give some history) But I submitted a revision to that which you can see at: http://patchwork.newartisans.com/patch/377/ It didn't get any attention it deserved. The link I recommended to in `org-jambu.git' builds slightly further on what is in above patchwork queue. One can customize PKG_DATA (IIRC) to pick and choose what gets bundled. For example, with your changes one should able to build a new ELPA package, say org-e-*.tar, - which bundles all org-e-*.el files - which has dependency on org-*.tar or create a monolithic org-*.tar - which "pulls" chosen .el files (that are FSF-signed) in contrib and package it with regular files. I am not getting in to details here and it could be confusing. So ignore this message, if it is not clear what is trying to convey. -- ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-18 21:27 ` Jambunathan K ` (2 preceding siblings ...) 2012-08-19 8:17 ` Achim Gratz @ 2012-08-19 23:36 ` Eric Schulte 3 siblings, 0 replies; 19+ messages in thread From: Eric Schulte @ 2012-08-19 23:36 UTC (permalink / raw) To: Jambunathan K; +Cc: Org Mode Mailing List >> Any thoughts on the topic of packaging elements of contrib? If no-one >> objects I will submit an org-export package to marmalade [1]. > > Nic Ferrier hasn't responded to the question of whether he would want to > have elnode in GNU ELPA. As far as your editable app is concerned, I > believe it can go anywhere. Marmalade seems a natural choice. > I agree. I'll release this to marmalade once the supporting packages are in order (see below). > > If org-export.el and org-e-backends are bundled as ELPA packages, I > would insist that go in GNU ELPA and not elsewhere. Nicolas and I are > signed contributors. (Sometime back, I had made a request to Achim to > port my ELPA changes to the new build system. I hope it is in his TODO > list. Achim, are you there?) > After talking to Nicolas, it sounds as though if I wait for the next major Org-mode release, the Org-mode package will provide org-element and org-export. This seems like the best choice, rather than go through the trouble of generating extra packages which will quickly be obsolete. Thanks, -- Eric Schulte http://cs.unm.edu/~eschulte ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 2012-08-18 20:44 ` Eric Schulte 2012-08-18 21:27 ` Jambunathan K @ 2012-08-19 7:27 ` Bastien 1 sibling, 0 replies; 19+ messages in thread From: Bastien @ 2012-08-19 7:27 UTC (permalink / raw) To: Eric Schulte; +Cc: Org Mode Mailing List, Jambunathan K Hi Eric, Eric Schulte <eric.schulte@gmx.com> writes: > I believe org-e-html will be renamed org-html, so the conflict will not > last for long. Nicolas and I have been thinking of using oe- as the prefix for org-e-*.el files when moving the new exporter into core. So we would have oe-html.el, oe-latex.el, etc. This is short and this has the advantage of telling that the file is about exporting, nothing else. What do you think about this? > However if you have any suggestions for other names for > org-ehtml I'm happy to hear them. From what I understand, org-ehtml.el is more an extension to elnode.el than to Org. It is elnode + org syntax (instead of the WikiCreole used by Nic in his demo) and some javascript magic for making the best of org-element.el. So I like Jambunathan's suggestion to name it elnode-org.el. -- Bastien ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: how to use contrib packages through ELPA (specifically org-export) 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-19 7:14 ` Bastien 1 sibling, 0 replies; 19+ messages in thread From: Bastien @ 2012-08-19 7:14 UTC (permalink / raw) To: Eric Schulte; +Cc: Org Mode Mailing List Hi Eric, Eric Schulte <eric.schulte@gmx.com> writes: > I'd like to put together an ELPA package for org-ehtml [1], but it has > dependencies not only on Org-mode but also on org-export (which is in > contrib). Is there a way to require contrib packages through ELPA, or > should I just package up org-export into its own ELPA package? From the comment section in package.el: ;; The downloader downloads all dependent packages. But perhaps Tom Tromey <tromey at redhat.com> can explain how it works. -- Bastien ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2012-08-21 19:19 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 ` ELPA/server.mk Jambunathan K 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
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).