diff options
| author | Dani Moncayo | 2014-11-19 21:15:32 +0100 |
|---|---|---|
| committer | Dani Moncayo | 2014-11-19 21:15:32 +0100 |
| commit | f5d77aafa9d59c4afb13d744e67a0e4daf3be31a (patch) | |
| tree | 3d97e3a9e8d993d0df51e7867fbc7a809f131572 | |
| parent | f437176169cf1722f99938845c35eb40bf139b2d (diff) | |
| download | emacs-f5d77aafa9d59c4afb13d744e67a0e4daf3be31a.tar.gz emacs-f5d77aafa9d59c4afb13d744e67a0e4daf3be31a.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | build-aux/msys-to-w32 | 14 |
2 files changed, 7 insertions, 12 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-19 Dani Moncayo <dmoncayo@gmail.com> | ||
| 2 | |||
| 3 | * build-aux/msys-to-w32: Simplify implementation and docstring; | ||
| 4 | Paths starting with '%emacs_dir%' are just considered relative. | ||
| 5 | |||
| 1 | 2014-11-16 Christoph Scholtes <cschol2112@gmail.com> | 6 | 2014-11-16 Christoph Scholtes <cschol2112@gmail.com> |
| 2 | 7 | ||
| 3 | * .gitignore: Ignore generated file lib/stdalign.h. | 8 | * .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: | |||
| 32 | 32 | ||
| 33 | 1. Discard empty paths. | 33 | 1. Discard empty paths. |
| 34 | 2. Replace: '\' with '/', '//' with '/' and ':' with ';'. | 34 | 2. Replace: '\' with '/', '//' with '/' and ':' with ';'. |
| 35 | 3. Translate each path to Windows-native format. | 35 | 3. Translate absolute paths to Windows-native format. |
| 36 | |||
| 37 | Relative paths or paths starting with '%emacs_dir%' will be passed | ||
| 38 | verbatim to the standard output. | ||
| 39 | |||
| 40 | Each non existing absolute path will be translated by looking for its | ||
| 41 | deepest existing directory, which will be translated and the remainder | ||
| 42 | appended. | ||
| 43 | 36 | ||
| 44 | Options: | 37 | Options: |
| 45 | --help display this help and exit | 38 | --help display this help and exit |
| @@ -78,10 +71,7 @@ for p | |||
| 78 | do | 71 | do |
| 79 | [ -z "$p" ] && continue | 72 | [ -z "$p" ] && continue |
| 80 | 73 | ||
| 81 | if [ "${p:0:11}" = "%emacs_dir%" ] | 74 | if [ "${p:0:1}" != "/" ] |
| 82 | then | ||
| 83 | w32p=$p | ||
| 84 | elif [ "${p:0:1}" != "/" ] | ||
| 85 | then | 75 | then |
| 86 | w32p=$p | 76 | w32p=$p |
| 87 | elif [ -d "$p" ] | 77 | elif [ -d "$p" ] |