|
 |
99b86a7 |
To: vim-dev@vim.org
|
|
|
99b86a7 |
Subject: Patch 7.1.176
|
|
|
99b86a7 |
Fcc: outbox
|
|
|
99b86a7 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
99b86a7 |
Mime-Version: 1.0
|
|
|
99b86a7 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
99b86a7 |
Content-Transfer-Encoding: 8bit
|
|
|
99b86a7 |
------------
|
|
|
99b86a7 |
|
|
|
99b86a7 |
Patch 7.1.176
|
|
|
99b86a7 |
Problem: Building with Aap fails when the "compiledby" argument contains
|
|
|
99b86a7 |
'<' or '>' characters. (Alex Yeh)
|
|
|
99b86a7 |
Solution: Change how quoting is done in the Aap recipe.
|
|
|
99b86a7 |
Files: src/main.aap
|
|
|
99b86a7 |
|
|
|
99b86a7 |
|
|
|
99b86a7 |
*** ../vim-7.1.175/src/main.aap Tue Sep 25 22:13:14 2007
|
|
|
99b86a7 |
--- src/main.aap Fri Dec 7 17:03:31 2007
|
|
|
99b86a7 |
***************
|
|
|
99b86a7 |
*** 63,70 ****
|
|
|
99b86a7 |
@else:
|
|
|
99b86a7 |
@ arch = "ppc"
|
|
|
99b86a7 |
:print Building for $arch system
|
|
|
99b86a7 |
:sys CONFIG_STATUS=auto/config.status
|
|
|
99b86a7 |
! ./configure.aap `file2string("config.arg")`
|
|
|
99b86a7 |
--with-mac-arch=$arch
|
|
|
99b86a7 |
--cache-file=auto/config.cache
|
|
|
99b86a7 |
|
|
|
99b86a7 |
--- 63,71 ----
|
|
|
99b86a7 |
@else:
|
|
|
99b86a7 |
@ arch = "ppc"
|
|
|
99b86a7 |
:print Building for $arch system
|
|
|
99b86a7 |
+ config_args = `file2string("config.arg")`
|
|
|
99b86a7 |
:sys CONFIG_STATUS=auto/config.status
|
|
|
99b86a7 |
! ./configure.aap $config_args
|
|
|
99b86a7 |
--with-mac-arch=$arch
|
|
|
99b86a7 |
--cache-file=auto/config.cache
|
|
|
99b86a7 |
|
|
|
99b86a7 |
***************
|
|
|
99b86a7 |
*** 440,450 ****
|
|
|
99b86a7 |
:print >> $target char_u *all_lflags = (char_u *)"$linkcmd";
|
|
|
99b86a7 |
@if _no.get("COMPILEDBY"):
|
|
|
99b86a7 |
who = $COMPILEDBY
|
|
|
99b86a7 |
! where = ''
|
|
|
99b86a7 |
@else:
|
|
|
99b86a7 |
:syseval whoami | :eval re.sub("\n", "", stdin) | :assign who
|
|
|
99b86a7 |
|
|
|
99b86a7 |
:syseval hostname | :eval re.sub("\n", "", stdin) | :assign where
|
|
|
99b86a7 |
:print >> $target char_u *compiled_user = (char_u *)"$who";
|
|
|
99b86a7 |
:print >> $target char_u *compiled_sys = (char_u *)"$where";
|
|
|
99b86a7 |
|
|
|
99b86a7 |
--- 441,453 ----
|
|
|
99b86a7 |
:print >> $target char_u *all_lflags = (char_u *)"$linkcmd";
|
|
|
99b86a7 |
@if _no.get("COMPILEDBY"):
|
|
|
99b86a7 |
who = $COMPILEDBY
|
|
|
99b86a7 |
! where =
|
|
|
99b86a7 |
@else:
|
|
|
99b86a7 |
:syseval whoami | :eval re.sub("\n", "", stdin) | :assign who
|
|
|
99b86a7 |
|
|
|
99b86a7 |
:syseval hostname | :eval re.sub("\n", "", stdin) | :assign where
|
|
|
99b86a7 |
+ @who = string.replace(who, '"', '\\"')
|
|
|
99b86a7 |
+ @where = string.replace(where, '"', '\\"')
|
|
|
99b86a7 |
:print >> $target char_u *compiled_user = (char_u *)"$who";
|
|
|
99b86a7 |
:print >> $target char_u *compiled_sys = (char_u *)"$where";
|
|
|
99b86a7 |
|
|
|
99b86a7 |
*** ../vim-7.1.175/src/version.c Sun Dec 9 20:25:59 2007
|
|
|
99b86a7 |
--- src/version.c Mon Dec 31 16:40:01 2007
|
|
|
99b86a7 |
***************
|
|
|
99b86a7 |
*** 668,669 ****
|
|
|
99b86a7 |
--- 668,671 ----
|
|
|
99b86a7 |
{ /* Add new patch number below this line */
|
|
|
99b86a7 |
+ /**/
|
|
|
99b86a7 |
+ 176,
|
|
|
99b86a7 |
/**/
|
|
|
99b86a7 |
|
|
|
99b86a7 |
--
|
|
|
99b86a7 |
E M A C S
|
|
|
99b86a7 |
s e l o h
|
|
|
99b86a7 |
c t t n i
|
|
|
99b86a7 |
a a t f
|
|
|
99b86a7 |
p r t
|
|
|
99b86a7 |
e o
|
|
|
99b86a7 |
l
|
|
|
99b86a7 |
|
|
|
99b86a7 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
99b86a7 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
99b86a7 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
99b86a7 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|