[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r112881: Fix bug #14513 with --enable-locallisppath
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r112881: Fix bug #14513 with --enable-locallisppath not working on MS-Windows. |
Date: |
Fri, 07 Jun 2013 08:09:45 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112881
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14513
author: Richard Copley <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-07 11:08:29 +0300
message:
Fix bug #14513 with --enable-locallisppath not working on MS-Windows.
Makefile.in (msys_to_w32): Modify to support d:\foo file names.
(msys_lisppath_to_w32, msys_prefix_subst, msys_sed_sh_escape): New
variables.
(epaths-force-w32): Use them.
epaths.nt (PATH_SITELOADSEARCH): Fix commentary.
epaths.in: Fix commentary to PATH_SITELOADSEARCH.
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-06-03 19:38:06 +0000
+++ b/ChangeLog 2013-06-07 08:08:29 +0000
@@ -1,3 +1,10 @@
+2013-06-07 Richard Copley <address@hidden> (tiny change)
+
+ * Makefile.in (msys_to_w32): Modify to support d:\foo file names.
+ (msys_lisppath_to_w32, msys_prefix_subst, msys_sed_sh_escape): New
+ variables.
+ (epaths-force-w32): Use them.
+
2013-06-03 Michael Albinus <address@hidden>
* configure.ac (HAVE_GFILENOTIFY): Check for gio >= 2.24.
=== modified file 'Makefile.in'
--- a/Makefile.in 2013-05-16 09:58:56 +0000
+++ b/Makefile.in 2013-06-07 08:08:29 +0000
@@ -318,14 +318,37 @@
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
-# Convert MSYS-style /x/foo file name into x:/foo that Windows can grok.
-msys_to_w32=sed -e 's,^/\([A-Za-z]\)/,\1:/,'
+# Convert MSYS-style /x/foo or Windows-style x:\foo file names
+# into x:/foo that Windows can grok.
+msys_to_w32=sed -e 's,\\\\,/,g' -e 's,^/\([A-Za-z]\)/,\1:/,'
+
+# Transform directory search path and its components. Original can
+# be MSYS or Windows style. Set path separator to ";", directory
+# separator to "/" and transform MSYS-style "/c/" to "c:/".
+# Remove empty path components and escape semicolons.
+msys_lisppath_to_w32=sed -e 's,\\\\,/,g' \
+ -e 's,\(^\|[:;]\)\([A-Za-z]\):/,\1/\2/,g' \
+ -e 's/:/;/g' -e 's,\(^\|;\)/\([A-Za-z]\)/,\1\2:/,g' \
+ -e 's/;\+/;/g' -e 's/^;//' -e 's/;$$//' -e 's/;/\\\\;/g'
+
+# Replace "${prefix}" with '%emacs_dir%' (which expands to install
+# directory at runtime).
+msys_prefix_subst=sed -e
's!\(^\|;\)'"$${prefixpattern}"'\([;/]\|$$\)!\1%emacs_dir%\2!g'
+
+# Quote Sed special characters (except backslash and newline) with
+# a double backslash.
+msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
# The w32 build needs a slightly different editing, and it uses
# nt/epaths.nt as the template.
+# Use the value of ${locallisppath} supplied by `configure',
+# to support the --enable-locallisppath argument.
epaths-force-w32: FRC
@(w32srcdir=`echo "${srcdir}" | ${msys_to_w32}` ; \
+ prefixpattern=`echo '${prefix}' | ${msys_to_w32} |
${msys_sed_sh_escape}` ; \
+ locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} |
${msys_prefix_subst}` ; \
sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \
+ -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${locallisppath}"'";' \
-e '/^.*#/s/@VER@/${version}/g' \
-e '/^.*#/s/@CFG@/${configuration}/g' \
-e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2013-06-03 19:06:09 +0000
+++ b/nt/ChangeLog 2013-06-07 08:08:29 +0000
@@ -1,3 +1,7 @@
+2013-06-07 Richard Copley <address@hidden> (tiny change)
+
+ * epaths.nt (PATH_SITELOADSEARCH): Fix commentary.
+
2013-06-03 Eli Zaretskii <address@hidden>
* config.nt: Add HAVE_GFILENOTIFY, HAVE_W32NOTIFY and USE_FILE_NOTIFY.
=== modified file 'nt/epaths.nt'
--- a/nt/epaths.nt 2013-04-06 13:25:17 +0000
+++ b/nt/epaths.nt 2013-06-07 08:08:29 +0000
@@ -41,10 +41,10 @@
#define PATH_LOADSEARCH
"%emacs_dir%/share/emacs/@VER@/lisp;%emacs_dir%/share/emacs/@VER@/leim"
/* Like PATH_LOADSEARCH, but contains the non-standard pieces.
- These are the site-lisp directories, typically something like
+ These are the site-lisp directories. Configure sets this to
+ ${locallisppath}, which typically defaults to something like:
<datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp
- Configure prepends any $locallisppath, as set by the
- --enable-locallisppath argument.
+ but can be overridden by the --enable-locallisppath argument.
This is combined with PATH_LOADSEARCH to make the default load-path.
If the --no-site-lisp option is used, this piece is excluded.
*/
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-06-07 03:23:57 +0000
+++ b/src/ChangeLog 2013-06-07 08:08:29 +0000
@@ -1,3 +1,7 @@
+2013-06-07 Richard Copley <address@hidden> (tiny change)
+
+ * epaths.in: Fix commentary to PATH_SITELOADSEARCH.
+
2013-06-06 Eli Zaretskii <address@hidden>
* xdisp.c (note_mouse_highlight): When mouse-highlight is off,
=== modified file 'src/epaths.in'
--- a/src/epaths.in 2013-01-01 09:11:05 +0000
+++ b/src/epaths.in 2013-06-07 08:08:29 +0000
@@ -30,10 +30,10 @@
/* Like PATH_LOADSEARCH, but contains the non-standard pieces.
- These are the site-lisp directories, typically something like
+ These are the site-lisp directories. Configure sets this to
+ ${locallisppath}, which typically defaults to something like:
<datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp
- Configure prepends any $locallisppath, as set by the
- --enable-locallisppath argument.
+ but can be overridden by the --enable-locallisppath argument.
This is combined with PATH_LOADSEARCH to make the default load-path.
If the --no-site-lisp option is used, this piece is excluded.
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r112881: Fix bug #14513 with --enable-locallisppath not working on MS-Windows.,
Eli Zaretskii <=