mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 05:01:02 -08:00
Code Issues Projects Releases Wiki Activity

msys-to-w32: Do not translate paths starting with %emacs_dir%.

Browse source 
* build-aux/msys-to-w32 (w32pathlist): Do not translate paths
  starting with %emacs_dir%.
This commit is contained in:
Dani Moncayo 2013-11-30 16:42:13 +01:00 • committed by Juanma Barranquero
parent eb6f376dd4
commit a1209bc38d
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-30 Dani Moncayo <dmoncayo@gmail.com>
* build-aux/msys-to-w32 (w32pathlist): Do not translate paths
starting with %emacs_dir%.
2013-11-30 Glenn Morris <rgm@gnu.org>
Stop keeping (most) generated cedet grammar files in the repository.

11
build-aux/msys-to-w32
View file

@ -36,7 +36,8 @@ transformations:
3. Replace two consecutive slashes with single ones.
4. Translate to Windows-native format those paths that are not in such
format already. The translated paths will not end with a slash,
except for root directories (e.g. 'c:/' or 'c:/foo').
except for root directories (e.g. 'c:/' or 'c:/foo'). Paths
starting with '%emacs_dir%' will not be translated.
5. Escape with backslashes every occurrence of SEPARATOR2 within the paths.
6. Concatenate the translated paths with SEPARATOR2.
@ -100,7 +101,11 @@ do
p="${p//\\//}"
p="${p//\/\///}"
if test -d "$p"
if test "${p:0:11}" = "%emacs_dir%"
then
# Paths starting with "%emacs_dir%" will not be translated
w32p=$p
elif test -d "$p"
then
# The path exists, so just translate it
w32p=`cd "$p" && pwd -W`
@ -162,4 +167,4 @@ do
done
# Write the translated pathlist to the standard output
printf "${w32pathlist}"
printf "%s" "${w32pathlist}"