* Can't make org-install.el
@ 2012-05-18 20:49 Sebastien Vauban
2012-05-19 8:54 ` Achim Gratz
0 siblings, 1 reply; 16+ messages in thread
From: Sebastien Vauban @ 2012-05-18 20:49 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hello,
I don't know why, but with the most recent Org-mode version, I can't make
org-install.org:
--8<---------------cut here---------------start------------->8---
make -C doc install
make[1]: Entering directory `/cygdrive/c/home/sva/Downloads/emacs/site-lisp/org-mode/doc'
if [ ! -d /usr/share/info ]; then mkdir -p /usr/share/info; else true; fi ;
install -p org /usr/share/info
install-info --infodir=/usr/share/info org
make[1]: Leaving directory `/cygdrive/c/home/sva/Downloads/emacs/site-lisp/org-mode/doc'
make -C etc install
make[1]: Entering directory `/cygdrive/c/home/sva/Downloads/emacs/site-lisp/org-mode/etc'
for dir in styles schema ; do \
if [ ! -d /usr/share/emacs/etc/org/${dir} ] ; then \
mkdir -p /usr/share/emacs/etc/org/${dir} ; \
fi ; \
install -p ${dir}/* /usr/share/emacs/etc/org/${dir} ; \
done ;
make[1]: Leaving directory `/cygdrive/c/home/sva/Downloads/emacs/site-lisp/org-mode/etc'
make -C lisp install
make[1]: Entering directory `/cygdrive/c/home/sva/Downloads/emacs/site-lisp/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-568-gc84cda)
Loading c:/home/sva/Downloads/emacs/site-lisp/org-mode/lisp/org-compat.el (source)...
Loading c:/home/sva/Downloads/emacs/site-lisp/org-mode/UTILITIES/org-fixup.el (source)...
Loading vc-svn...
Loading vc-git...
Saving file c:/home/sva/Downloads/emacs/site-lisp/org-mode/lisp/org-version.el...
Wrote c:/home/sva/Downloads/emacs/site-lisp/org-mode/lisp/org-version.el
org-install: 7.8.10 (release_7.8.10-568-gc84cda)
Loading c:/home/sva/Downloads/emacs/site-lisp/org-mode/lisp/org-compat.el (source)...
Loading c:/home/sva/Downloads/emacs/site-lisp/org-mode/UTILITIES/org-fixup.el (source)...
Buffer is read-only: #<buffer org-install.el>
Makefile:30: recipe for target `org-install.el' failed
make[1]: *** [org-install.el] Error 127
make[1]: Leaving directory `/cygdrive/c/home/sva/Downloads/emacs/site-lisp/org-mode/lisp'
targets.mk:84: recipe for target `install-lisp' failed
make: *** [install-lisp] Error 2
--8<---------------cut here---------------end--------------->8---
To overcome problems, I tried to copy org-install.el from the latest Emacs 24
alpha version, but the newly function `org-find-library-dir' is unknown.
Loading, by hand, `org-compat.el' does solve this latest problem, and allow me
to still be able to use Org.
However, the first problem (make install) is the one I still need to resolve.
Any idea?
Best regards,
Seb
[1] DEFINITION NOT FOUND: 1
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: Can't make org-install.el
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
0 siblings, 1 reply; 16+ messages in thread
From: Achim Gratz @ 2012-05-19 8:54 UTC (permalink / raw)
To: emacs-orgmode
Sebastien Vauban writes:
> Buffer is read-only: #<buffer org-install.el>
Here's your clue: the Emacs that is trying to create org-install.el
doesn't have write access and thus cannot save the file. At that point,
no org-install.el should exist, since it should have been removed before
it is created anew. But it likely still exists (and is not writable).
No such problem seems to have struck org-version.el.
> To overcome problems, I tried to copy org-install.el from the latest Emacs 24
> alpha version, but the newly function `org-find-library-dir' is unknown.
This will never work right...
> However, the first problem (make install) is the one I still need to resolve.
> Any idea?
Check what the access rights are in that directory (not just the POSIX
file modes, but also the Windows ACL may interfere). Remove any
org-install.el that may be there. Make should then work correctly.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptation for Waldorf rackAttack V1.04R1:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: Can't make org-install.el
2012-05-19 8:54 ` Achim Gratz
@ 2012-05-19 10:42 ` Sebastien Vauban
2012-05-19 12:00 ` Achim Gratz
0 siblings, 1 reply; 16+ messages in thread
From: Sebastien Vauban @ 2012-05-19 10:42 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hi Achim,
Achim Gratz wrote:
> Sebastien Vauban writes:
>> Buffer is read-only: #<buffer org-install.el>
>
> Here's your clue: the Emacs that is trying to create org-install.el
> doesn't have write access and thus cannot save the file. At that point,
> no org-install.el should exist, since it should have been removed before
> it is created anew. But it likely still exists (and is not writable).
> No such problem seems to have struck org-version.el.
>
>> To overcome problems, I tried to copy org-install.el from the latest Emacs 24
>> alpha version, but the newly function `org-find-library-dir' is unknown.
>
> This will never work right...
I know. This is just a very rude approach, letting me use Org for my
day-to-day files. Otherwise, I really am stuck... Except if I would require
all the packages, individually.
>> However, the first problem (make install) is the one I still need to resolve.
>> Any idea?
>
> Check what the access rights are in that directory (not just the POSIX
> file modes, but also the Windows ACL may interfere). Remove any
> org-install.el that may be there. Make should then work correctly.
I did it from scratch in two different directories, with the same results.
- rm -rf org-mode
- git clone
- make autoloads
Still the same problem of read-only buffer...
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:~/src 0$ git clone git://orgmode.org/org-mode.git
Cloning into 'org-mode'...
Seb@MEDIACENTER:~/src 0$ cd org-mode
Seb@MEDIACENTER:src/org-mode 0$ make autoloads
======================================================
= Invoke "make help" for a synopsis of make targets. =
= Created a default local.mk template. =
= Setting "oldorg" as the default target. =
= Please adapt local.mk to your local setup! =
======================================================
make -C lisp autoloads
make[1]: Entering directory `/cygdrive/c/home/sva/src/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-572-g40a789)
Loading c:/home/sva/src/org-mode/lisp/org-compat.el (source)...
Loading c:/home/sva/src/org-mode/UTILITIES/org-fixup.el (source)...
Loading vc-svn...
Loading vc-git...
Saving file c:/home/sva/src/org-mode/lisp/org-version.el...
Wrote c:/home/sva/src/org-mode/lisp/org-version.el
org-install: 7.8.10 (release_7.8.10-572-g40a789)
Loading c:/home/sva/src/org-mode/lisp/org-compat.el (source)...
Loading c:/home/sva/src/org-mode/UTILITIES/org-fixup.el (source)...
Buffer is read-only: #<buffer org-install.el>
Makefile:30: recipe for target `org-install.el' failed
make[1]: *** [org-install.el] Error 127
make[1]: Leaving directory `/cygdrive/c/home/sva/src/org-mode/lisp'
targets.mk:87: recipe for target `autoloads' failed
make: *** [autoloads] Error 2
--8<---------------cut here---------------end--------------->8---
Though, Cygwin permissions seem OK:
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:src/org-mode 0$ ls
Makefile README_DIST README_maintainer contrib doc lisp request-assign-future.txt testing
README README_GIT UTILITIES default.mk etc local.mk targets.mk
Seb@MEDIACENTER:src/org-mode 0$ ls -l
total 44
-rw-r--r-- 1 Seb Aucun 3179 May 19 12:30 Makefile
-rw-r--r-- 1 Seb Aucun 1138 May 19 12:30 README
-rw-r--r-- 1 Seb Aucun 1054 May 19 12:30 README_DIST
-rw-r--r-- 1 Seb Aucun 3522 May 19 12:30 README_GIT
-rw-r--r-- 1 Seb Aucun 11757 May 19 12:30 README_maintainer
drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 UTILITIES
drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 contrib
-rw-r--r-- 1 Seb Aucun 3865 May 19 12:30 default.mk
drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 doc
drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 etc
drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 lisp
-rw-r--r-- 1 Seb Aucun 1460 May 19 12:30 local.mk
-rw-r--r-- 1 Seb Aucun 1007 May 19 12:30 request-assign-future.txt
-rw-r--r-- 1 Seb Aucun 3194 May 19 12:30 targets.mk
drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 testing
Seb@MEDIACENTER:src/org-mode 0$ ls -l lisp
total 3776
-rw-r--r-- 1 Seb Aucun 1219 May 19 12:30 Makefile
-rw-r--r-- 1 Seb Aucun 6789 May 19 12:30 ob-C.el
-rw-r--r-- 1 Seb Aucun 13621 May 19 12:30 ob-R.el
[...]
-rw-r--r-- 1 Seb Aucun 13772 May 19 12:30 org-habit.el
-rw-r--r-- 1 Seb Aucun 96704 May 19 12:30 org-html.el
-rw-r--r-- 1 Seb Aucun 26322 May 19 12:30 org-icalendar.el
-rw-r--r-- 1 Seb Aucun 22594 May 19 12:30 org-id.el
-rw-r--r-- 1 Seb Aucun 17412 May 19 12:30 org-indent.el
-rw-r--r-- 1 Seb Aucun 2696 May 19 12:30 org-info.el
-rw-r--r-- 1 Seb Aucun 17719 May 19 12:30 org-inlinetask.el
-rw-r--r-- 1 Seb Aucun 9198 May 19 12:30 org-irc.el
-rw-r--r-- 1 Seb Aucun 7853 May 19 12:30 org-jsinfo.el
[...]
-rw-r--r-- 1 Seb Aucun 15881 May 19 12:30 org-timer.el
-rwxr-xr-x 1 Seb Aucun 721 May 19 12:30 org-version.el
-rw-r--r-- 1 Seb Aucun 7317 May 19 12:30 org-vm.el
-rw-r--r-- 1 Seb Aucun 7188 May 19 12:30 org-w3m.el
-rw-r--r-- 1 Seb Aucun 11546 May 19 12:30 org-wl.el
--8<---------------cut here---------------end--------------->8---
Same for Windows permissions.
Would it be possible to have a more detailed reporting of the problem? For
example, I don't understand why org-install.el should be read-only, while
there was none before making autoloads... So, such a buffer has been
created... but can't be saved?
Other question: why do we have to make org-install.el? Shouldn't it be
distributed with the other files, without requiring all users to make it?
Thanks for your help...
Best regards,
Seb
[1] DEFINITION NOT FOUND: 1
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: Can't make org-install.el
2012-05-19 10:42 ` Sebastien Vauban
@ 2012-05-19 12:00 ` Achim Gratz
2012-05-19 13:40 ` Sebastien Vauban
0 siblings, 1 reply; 16+ messages in thread
From: Achim Gratz @ 2012-05-19 12:00 UTC (permalink / raw)
To: emacs-orgmode
Sebastien Vauban writes:
> drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 lisp
: ^
:__________/
This tells you that in addition to the Cygwin permissions Windows ACL
are in effect. These may partially or completely subvert the POSIX
permissions. Since you've re-created the directory, these ACL are most
likely inherited ACL (applied from directories further up in the
hierarchy).
> Would it be possible to have a more detailed reporting of the problem? For
> example, I don't understand why org-install.el should be read-only, while
> there was none before making autoloads... So, such a buffer has been
> created... but can't be saved?
Me neither and I've been using that same setup at work for months
without any such problems. Only org-install.el seems to be read-only
however, while org-version.el (which is created by the same method) is
not, which makes this even more puzzling... But here's one other oddity
in your log which may be able to explain it:
> Loading vc-svn...
It looks like lisp (or all of org probably) is both under SVN and Git
version control... That is a Bad Idea™ and might explain why the buffer
becomes read-only if org-install.el is already registered in SVN (which
doesn't allow non-check-out files to be edited). So can you please
remove the Git work tree completely from SVN or just install in a
pristine location?
> Other question: why do we have to make org-install.el? Shouldn't it be
> distributed with the other files, without requiring all users to make it?
Because you use the sources and have to generate all the things that
need to be generated. The generated files might be included in
distribution archives, Bastien and I are currently thinking about that.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: Can't make org-install.el
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
0 siblings, 2 replies; 16+ messages in thread
From: Sebastien Vauban @ 2012-05-19 13:40 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hi Achim,
Achim Gratz wrote:
> Sebastien Vauban writes:
>> drwxr-xr-x+ 1 Seb Aucun 0 May 19 12:30 lisp
> : ^
> :__________/
>
> This tells you that in addition to the Cygwin permissions Windows ACL
> are in effect. These may partially or completely subvert the POSIX
> permissions. Since you've re-created the directory, these ACL are most
> likely inherited ACL (applied from directories further up in the
> hierarchy).
These allow me to do everything I want (I'm even admin of my machine).
>> Would it be possible to have a more detailed reporting of the problem? For
>> example, I don't understand why org-install.el should be read-only, while
>> there was none before making autoloads... So, such a buffer has been
>> created... but can't be saved?
>
> Me neither and I've been using that same setup at work for months without
> any such problems. Only org-install.el seems to be read-only however, while
> org-version.el (which is created by the same method) is not, which makes
> this even more puzzling...
Absolutely. You pinpoint a real un-understandable thing (at least, for now)...
> But here's one other oddity in your log which may be able to explain it:
>
>> Loading vc-svn...
>
> It looks like lisp (or all of org probably) is both under SVN and Git
> version control... That is a Bad Idea™ and might explain why the buffer
> becomes read-only if org-install.el is already registered in SVN (which
> doesn't allow non-check-out files to be edited).
The location ~/src/org-mode/lisp/ is not in both Git and SVN.
In Git, well.
For SVN, it's ~/ that's for most parts of it (all my rc files) under SVN. Some
directories are as well in SVN, most aren't (just ignored).
I don't know if putting ~/ (= C:/home/sva/) under SVN is good or bad, but, for
sure, ~/src/org-mode/ is not under both.
> So can you please remove the Git work tree completely from SVN or just
> install in a pristine location?
But, you're right, this could be confusing. So, I've just clone Org into
C:/home/, a directory which is absolutely not under any VC system; and ditto
for its parent C:/.
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:c/home 0$ git clone git://orgmode.org/org-mode.git
Cloning into 'org-mode'...
Seb@MEDIACENTER:c/home 0$ cd org-mode
Seb@MEDIACENTER:home/org-mode 0$ make autoloads
======================================================
= Invoke "make help" for a synopsis of make targets. =
= Created a default local.mk template. =
= Setting "oldorg" as the default target. =
= Please adapt local.mk to your local setup! =
======================================================
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-572-g40a789)
Loading c:/home/org-mode/lisp/org-compat.el (source)...
Loading c:/home/org-mode/UTILITIES/org-fixup.el (source)...
Loading vc-git...
Saving file c:/home/org-mode/lisp/org-version.el...
Wrote c:/home/org-mode/lisp/org-version.el
org-install: 7.8.10 (release_7.8.10-572-g40a789)
Loading c:/home/org-mode/lisp/org-compat.el (source)...
Loading c:/home/org-mode/UTILITIES/org-fixup.el (source)...
Buffer is read-only: #<buffer org-install.el>
Makefile:30: recipe for target `org-install.el' failed
make[1]: *** [org-install.el] Error 127
make[1]: Leaving directory `/cygdrive/c/home/org-mode/lisp'
targets.mk:87: recipe for target `autoloads' failed
make: *** [autoloads] Error 2
Seb@MEDIACENTER:home/org-mode 0$ ls -l
total 44
-rw-r--r-- 1 Seb Aucun 3179 May 19 15:15 Makefile
-rw-r--r-- 1 Seb Aucun 1138 May 19 15:15 README
-rw-r--r-- 1 Seb Aucun 1054 May 19 15:15 README_DIST
-rw-r--r-- 1 Seb Aucun 3522 May 19 15:15 README_GIT
-rw-r--r-- 1 Seb Aucun 11757 May 19 15:15 README_maintainer
drwxr-xr-x+ 1 Seb Aucun 0 May 19 15:15 UTILITIES
drwxr-xr-x+ 1 Seb Aucun 0 May 19 15:15 contrib
-rw-r--r-- 1 Seb Aucun 3865 May 19 15:15 default.mk
drwxr-xr-x+ 1 Seb Aucun 0 May 19 15:15 doc
drwxr-xr-x+ 1 Seb Aucun 0 May 19 15:15 etc
drwxr-xr-x+ 1 Seb Aucun 0 May 19 15:17 lisp
-rw-r--r-- 1 Seb Aucun 1460 May 19 15:17 local.mk
-rw-r--r-- 1 Seb Aucun 1007 May 19 15:15 request-assign-future.txt
-rw-r--r-- 1 Seb Aucun 3194 May 19 15:15 targets.mk
drwxr-xr-x+ 1 Seb Aucun 0 May 19 15:15 testing
Seb@MEDIACENTER:home/org-mode 0$
--8<---------------cut here---------------end--------------->8---
The same happens, this time without any vc messages (neither Git nor SVN).
Searches on the net tell this message can happen when the owner is root or
with bad permissions. I did chmod -R 0777 on every file and directory, but I
still have the same problem.
>> Other question: why do we have to make org-install.el? Shouldn't it be
>> distributed with the other files, without requiring all users to make it?
>
> Because you use the sources and have to generate all the things that
> need to be generated. The generated files might be included in
> distribution archives, Bastien and I are currently thinking about that.
OK. That makes sense.
But, if it causes troubles for people with no make capability, couldn't that
be autogenerated as a post-commit process on the server or so? I don't know
it this is a good idea.
Anyway, it shouldn't be a big deal.
Best regards,
Seb
[1] DEFINITION NOT FOUND: 1
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: Can't make org-install.el
2012-05-19 13:40 ` Sebastien Vauban
@ 2012-05-19 15:11 ` Achim Gratz
2012-05-19 17:56 ` [PATCH] " Achim Gratz
1 sibling, 0 replies; 16+ messages in thread
From: Achim Gratz @ 2012-05-19 15:11 UTC (permalink / raw)
To: emacs-orgmode
Sebastien Vauban writes:
> These allow me to do everything I want (I'm even admin of my machine).
OK, so the ACL are out of the game then.
>> It looks like lisp (or all of org probably) is both under SVN and Git
>> version control... That is a Bad Idea™ and might explain why the buffer
>> becomes read-only if org-install.el is already registered in SVN (which
>> doesn't allow non-check-out files to be edited).
>
> The location ~/src/org-mode/lisp/ is not in both Git and SVN.
It must be, or at least there must be a directory .svn there, otherwise
vc-svn would not be loaded. Either that or you have some local
configuration to always load vc-svn for that path.
> But, you're right, this could be confusing. So, I've just clone Org into
> C:/home/, a directory which is absolutely not under any VC system; and ditto
> for its parent C:/.
> The same happens, this time without any vc messages (neither Git nor SVN).
No, vc-git got loaded (as it should). Please add this definition to the
newly created local.mk:
--8<---------------cut here---------------start------------->8---
# Using emacs in batch mode.
BATCH = $(EMACS) -batch -Q -q -no-site-file
--8<---------------cut here---------------end--------------->8---
...and try again.
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] 16+ messages in thread
* [PATCH] Re: Can't make org-install.el
2012-05-19 13:40 ` Sebastien Vauban
2012-05-19 15:11 ` Achim Gratz
@ 2012-05-19 17:56 ` Achim Gratz
2012-05-19 18:05 ` Bastien
1 sibling, 1 reply; 16+ messages in thread
From: Achim Gratz @ 2012-05-19 17:56 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
Sebastien Vauban writes:
> These allow me to do everything I want (I'm even admin of my machine).
Just as a comment, being admin does not necessarily mean that you can do
anything, only that you can elevate your rights so that you can
eventually do it. Windows has quite an elaborate system for permissions
(and revocations thereof) in the file system and the point of lots of
those is precisely to restrict was an admin can do by default.
> Absolutely. You pinpoint a real un-understandable thing (at least, for now)...
While I still don't understand how this is happening exactly, I've
re-written the functions in question to work off temporary buffers,
which only runs into the problem of non-writability at the very end when
the file is to be saved and should then ask for confirmation. At that
point it should be possible to see what is going on.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: more robust org-fixup.el --]
[-- Type: text/x-patch, Size: 4760 bytes --]
From 7a6bcf54b0263a5afeafddf1a0121e2c8ac7d42a Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat, 19 May 2012 19:54:00 +0200
Subject: [PATCH] make functions in org-fixup.el more robust, add full build
functionality
* UTILITIES/org-fixup.el(org-make-org-version): Use temporary buffer.
* UTILITIES/org-fixup.el(org-make-org-install): Use temporary buffer.
* UTILITIES/org-fixup.el(org-make-autoloads): New function, generates
autoload files using (org-make-org-version)
and (org-make-org-install). Uses (org-fixup) to determine version
strings.
* UTILITIES/org-fixup.el(org-make-autoloads-compile): New function,
generates autoload files using (org-make-autoloads) and
byte-compiles files in lisp. Optional argument forces
re-compilation of all files.
* UTILITIES/org-fixup.el(org-fixup): Clean up whitespace and correct the
unwind form.
---
UTILITIES/org-fixup.el | 64 ++++++++++++++++++++++++++++++++++--------------
1 file changed, 45 insertions(+), 19 deletions(-)
diff --git a/UTILITIES/org-fixup.el b/UTILITIES/org-fixup.el
index bf70a80..9f56f16 100644
--- a/UTILITIES/org-fixup.el
+++ b/UTILITIES/org-fixup.el
@@ -28,9 +28,8 @@
(require 'autoload)
(defun org-make-org-version (org-release org-git-version odt-dir)
- (find-file "org-version.el")
- (erase-buffer)
- (insert "\
+ (with-temp-buffer
+ (insert "\
;;; org-version.el --- autogenerated file, do not edit
;;
;;; Code:
@@ -52,19 +51,46 @@ (defun org-make-org-version (org-release org-git-version odt-dir)
\f\n;; Local Variables:\n;; version-control: never
;; no-byte-compile: t
;; coding: utf-8\n;; End:\n;;; org-version.el ends here\n")
- (save-buffer))
+ (toggle-read-only 0)
+ (write-file "org-version.el")))
(defun org-make-org-install (absfile)
- (find-file absfile)
- (erase-buffer)
- (insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
- (let ((files (directory-files (file-name-directory absfile) 'full "^[^.#~]*\\.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")
- (save-buffer))
+ (with-temp-buffer
+ (set-visited-file-name absfile)
+ (insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
+ (let ((files (directory-files (file-name-directory absfile) 'full "^[^.#~]*\\.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)))
+
+(defun org-make-autoloads ()
+ (let* ((origin default-directory)
+ (dirlisp (org-find-library-dir "org"))
+ (dirorg (concat dirlisp "../" ))
+ (dirodt (if (boundp 'org-odt-data-dir)
+ org-odt-data-dir
+ (concat dirorg "etc/"))))
+ (unwind-protect
+ (progn
+ (cd dirlisp)
+ (org-fixup)
+ (org-make-org-version (org-release) (org-git-version) dirodt)
+ (org-make-org-install (concat dirlisp "org-install.el")))
+ (cd origin))))
+
+(defun org-make-autoloads-compile (&rest force)
+ (let* ((origin default-directory)
+ (dirlisp (org-find-library-dir "org")))
+ (unwind-protect
+ (progn
+ (cd dirlisp)
+ (org-make-autoloads)
+ (byte-recompile-directory dirlisp 0 force))
+ (cd origin))))
(defmacro org-fixup ()
(let* ((origin default-directory)
@@ -81,14 +107,14 @@ (defmacro org-fixup ()
(unwind-protect
(progn
(cd dirorg)
- (let (( git6 (substring (shell-command-to-string "git describe --abbrev=6 HEAD") 0 -1))
- ( git0 (substring (shell-command-to-string "git describe --abbrev=0 HEAD") 0 -1))
- ( gitd (string-match "\\S-" (shell-command-to-string "git status -uno --porcelain"))))
+ (let ((git6 (substring (shell-command-to-string "git describe --abbrev=6 HEAD") 0 -1))
+ (git0 (substring (shell-command-to-string "git describe --abbrev=0 HEAD") 0 -1))
+ (gitd (string-match "\\S-" (shell-command-to-string "git status -uno --porcelain"))))
(setq org-git-version (concat git6 (when gitd ".dirty")))
(if (string-match "^release_" git0)
(setq org-version (substring git0 8))
- (setq org-version git0)))
- (cd origin)))))
+ (setq org-version git0))))
+ (cd origin))))
`(progn
(defun org-release () ,org-version)
(defun org-git-version () ,org-git-version)
--
1.7.9.2
[-- Attachment #3: Type: text/plain, Size: 325 bytes --]
I've added functions to make the autoloads and byte-compile without the
use of make for those that may not have it.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
2012-05-19 17:56 ` [PATCH] " Achim Gratz
@ 2012-05-19 18:05 ` Bastien
2012-05-19 19:00 ` Sebastien Vauban
0 siblings, 1 reply; 16+ messages in thread
From: Bastien @ 2012-05-19 18:05 UTC (permalink / raw)
To: Achim Gratz; +Cc: emacs-orgmode
Achim Gratz <Stromeko@nexgo.de> writes:
> While I still don't understand how this is happening exactly, I've
> re-written the functions in question to work off temporary buffers,
> which only runs into the problem of non-writability at the very end when
> the file is to be saved and should then ask for confirmation. At that
> point it should be possible to see what is going on.
Applied, thanks.
--
Bastien
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
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
0 siblings, 2 replies; 16+ messages in thread
From: Sebastien Vauban @ 2012-05-19 19:00 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hi Achim,
Bastien wrote:
> Achim Gratz <Stromeko-i47jiTeKxPI@public.gmane.org> writes:
>
>> While I still don't understand how this is happening exactly, I've
>> re-written the functions in question to work off temporary buffers, which
>> only runs into the problem of non-writability at the very end when the file
>> is to be saved and should then ask for confirmation. At that point it
>> should be possible to see what is going on.
>
> Applied, thanks.
OK, so git pull:
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:home/org-mode 0$ git pull
From git://orgmode.org/org-mode
40a789e..7b33d9f master -> origin/master
Updating 40a789e..7b33d9f
error: Your local changes to the following files would be overwritten by merge:
UTILITIES/org-fixup.el
Please, commit your changes or stash them before you can merge.
Aborting
--8<---------------cut here---------------end--------------->8---
Surprise... I hadn't touched (of course) org-fixup.el in any way, except by
changing the permissions (to 0777).
OK. Just do what git says: stash the changes.
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:home/org-mode 0$ git stash
Saved working directory and index state WIP on master: 40a789e fix org-reload and add parameters to customize output from org-version
Checking out files: 100% (257/257), done.
HEAD is now at 40a789e fix org-reload and add parameters to customize output from org-version
Seb@MEDIACENTER:home/org-mode 0$ git pull
Updating 40a789e..7b33d9f
Fast-forward
UTILITIES/org-fixup.el | 64 +++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 19 deletions(-)
--8<---------------cut here---------------end--------------->8---
Now, let's see...
--8<---------------cut here---------------start------------->8---
Seb@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)
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)
Loading c:/home/org-mode/lisp/org-compat.el (source)...
Loading c:/home/org-mode/UTILITIES/org-fixup.el (source)...
Saving file c:/cygdrive/c/home/org-mode/lisp/org-install.el...
c:/cygdrive/c/home/org-mode/lisp/: no such directory
Makefile:30: recipe for target `org-install.el' failed
make[1]: *** [org-install.el] Error 127
make[1]: Leaving directory `/cygdrive/c/home/org-mode/lisp'
targets.mk:87: recipe for target `autoloads' failed
make: *** [autoloads] Error 2
Seb@MEDIACENTER:home/org-mode 0$ ls
Makefile README_DIST README_maintainer contrib doc lisp request-assign-future.txt testing
README README_GIT UTILITIES default.mk etc local.mk targets.mk
Seb@MEDIACENTER:home/org-mode 0$
--8<---------------cut here---------------end--------------->8---
Error (lisp directory) not there!?? But the reason comes clearly to the
surface: a mix of Cygwin and Win32 syntax for the pathnames.
C:/home/org-mode/lisp/ and
/cygdrive/c/home/org-mode/lisp/
becomes here c:/cygdrive/c/home/org-mode/lisp/...
Maybe you can understand from where that could come.
Anyway, let me already thank you a lot for your help on this. I appreciate it
a lot; thanks...
Best regards,
Seb
[1] DEFINITION NOT FOUND: 1
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
2012-05-19 19:00 ` Sebastien Vauban
@ 2012-05-19 19:17 ` Achim Gratz
2012-05-19 19:41 ` Achim Gratz
1 sibling, 0 replies; 16+ messages in thread
From: Achim Gratz @ 2012-05-19 19:17 UTC (permalink / raw)
To: emacs-orgmode
Sebastien Vauban writes:
> Surprise... I hadn't touched (of course) org-fixup.el in any way, except by
> changing the permissions (to 0777).
As far as Git is concerned, changing the permissions is the same as
changing the file content.
> C:/home/org-mode/lisp/ and
> /cygdrive/c/home/org-mode/lisp/
>
> becomes here c:/cygdrive/c/home/org-mode/lisp/...
>
> Maybe you can understand from where that could come.
No I don't, but maybe do an explicit
cd /cygdrive/c/home/org-mode
before starting make. If that doesn't help, check to see if you do
anything in your bash profile that mucks with PWD/CWD or if maybe you
have set SHELL to a funny value.
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
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
1 sibling, 1 reply; 16+ messages in thread
From: Achim Gratz @ 2012-05-19 19:41 UTC (permalink / raw)
To: emacs-orgmode
Sebastien Vauban writes:
> Maybe you can understand from where that could come.
Are you trying to use an NTemacs perhaps?! If so, wouldn't you think
that might be an important information?
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 [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
2012-05-19 19:41 ` Achim Gratz
@ 2012-05-19 20:27 ` Achim Gratz
2012-05-21 8:37 ` Sebastien Vauban
2012-05-21 13:34 ` Bastien
0 siblings, 2 replies; 16+ messages in thread
From: Achim Gratz @ 2012-05-19 20:27 UTC (permalink / raw)
To: emacs-orgmode
[-- 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
2012-05-19 20:27 ` Achim Gratz
@ 2012-05-21 8:37 ` Sebastien Vauban
2012-05-21 8:59 ` Sebastien Vauban
2012-05-21 13:34 ` Bastien
1 sibling, 1 reply; 16+ messages in thread
From: Sebastien Vauban @ 2012-05-21 8:37 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
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 <Stromeko-GL6zORMxvAD+tKtrA809HA@public.gmane.org>
> 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
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
2012-05-21 8:37 ` Sebastien Vauban
@ 2012-05-21 8:59 ` Sebastien Vauban
2012-05-23 22:01 ` Achim Gratz
0 siblings, 1 reply; 16+ messages in thread
From: Sebastien Vauban @ 2012-05-21 8:59 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hi Achim,
> Achim Gratz wrote:
>> Based on that assumption, here's another patch. Let me know if this
>> works in your setup.
>
> As you can see, that *does* work... Thanks a lot, Achim!
>
> 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 org-compat.el...
> Generating autoloads for org-compat.el...done
> [...]
Though, after restarting Emacs, I do have:
--8<---------------cut here---------------start------------->8---
File mode specification error: (void-function org-find-library-dir)
--8<---------------cut here---------------end--------------->8---
I see that there is no autoload cookie for it in `org-compat.el':
--8<---------------cut here---------------start------------->8---
(defun org-substring-no-properties (string &optional from to)
;; [...]
(substring-no-properties string from to)))
(defmacro org-find-library-dir (library)
`(file-name-directory (locate-library ,library)))
--8<---------------cut here---------------end--------------->8---
Can a macro be autoloaded as well?
Best regards,
Seb
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
2012-05-19 20:27 ` Achim Gratz
2012-05-21 8:37 ` Sebastien Vauban
@ 2012-05-21 13:34 ` Bastien
1 sibling, 0 replies; 16+ messages in thread
From: Bastien @ 2012-05-21 13:34 UTC (permalink / raw)
To: Achim Gratz; +Cc: emacs-orgmode
Achim Gratz <Stromeko@nexgo.de> writes:
> Based on that assumption, here's another patch. Let me know if this
> works in your setup.
I just applied this patch, thanks.
--
Bastien
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Re: Can't make org-install.el
2012-05-21 8:59 ` Sebastien Vauban
@ 2012-05-23 22:01 ` Achim Gratz
0 siblings, 0 replies; 16+ messages in thread
From: Achim Gratz @ 2012-05-23 22:01 UTC (permalink / raw)
To: emacs-orgmode
Sebastien Vauban writes:
> Though, after restarting Emacs, I do have:
>
> File mode specification error: (void-function org-find-library-dir)
Could you please specify how to elicit that particular message from an
'emacs -Q -nw' session?
> I see that there is no autoload cookie for it in `org-compat.el':
[...]
> Can a macro be autoloaded as well?
I don't think so (not in the same way a defun is autoloaded anyway).
But what do you need this for?
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Factory and User Sound Singles for Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2012-05-23 22:01 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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).