From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Guerry Subject: [Accepted] Variable publishing-directory? (resent with patch as attachment) Date: Sat, 22 Oct 2011 10:41:25 +0200 (CEST) Message-ID: <20111022084125.9E737A976@myhost.localdomain> References: <7ipqk3qfxn.fsf@mack.tetzco.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:42712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHX8H-0003qs-Pd for emacs-orgmode@gnu.org; Sat, 22 Oct 2011 04:40:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHX8F-0005ht-Oy for emacs-orgmode@gnu.org; Sat, 22 Oct 2011 04:40:45 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:35331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHX8F-0005ho-E4 for emacs-orgmode@gnu.org; Sat, 22 Oct 2011 04:40:43 -0400 Received: by wyg34 with SMTP id 34so5570913wyg.0 for ; Sat, 22 Oct 2011 01:40:42 -0700 (PDT) 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 Patch 895 (http://patchwork.newartisans.com/patch/895/) is now "Accepted". Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C7ipqk3qfxn.fsf%40mack.tetzco.de%3E Here is the original message containing the patch: > Content-Type: text/plain; charset="utf-8" > MIME-Version: 1.0 > Content-Transfer-Encoding: 7bit > Subject: [O] Variable publishing-directory? (resent with patch as attachment) > Date: Thu, 18 Aug 2011 13:17:56 -0000 > From: Kai Tetzlaff > X-Patchwork-Id: 895 > Message-Id: <7ipqk3qfxn.fsf@mack.tetzco.de> > To: emacs-orgmode@gnu.org > > Bastien writes: > > Hi Bastien, > > > The patch looks good but I'd like to understand it better. > > Can you send an example configuration working with your patch? > > In org-publish-project-alist, i have HTML publishing projects which > should be published to different target directories depending on e.g. > where emacs is running (which i determine in my init files using the MAC > address of the default GW, the name the machine, ...). > > Here is an example: At home, i publish to a local directory > (:publishing-directory "~/tmp/publish-test") but at work i would like to > publish directly to a webserver (:publishing-directory > "/plinkx:doxydoc:~/public_html/publish-test" - this is on w32, using > tramps PuTTY/plink). To avoid having to change the definition of the > publishing project when i change locations i would like to construct the > actual value of :publishing-directory by calling a function: > > ("publishing-dir-test" > :base-directory "~/Documents/Work/RS" > :recursive t > :base-extension "org" > :exclude-tags ("intern") > :publishing-directory '(expand-file-name "publish-test" kt:org-default-publishing-dir) > :publishing-function org-publish-org-to-html) > > Depending on the location i'm in, 'kt:org-default-publishing-dir' would > be set to either "~/tmp" or "/plinkx:doxydoc:~/public_html". Without the > patch, the example above does not work as the value of > :publishing-directory does not get evaluated. > > > Also, please try to send git patch using these conventions: > > http://orgmode.org/worg/org-contribute.html#sec-5 > > > > Thanks a lot! > > Thanks for the hint. I've attached a revised version of the patch which > includes a changelog/commit msg - i hope that works for you. > > > Publish: allow dynamic construction of the publish destination. > > * org-publish.el (org-publish-file): Added 'eval'ing the value of the > :publishing-directory property before using it as destination of the > publishing project. This allows to construct the publish destination > directory dynamically at run-time using the return value of a > function. > > TINYCHANGE > --- > lisp/org-publish.el | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/lisp/org-publish.el b/lisp/org-publish.el > index e2213c5..518c1bf 100644 > --- a/lisp/org-publish.el > +++ b/lisp/org-publish.el > @@ -684,7 +684,7 @@ See `org-publish-projects'." > (pub-dir > (file-name-as-directory > (file-truename > - (or (plist-get project-plist :publishing-directory) > + (or (eval (plist-get project-plist :publishing-directory)) > (error "Project %s does not have :publishing-directory defined" > (car project)))))) > tmp-pub-dir) > -- > 1.7.5.4 > >