From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Sebastien Vauban" Subject: Re: [PATCH] Re: Can't make org-install.el Date: Mon, 21 May 2012 10:37:25 +0200 Message-ID: <80d35yudyy.fsf@somewhere.org> References: <80zk95xlj5.fsf@somewhere.org> <87sjewy2ir.fsf@Rainer.invalid> <80d360qwom.fsf@somewhere.org> <87obpkxtwv.fsf@Rainer.invalid> <808vgoqoff.fsf@somewhere.org> <874nrcxdf7.fsf_-_@Rainer.invalid> <871umghwrp.fsf@gnu.org> <804nrcq9me.fsf@somewhere.org> <87pqa0vtz0.fsf@Rainer.invalid> <87liknx6fy.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: 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-mXXj517/zsQ@public.gmane.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org-mXXj517/zsQ@public.gmane.org To: emacs-orgmode-mXXj517/zsQ@public.gmane.org Hi Achim, Achim Gratz wrote: > Achim Gratz writes: >> Are you trying to use an NTemacs perhaps?! No, I'm on Windows, but I don't use anymore (for years) the customized and patched Emacs binaries such as NTEmacs or EmacsW32. I do only use the official binary from Gnu. Currently: GNU Emacs 24.0.97.1 (i386-mingw-nt5.1.2600) of 2012-05-17 on MARVIN downloaded from the GNU Web site: http://alpha.gnu.org/gnu/emacs/pretest/windows/emacs-24.0.97-bin-i386.zip. > Based on that assumption, here's another patch. Let me know if this > works in your setup. > > From 2fcce20d5a7d6c504c30117a287e7ee5d52530c6 Mon Sep 17 00:00:00 2001 > From: Achim Gratz > 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 As you can see, that *does* work... Thanks a lot, Achim! --8<---------------cut here---------------start------------->8--- Sebastien@MEDIACENTER:home/org-mode 0$ patch < patch.txt can't find file to patch at input line 9 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- | 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 -------------------------- File to patch: UTILITIES/org-fixup.el patching file UTILITIES/org-fixup.el patching file default.mk Sebastien@MEDIACENTER:home/org-mode 0$ make autoloads make -C lisp autoloads make[1]: Entering directory `/cygdrive/c/home/org-mode/lisp' rm -f org-version.el org-install.el org-version.elc org-install.elc org-version: 7.8.10 (release_7.8.10-573-g7b33d9.dirty) Loading c:/home/org-mode/lisp/org-compat.el (source)... Loading c:/home/org-mode/UTILITIES/org-fixup.el (source)... Saving file c:/home/org-mode/lisp/org-version.el... Loading vc-git... Wrote c:/home/org-mode/lisp/org-version.el org-install: 7.8.10 (release_7.8.10-573-g7b33d9.dirty) Loading c:/home/org-mode/lisp/org-compat.el (source)... Loading c:/home/org-mode/UTILITIES/org-fixup.el (source)... Generating autoloads for ob-C.el... Generating autoloads for ob-C.el...done Generating autoloads for ob-R.el... Generating autoloads for ob-R.el...done Generating autoloads for ob-asymptote.el... Generating autoloads for ob-asymptote.el...done Generating autoloads for ob-awk.el... Generating autoloads for ob-awk.el...done Generating autoloads for ob-calc.el... Generating autoloads for ob-calc.el...done Generating autoloads for ob-clojure.el... Generating autoloads for ob-clojure.el...done Generating autoloads for ob-comint.el... Generating autoloads for ob-comint.el...done Generating autoloads for ob-css.el... Generating autoloads for ob-css.el...done Generating autoloads for ob-ditaa.el... Generating autoloads for ob-ditaa.el...done Generating autoloads for ob-dot.el... Generating autoloads for ob-dot.el...done Generating autoloads for ob-emacs-lisp.el... Generating autoloads for ob-emacs-lisp.el...done Generating autoloads for ob-eval.el... Generating autoloads for ob-eval.el...done Generating autoloads for ob-exp.el... Generating autoloads for ob-exp.el...done Generating autoloads for ob-fortran.el... Generating autoloads for ob-fortran.el...done Generating autoloads for ob-gnuplot.el... Generating autoloads for ob-gnuplot.el...done Generating autoloads for ob-haskell.el... Generating autoloads for ob-haskell.el...done Generating autoloads for ob-io.el... Generating autoloads for ob-io.el...done Generating autoloads for ob-java.el... Generating autoloads for ob-java.el...done Generating autoloads for ob-js.el... Generating autoloads for ob-js.el...done Generating autoloads for ob-keys.el... Generating autoloads for ob-keys.el...done Generating autoloads for ob-latex.el... Generating autoloads for ob-latex.el...done Generating autoloads for ob-ledger.el... Generating autoloads for ob-ledger.el...done Generating autoloads for ob-lilypond.el... Generating autoloads for ob-lilypond.el...done Generating autoloads for ob-lisp.el... Generating autoloads for ob-lisp.el...done Generating autoloads for ob-lob.el... Generating autoloads for ob-lob.el...done Generating autoloads for ob-matlab.el... Generating autoloads for ob-matlab.el...done Generating autoloads for ob-maxima.el... Generating autoloads for ob-maxima.el...done Generating autoloads for ob-mscgen.el... Generating autoloads for ob-mscgen.el...done Generating autoloads for ob-ocaml.el... Generating autoloads for ob-ocaml.el...done Generating autoloads for ob-octave.el... Generating autoloads for ob-octave.el...done Generating autoloads for ob-org.el... Generating autoloads for ob-org.el...done Generating autoloads for ob-perl.el... Generating autoloads for ob-perl.el...done Generating autoloads for ob-picolisp.el... Generating autoloads for ob-picolisp.el...done Generating autoloads for ob-plantuml.el... Generating autoloads for ob-plantuml.el...done Generating autoloads for ob-python.el... Generating autoloads for ob-python.el...done Generating autoloads for ob-ref.el... Generating autoloads for ob-ref.el...done Generating autoloads for ob-ruby.el... Generating autoloads for ob-ruby.el...done Generating autoloads for ob-sass.el... Generating autoloads for ob-sass.el...done Generating autoloads for ob-scala.el... Generating autoloads for ob-scala.el...done Generating autoloads for ob-scheme.el... Generating autoloads for ob-scheme.el...done Generating autoloads for ob-screen.el... Generating autoloads for ob-screen.el...done Generating autoloads for ob-sh.el... Generating autoloads for ob-sh.el...done Generating autoloads for ob-shen.el... Generating autoloads for ob-shen.el...done Generating autoloads for ob-sql.el... Generating autoloads for ob-sql.el...done Generating autoloads for ob-sqlite.el... Generating autoloads for ob-sqlite.el...done Generating autoloads for ob-table.el... Generating autoloads for ob-table.el...done Generating autoloads for ob-tangle.el... Generating autoloads for ob-tangle.el...done Generating autoloads for ob.el... Generating autoloads for ob.el...done Generating autoloads for org-agenda.el... Generating autoloads for org-agenda.el...done Generating autoloads for org-archive.el... Generating autoloads for org-archive.el...done Generating autoloads for org-ascii.el... Generating autoloads for org-ascii.el...done Generating autoloads for org-attach.el... Generating autoloads for org-attach.el...done Generating autoloads for org-bbdb.el... Generating autoloads for org-bbdb.el...done Generating autoloads for org-beamer.el... Generating autoloads for org-beamer.el...done Generating autoloads for org-bibtex.el... Generating autoloads for org-bibtex.el...done Generating autoloads for org-capture.el... Generating autoloads for org-capture.el...done Generating autoloads for org-clock.el... Generating autoloads for org-clock.el...done Generating autoloads for org-colview-xemacs.el... Generating autoloads for org-colview-xemacs.el...done Generating autoloads for org-colview.el... Generating autoloads for org-colview.el...done Generating autoloads for org-compat.el... Generating autoloads for org-compat.el...done Generating autoloads for org-crypt.el... Generating autoloads for org-crypt.el...done Generating autoloads for org-ctags.el... Generating autoloads for org-ctags.el...done Generating autoloads for org-datetree.el... Generating autoloads for org-datetree.el...done Generating autoloads for org-docbook.el... Generating autoloads for org-docbook.el...done Generating autoloads for org-docview.el... Generating autoloads for org-docview.el...done Generating autoloads for org-entities.el... Generating autoloads for org-entities.el...done Generating autoloads for org-eshell.el... Generating autoloads for org-eshell.el...done Generating autoloads for org-exp-blocks.el... Generating autoloads for org-exp-blocks.el...done Generating autoloads for org-exp.el... Generating autoloads for org-exp.el...done Generating autoloads for org-faces.el... Generating autoloads for org-faces.el...done Generating autoloads for org-feed.el... Generating autoloads for org-feed.el...done Generating autoloads for org-footnote.el... Generating autoloads for org-footnote.el...done Generating autoloads for org-freemind.el... Generating autoloads for org-freemind.el...done Generating autoloads for org-gnus.el... Generating autoloads for org-gnus.el...done Generating autoloads for org-habit.el... Generating autoloads for org-habit.el...done Generating autoloads for org-html.el... Generating autoloads for org-html.el...done Generating autoloads for org-icalendar.el... Generating autoloads for org-icalendar.el...done Generating autoloads for org-id.el... Generating autoloads for org-id.el...done Generating autoloads for org-indent.el... Generating autoloads for org-indent.el...done Generating autoloads for org-info.el... Generating autoloads for org-info.el...done Generating autoloads for org-inlinetask.el... Generating autoloads for org-inlinetask.el...done Generating autoloads for org-irc.el... Generating autoloads for org-irc.el...done Generating autoloads for org-jsinfo.el... Generating autoloads for org-jsinfo.el...done Generating autoloads for org-latex.el... Generating autoloads for org-latex.el...done Generating autoloads for org-list.el... Generating autoloads for org-list.el...done Generating autoloads for org-lparse.el... Generating autoloads for org-lparse.el...done Generating autoloads for org-mac-message.el... Generating autoloads for org-mac-message.el...done Generating autoloads for org-macs.el... Generating autoloads for org-macs.el...done Generating autoloads for org-mew.el... Generating autoloads for org-mew.el...done Generating autoloads for org-mhe.el... Generating autoloads for org-mhe.el...done Generating autoloads for org-mks.el... Generating autoloads for org-mks.el...done Generating autoloads for org-mobile.el... Generating autoloads for org-mobile.el...done Generating autoloads for org-mouse.el... Generating autoloads for org-mouse.el...done Generating autoloads for org-odt.el... Generating autoloads for org-odt.el...done Generating autoloads for org-pcomplete.el... Generating autoloads for org-pcomplete.el...done Generating autoloads for org-plot.el... Generating autoloads for org-plot.el...done Generating autoloads for org-protocol.el... Generating autoloads for org-protocol.el...done Generating autoloads for org-publish.el... Generating autoloads for org-publish.el...done Generating autoloads for org-remember.el... Generating autoloads for org-remember.el...done Generating autoloads for org-rmail.el... Generating autoloads for org-rmail.el...done Generating autoloads for org-special-blocks.el... Generating autoloads for org-special-blocks.el...done Generating autoloads for org-src.el... Generating autoloads for org-src.el...done Generating autoloads for org-table.el... Generating autoloads for org-table.el...done Generating autoloads for org-taskjuggler.el... Generating autoloads for org-taskjuggler.el...done Generating autoloads for org-timer.el... Generating autoloads for org-timer.el...done Generating autoloads for org-version.el... Generating autoloads for org-version.el...done Generating autoloads for org-vm.el... Generating autoloads for org-vm.el...done Generating autoloads for org-w3m.el... Generating autoloads for org-w3m.el...done Generating autoloads for org-wl.el... Generating autoloads for org-wl.el...done Generating autoloads for org-xoxo.el... Generating autoloads for org-xoxo.el...done Generating autoloads for org.el... Generating autoloads for org.el...done Saving file c:/home/org-mode/lisp/org-install.el... Loading vc-git... Wrote c:/home/org-mode/lisp/org-install.el make[1]: Leaving directory `/cygdrive/c/home/org-mode/lisp' --8<---------------cut here---------------end--------------->8--- Best regards, Seb [1] DEFINITION NOT FOUND: 1 -- Sebastien Vauban