From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: =?UTF-8?B?UmU6IEJ1ZzppbnN0YWxsOiBjYW5ub3Qgc3RhdCDigJhvcmctaW5z?= =?UTF-8?B?dGFsbC5lbGPigJk=?= Date: Wed, 03 Oct 2012 18:40:29 +0200 Message-ID: <87vcerh5ky.fsf@Rainer.invalid> References: <506BF889.6090107@wilkesley.net> <87fw5whr9v.fsf@Rainer.invalid> <87mx03g8ei.fsf@bzg.ath.cx> <87bogjiv6t.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:39119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJS1M-0001Dn-J4 for emacs-orgmode@gnu.org; Wed, 03 Oct 2012 12:42:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJS1G-0007TZ-2B for emacs-orgmode@gnu.org; Wed, 03 Oct 2012 12:42:04 -0400 Received: from plane.gmane.org ([80.91.229.3]:40522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJS1F-0007Rt-RN for emacs-orgmode@gnu.org; Wed, 03 Oct 2012 12:41:57 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TJS0r-0008SR-Hq for emacs-orgmode@gnu.org; Wed, 03 Oct 2012 18:41:33 +0200 Received: from pd9eb5549.dip.t-dialin.net ([217.235.85.73]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Oct 2012 18:41:33 +0200 Received: from Stromeko by pd9eb5549.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Oct 2012 18:41:33 +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 Achim Gratz writes: > One suggestion: I'd introduce an org-install.el that never gets compiled > and only throws a warning if loaded. This will also help to defuse old > copies of org-install that are maybe still present later in load-path. Here's a patch to that effect: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-introduce-dummy-org-install.el-to-catch-old-installa.patch Content-Description: dummy org-install.el >From 08b4c62aed7596a4b13d046250af7f8c469a9b1c Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Wed, 3 Oct 2012 18:39:07 +0200 Subject: [PATCH] introduce dummy org-install.el to catch old installations * lisp/Makefile: Arrange for an uncompiled org-install.el. This also ensures that if there's an old org-install.el in the installation directory, it will be replaced and not linger. * lisp/org-install.el: Provide an empty file that prints a warning about an outdated configuration. --- lisp/Makefile | 8 ++++---- lisp/org-install.el | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 lisp/org-install.el diff --git a/lisp/Makefile b/lisp/Makefile index ef8c625..e2f1768 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -7,8 +7,9 @@ endif LISPV = org-version.el LISPI = org-loaddefs.el LISPA = $(LISPV) $(LISPI) +LISPB = $(LISPA:%el=%elc) org-install.elc LISPF = $(filter-out $(LISPA),$(sort $(wildcard *.el))) -LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc)) +LISPC = $(filter-out $(LISPB) $(LISPN:%el=%elc),$(LISPF:%el=%elc)) _ORGCM_ = dirall single source slint1 slint2 -include local.mk @@ -65,7 +66,7 @@ $(LISPV): $(LISPF) @$(MAKE_ORG_VERSION) $(LISPI): $(LISPV) $(LISPF) - @echo "org-install: $(ORGVERSION) ($(GITVERSION))" + @echo "org-loaddefs: $(ORGVERSION) ($(GITVERSION))" @$(RM) $(@) @$(MAKE_ORG_INSTALL) @@ -76,10 +77,9 @@ install: $(LISPF) compile $(CP) $(LISPC) $(LISPF) $(LISPA) $(DESTDIR)$(lispdir) cleanauto clean cleanall:: - $(RM) $(LISPA) $(LISPA:%el=%elc) + $(RM) $(LISPA) $(LISPB) clean cleanall cleanelc:: $(RM) *.elc - $(RM) org-install.el # Fix leftover from previous install method clean-install: if [ -d $(DESTDIR)$(lispdir) ] ; then \ diff --git a/lisp/org-install.el b/lisp/org-install.el new file mode 100644 index 0000000..a31d8b7 --- /dev/null +++ b/lisp/org-install.el @@ -0,0 +1,13 @@ +;;; org-install.el --- autogenerated file, do not edit +;; +;;; Code: +(warn "The file org-install is obsolete. +Please change your configuration to (require 'org) instead.") + +(provide 'org-install) + +;; Local Variables: +;; no-byte-compile: t +;; coding: utf-8 +;; End: +;;; org-install.el ends here -- 1.7.12.1 --=-=-= Content-Type: text/plain Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada --=-=-=--