From: Dani Moncayo Date: Wed, 19 Nov 2014 20:15:32 +0000 (+0100) Subject: build-aux/msys-to-w32: Simplify implementation and docstring. X-Git-Tag: emacs-25.0.90~2635^2~407 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5d77aafa9d59c4afb13d744e67a0e4daf3be31a;p=emacs.git build-aux/msys-to-w32: Simplify implementation and docstring. * build-aux/msys-to-w32: Simplify implementation and docstring; Paths starting with '%emacs_dir%' are just considered relative. --- diff --git a/ChangeLog b/ChangeLog index ed978752162..749c020b698 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-19 Dani Moncayo + + * build-aux/msys-to-w32: Simplify implementation and docstring; + Paths starting with '%emacs_dir%' are just considered relative. + 2014-11-16 Christoph Scholtes * .gitignore: Ignore generated file lib/stdalign.h. diff --git a/build-aux/msys-to-w32 b/build-aux/msys-to-w32 index f8c37222889..f0fd61d823f 100755 --- a/build-aux/msys-to-w32 +++ b/build-aux/msys-to-w32 @@ -32,14 +32,7 @@ written to the standard output after performing these transformations: 1. Discard empty paths. 2. Replace: '\' with '/', '//' with '/' and ':' with ';'. -3. Translate each path to Windows-native format. - -Relative paths or paths starting with '%emacs_dir%' will be passed -verbatim to the standard output. - -Each non existing absolute path will be translated by looking for its -deepest existing directory, which will be translated and the remainder -appended. +3. Translate absolute paths to Windows-native format. Options: --help display this help and exit @@ -78,10 +71,7 @@ for p do [ -z "$p" ] && continue - if [ "${p:0:11}" = "%emacs_dir%" ] - then - w32p=$p - elif [ "${p:0:1}" != "/" ] + if [ "${p:0:1}" != "/" ] then w32p=$p elif [ -d "$p" ]