From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Re: Can't make org-install.el
Date: Sat, 19 May 2012 22:27:13 +0200 [thread overview]
Message-ID: <87liknx6fy.fsf@Rainer.invalid> (raw)
In-Reply-To: 87pqa0vtz0.fsf@Rainer.invalid
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
Achim Gratz writes:
> Are you trying to use an NTemacs perhaps?!
Based on that assumption, here's another patch. Let me know if this
works in your setup.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: use only relative paths for Cygwin/NTEmacs --]
[-- Type: text/x-patch, Size: 4801 bytes --]
From 2fcce20d5a7d6c504c30117a287e7ee5d52530c6 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat, 19 May 2012 22:08:06 +0200
Subject: [PATCH] use only relative paths for better compatibility with mixed
Cygwin/NTEmacs installations
* UTILITIES/org-fixup.el(org-make-org-install): Use relative filenames
throughout, and query Emacs for directory names where a full path is
required. This avoids Cygwin/POSIX paths being misinterpreted by a
stock NTEmacs. Use the same regex as (org-reload) for enumerating
the files to byte-compile.
* default.mk: Factor out standard load-path for Emacs started in lisp/
into BATCHL and use this in defaults. Make all paths to be
interpreted by Emacs relative so Cygwin and NTEmacs can coexist.
---
UTILITIES/org-fixup.el | 10 +++++-----
default.mk | 41 +++++++++++++++++++++--------------------
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/UTILITIES/org-fixup.el b/UTILITIES/org-fixup.el
index 9f56f16..ef12f4a 100644
--- a/UTILITIES/org-fixup.el
+++ b/UTILITIES/org-fixup.el
@@ -54,18 +54,18 @@ (defun org-make-org-version (org-release org-git-version odt-dir)
(toggle-read-only 0)
(write-file "org-version.el")))
-(defun org-make-org-install (absfile)
+(defun org-make-org-install ()
(with-temp-buffer
- (set-visited-file-name absfile)
+ (set-visited-file-name "org-install.el")
(insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
- (let ((files (directory-files (file-name-directory absfile) 'full "^[^.#~]*\\.el$")))
+ (let ((files (directory-files default-directory nil "^\\(org\\|ob\\)\\(-.*\\)?\\.el$")))
(mapc (lambda (f) (generate-file-autoloads f)) files))
(insert "\f\n(provide 'org-install)\n")
(insert "\f\n;; Local Variables:\n;; version-control: never\n")
(insert ";; no-byte-compile: t\n;; no-update-autoloads: t\n")
(insert ";; coding: utf-8\n;; End:\n;;; org-install.el ends here\n")
(toggle-read-only 0)
- (write-file absfile)))
+ (save-buffer)))
(defun org-make-autoloads ()
(let* ((origin default-directory)
@@ -79,7 +79,7 @@ (defun org-make-autoloads ()
(cd dirlisp)
(org-fixup)
(org-make-org-version (org-release) (org-git-version) dirodt)
- (org-make-org-install (concat dirlisp "org-install.el")))
+ (org-make-org-install))
(cd origin))))
(defun org-make-autoloads-compile (&rest force)
diff --git a/default.mk b/default.mk
index a618be7..5ee872f 100644
--- a/default.mk
+++ b/default.mk
@@ -47,8 +47,8 @@ req-ob-lang = --eval '(require '"'"'ob-$(ob-lang))'
req-extra = --eval '(require '"'"'$(req))'
BTEST = $(BATCH) \
$(BTEST_PRE) \
- --eval '(add-to-list '"'"'load-path "lisp")' \
- --eval '(add-to-list '"'"'load-path "testing")' \
+ --eval '(add-to-list '"'"'load-path "./lisp")' \
+ --eval '(add-to-list '"'"'load-path "./testing")' \
$(BTEST_POST) \
-l org-install.el \
-l testing/org-test.el \
@@ -58,13 +58,28 @@ BTEST = $(BATCH) \
-f org-test-run-batch-tests
# Using emacs in batch mode.
-BATCH = $(EMACS) -batch -Q
# BATCH = $(EMACS) -batch -vanilla # XEmacs
+BATCH = $(EMACS) -batch -Q
+
+# Emacs must be started in lisp directory
+BATCHL = $(BATCH) \
+ --eval '(add-to-list '"'"'load-path ".")'
+
+# How to generate org-install.el
+MAKE_ORG_INSTALL = $(BATCHL) \
+ --eval '(load "org-compat.el")' \
+ --eval '(load "../UTILITIES/org-fixup.el")' \
+ --eval '(org-make-org-install)'
+
+# How to generate org-version.el
+MAKE_ORG_VERSION = $(BATCHL) \
+ --eval '(load "org-compat.el")' \
+ --eval '(load "../UTILITIES/org-fixup.el")' \
+ --eval '(org-make-org-version "$(ORGVERSION)" "$(GITVERSION)" "$(datadir)")'
# How to byte-compile the whole source directory
-ELCDIR = $(BATCH) \
- --eval '(add-to-list '"'"'load-path ".")' \
- --eval '(batch-byte-recompile-directory 0)'
+ELCDIR = $(BATCHL) \
+ --eval '(batch-byte-recompile-directory 0)'
# How to make a pdf file from a texinfo file
TEXI2PDF = texi2pdf --batch --clean
@@ -104,17 +119,3 @@ SUDO = sudo
# Name of the program to install info files
# INSTALL_INFO = ginstall-info # Debian: avoid harmless warning message
INSTALL_INFO = install-info
-
-# How to generate org-install.el
-MAKE_ORG_INSTALL = $(BATCH) \
- --eval '(add-to-list '"'"'load-path ".")' \
- --eval '(load "org-compat.el")' \
- --eval '(load "../UTILITIES/org-fixup.el")' \
- --eval '(org-make-org-install "$(CURDIR)/lisp/org-install.el")'
-
-# How to generate org-version.el
-MAKE_ORG_VERSION = $(BATCH) \
- --eval '(add-to-list '"'"'load-path ".")' \
- --eval '(load "org-compat.el")' \
- --eval '(load "../UTILITIES/org-fixup.el")' \
- --eval '(org-make-org-version "$(ORGVERSION)" "$(GITVERSION)" "$(datadir)")'
--
1.7.9.2
[-- Attachment #3: Type: text/plain, Size: 187 bytes --]
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves
next prev parent reply other threads:[~2012-05-19 20:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 20:49 Can't make org-install.el Sebastien Vauban
2012-05-19 8:54 ` Achim Gratz
2012-05-19 10:42 ` Sebastien Vauban
2012-05-19 12:00 ` Achim Gratz
2012-05-19 13:40 ` Sebastien Vauban
2012-05-19 15:11 ` Achim Gratz
2012-05-19 17:56 ` [PATCH] " Achim Gratz
2012-05-19 18:05 ` Bastien
2012-05-19 19:00 ` Sebastien Vauban
2012-05-19 19:17 ` Achim Gratz
2012-05-19 19:41 ` Achim Gratz
2012-05-19 20:27 ` Achim Gratz [this message]
2012-05-21 8:37 ` Sebastien Vauban
2012-05-21 8:59 ` Sebastien Vauban
2012-05-23 22:01 ` Achim Gratz
2012-05-21 13:34 ` 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=87liknx6fy.fsf@Rainer.invalid \
--to=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).