* Trunk broken on MS-Windows
@ 2014-11-08 20:00 Eli Zaretskii
2014-11-08 20:40 ` Eli Zaretskii
0 siblings, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2014-11-08 20:00 UTC (permalink / raw)
To: Dani Moncayo; +Cc: emacs-devel
The build fails with these error messages:
Warning: arch-independent data dir `%emacs_dir%/share/emacs/25.0.50/etc/': Permission denied
Warning: Lisp directory `./lisp': No such file or directory
Error: charsets directory not found:
d:/gnu/bzr/emacs/trunk/src/%emacs_dir%/share/emacs/25.0.50/etc/charsets
Emacs will not function correctly without the character map files.
Please check your installation!
Makefile:833: recipe for target `bootstrap-emacs.exe' failed
make[1]: *** [bootstrap-emacs.exe] Error 1
Looks like some fallout from commits in r118316..118318.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Trunk broken on MS-Windows
2014-11-08 20:00 Trunk broken on MS-Windows Eli Zaretskii
@ 2014-11-08 20:40 ` Eli Zaretskii
2014-11-08 21:19 ` Dani Moncayo
0 siblings, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2014-11-08 20:40 UTC (permalink / raw)
To: dmoncayo; +Cc: emacs-devel
> Date: Sat, 08 Nov 2014 22:00:21 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
>
> The build fails with these error messages:
>
> Warning: arch-independent data dir `%emacs_dir%/share/emacs/25.0.50/etc/': Permission denied
> Warning: Lisp directory `./lisp': No such file or directory
> Error: charsets directory not found:
> d:/gnu/bzr/emacs/trunk/src/%emacs_dir%/share/emacs/25.0.50/etc/charsets
> Emacs will not function correctly without the character map files.
> Please check your installation!
> Makefile:833: recipe for target `bootstrap-emacs.exe' failed
> make[1]: *** [bootstrap-emacs.exe] Error 1
>
> Looks like some fallout from commits in r118316..118318.
The problem is with editing nt/epaths.nt into src/epaths.in, and
specifically with editing of @SRC@. Instead of substituting the
absolute file name of the top-level directory, Makefile now
substitutes just ".", so we end up with
#define PATH_DUMPLOADSEARCH "./lisp"
instead of the correct
#define PATH_DUMPLOADSEARCH "d:/foo/bar/baz/lisp"
This makes this portion of init_callproc fail:
if (data_dir == 0)
{
Lisp_Object tem, tem1, srcdir;
Lisp_Object lispdir = Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH, 0));
srcdir = Fexpand_file_name (build_string ("../src/"), lispdir);
tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
tem1 = Ffile_exists_p (tem);
if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1))
{
Lisp_Object newdir;
newdir = Fexpand_file_name (build_string ("../etc/"), lispdir);
tem = Fexpand_file_name (build_string ("NEWS"), newdir);
tem1 = Ffile_exists_p (tem);
if (!NILP (tem1))
Vdata_directory = newdir;
}
}
because when lispdir is just "./lisp", expand-file-name yields
d:/foo/bar/baz/src/src, since it expands "." into the directory where
temacs runs.
IOW, the new editing of epaths.h will probably fail for anyone who
builds inside the source tree.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Trunk broken on MS-Windows
2014-11-08 20:40 ` Eli Zaretskii
@ 2014-11-08 21:19 ` Dani Moncayo
2014-11-08 22:25 ` Dani Moncayo
2014-11-09 3:39 ` Eli Zaretskii
0 siblings, 2 replies; 6+ messages in thread
From: Dani Moncayo @ 2014-11-08 21:19 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Emacs development discussions
> The problem is with editing nt/epaths.nt into src/epaths.in, and
> specifically with editing of @SRC@. Instead of substituting the
> absolute file name of the top-level directory, Makefile now
> substitutes just ".", so we end up with
>
> #define PATH_DUMPLOADSEARCH "./lisp"
>
> instead of the correct
>
> #define PATH_DUMPLOADSEARCH "d:/foo/bar/baz/lisp"
Thanks Eli.
Does the problem go away with revision 118323 ?
--
Dani Moncayo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Trunk broken on MS-Windows
2014-11-08 21:19 ` Dani Moncayo
@ 2014-11-08 22:25 ` Dani Moncayo
2014-11-08 23:34 ` Dani Moncayo
2014-11-09 3:39 ` Eli Zaretskii
1 sibling, 1 reply; 6+ messages in thread
From: Dani Moncayo @ 2014-11-08 22:25 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Emacs development discussions
> Does the problem go away with revision 118323 ?
Perhaps, a better fix would have been this:
=== modified file 'Makefile.in'
--- Makefile.in 2014-11-08 15:18:06 +0000
+++ Makefile.in 2014-11-08 22:20:19 +0000
@@ -334,7 +334,7 @@
# program that doesn't support MSYS-style paths (e.g. '/c/foo/bar' or
# '/foo/bar').
epaths-force-w32:
- @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
+ @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${abs_srcdir}"`; \
w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}"`; \
w32locallisppath=`${srcdir}/build-aux/msys-to-w32
"${locallisppath}"` ; \
w32locallisppath=$${w32locallisppath//$${w32prefix}/"%emacs_dir%"} ; \
--
Dani Moncayo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Trunk broken on MS-Windows
2014-11-08 22:25 ` Dani Moncayo
@ 2014-11-08 23:34 ` Dani Moncayo
0 siblings, 0 replies; 6+ messages in thread
From: Dani Moncayo @ 2014-11-08 23:34 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Emacs development discussions
On Sat, Nov 8, 2014 at 11:25 PM, Dani Moncayo <dmoncayo@gmail.com> wrote:
>> Does the problem go away with revision 118323 ?
>
> Perhaps, a better fix would have been this:
>
> === modified file 'Makefile.in'
> --- Makefile.in 2014-11-08 15:18:06 +0000
> +++ Makefile.in 2014-11-08 22:20:19 +0000
> @@ -334,7 +334,7 @@
> # program that doesn't support MSYS-style paths (e.g. '/c/foo/bar' or
> # '/foo/bar').
> epaths-force-w32:
> - @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
> + @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${abs_srcdir}"`; \
> w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}"`; \
> w32locallisppath=`${srcdir}/build-aux/msys-to-w32
> "${locallisppath}"` ; \
> w32locallisppath=$${w32locallisppath//$${w32prefix}/"%emacs_dir%"} ; \
Indeed, I've tested it and does TRT.
I think this fix is cleaner, because it converts from relative to
absolute paths only when there is a reason to. So I've reverted
r118323 and committed the above patch.
--
Dani Moncayo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Trunk broken on MS-Windows
2014-11-08 21:19 ` Dani Moncayo
2014-11-08 22:25 ` Dani Moncayo
@ 2014-11-09 3:39 ` Eli Zaretskii
1 sibling, 0 replies; 6+ messages in thread
From: Eli Zaretskii @ 2014-11-09 3:39 UTC (permalink / raw)
To: Dani Moncayo; +Cc: emacs-devel
> Date: Sat, 8 Nov 2014 22:19:30 +0100
> From: Dani Moncayo <dmoncayo@gmail.com>
> Cc: Emacs development discussions <emacs-devel@gnu.org>
>
> > The problem is with editing nt/epaths.nt into src/epaths.in, and
> > specifically with editing of @SRC@. Instead of substituting the
> > absolute file name of the top-level directory, Makefile now
> > substitutes just ".", so we end up with
> >
> > #define PATH_DUMPLOADSEARCH "./lisp"
> >
> > instead of the correct
> >
> > #define PATH_DUMPLOADSEARCH "d:/foo/bar/baz/lisp"
>
> Thanks Eli.
>
> Does the problem go away with revision 118323 ?
It does, thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-09 3:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-08 20:00 Trunk broken on MS-Windows Eli Zaretskii
2014-11-08 20:40 ` Eli Zaretskii
2014-11-08 21:19 ` Dani Moncayo
2014-11-08 22:25 ` Dani Moncayo
2014-11-08 23:34 ` Dani Moncayo
2014-11-09 3:39 ` Eli Zaretskii
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.