projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d2415672 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.176 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.176 | |
| 11 | Problem: Building with Aap fails when the "compiledby" argument contains | |
| 12 | '<' or '>' characters. (Alex Yeh) | |
| 13 | Solution: Change how quoting is done in the Aap recipe. | |
| 14 | Files: src/main.aap | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.175/src/main.aap Tue Sep 25 22:13:14 2007 | |
| 18 | --- src/main.aap Fri Dec 7 17:03:31 2007 | |
| 19 | *************** | |
| 20 | *** 63,70 **** | |
| 21 | @else: | |
| 22 | @ arch = "ppc" | |
| 23 | :print Building for $arch system | |
| 24 | :sys CONFIG_STATUS=auto/config.status | |
| 25 | ! ./configure.aap `file2string("config.arg")` | |
| 26 | --with-mac-arch=$arch | |
| 27 | --cache-file=auto/config.cache | |
| 28 | ||
| 29 | --- 63,71 ---- | |
| 30 | @else: | |
| 31 | @ arch = "ppc" | |
| 32 | :print Building for $arch system | |
| 33 | + config_args = `file2string("config.arg")` | |
| 34 | :sys CONFIG_STATUS=auto/config.status | |
| 35 | ! ./configure.aap $config_args | |
| 36 | --with-mac-arch=$arch | |
| 37 | --cache-file=auto/config.cache | |
| 38 | ||
| 39 | *************** | |
| 40 | *** 440,450 **** | |
| 41 | :print >> $target char_u *all_lflags = (char_u *)"$linkcmd"; | |
| 42 | @if _no.get("COMPILEDBY"): | |
| 43 | who = $COMPILEDBY | |
| 44 | ! where = '' | |
| 45 | @else: | |
| 46 | :syseval whoami | :eval re.sub("\n", "", stdin) | :assign who | |
| 47 | ||
| 48 | :syseval hostname | :eval re.sub("\n", "", stdin) | :assign where | |
| 49 | :print >> $target char_u *compiled_user = (char_u *)"$who"; | |
| 50 | :print >> $target char_u *compiled_sys = (char_u *)"$where"; | |
| 51 | ||
| 52 | --- 441,453 ---- | |
| 53 | :print >> $target char_u *all_lflags = (char_u *)"$linkcmd"; | |
| 54 | @if _no.get("COMPILEDBY"): | |
| 55 | who = $COMPILEDBY | |
| 56 | ! where = | |
| 57 | @else: | |
| 58 | :syseval whoami | :eval re.sub("\n", "", stdin) | :assign who | |
| 59 | ||
| 60 | :syseval hostname | :eval re.sub("\n", "", stdin) | :assign where | |
| 61 | + @who = string.replace(who, '"', '\\"') | |
| 62 | + @where = string.replace(where, '"', '\\"') | |
| 63 | :print >> $target char_u *compiled_user = (char_u *)"$who"; | |
| 64 | :print >> $target char_u *compiled_sys = (char_u *)"$where"; | |
| 65 | ||
| 66 | *** ../vim-7.1.175/src/version.c Sun Dec 9 20:25:59 2007 | |
| 67 | --- src/version.c Mon Dec 31 16:40:01 2007 | |
| 68 | *************** | |
| 69 | *** 668,669 **** | |
| 70 | --- 668,671 ---- | |
| 71 | { /* Add new patch number below this line */ | |
| 72 | + /**/ | |
| 73 | + 176, | |
| 74 | /**/ | |
| 75 | ||
| 76 | -- | |
| 77 | E M A C S | |
| 78 | s e l o h | |
| 79 | c t t n i | |
| 80 | a a t f | |
| 81 | p r t | |
| 82 | e o | |
| 83 | l | |
| 84 | ||
| 85 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 86 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 87 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 88 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |