[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.38 1.39

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/CustomCommand
In directory public:/mounts/ram/cvs-serv2148/Tests/CustomCommand

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Fix escaping of more characters on Windows shells.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CustomCommand/CMakeLists.txt,v
retrieving revision 1.38
retrieving revision 1.39
diff -C 2 -d -r1.38 -r1.39
*** CMakeLists.txt	29 Apr 2008 19:34:37 -0000	1.38
--- CMakeLists.txt	30 Apr 2008 19:58:45 -0000	1.39
***************
*** 208,212 ****
  # Test non-trivial command line arguments in custom commands.
  SET(EXPECTED_ARGUMENTS)
- # TODO: Check shell operators < > << >> | 2>&1 1>&2 &> ! &
  SET(CHECK_ARGS
    c:/posix/path
--- 208,211 ----
***************
*** 215,219 ****
    single'quote
    \"double-quotes\"
-   double\"quote
    "\\;semi-colons\\;"
    "semi\\;colon"
--- 214,217 ----
***************
*** 226,232 ****
    {lcurly}
    rcurly}
!   #<angle> # angle-brackets are inconsistent on windows right now
!   #<langle
!   #rangle>
    [square]
    [lsquare # these have funny behavior due to special cases for
--- 224,230 ----
    {lcurly}
    rcurly}
!   <angle>
!   <langle
!   rangle>
    [square]
    [lsquare # these have funny behavior due to special cases for
***************
*** 234,238 ****
    $dollar-signs$
    dollar$sign
!   &ampersands&
    one&ampersand
    @two-ats@
--- 232,236 ----
    $dollar-signs$
    dollar$sign
!   &ampersands&x # Borland make does not like trailing ampersand
    one&ampersand
    @two-ats@
***************
*** 269,273 ****
    "single'quote with space"
    "\"double-quotes with space\""
-   "double\"quote with space"
    "\\;semi-colons w s\\;"
    "semi\\;colon w s"
--- 267,270 ----
***************
*** 280,286 ****
    "{lcurly w s"
    "rcurly} w s"
!   #"<angle> w s" # angle-brackets are inconsistent on windows right now
!   #"<langle w s"
!   #"rangle> w s"
    "[square] w s"
    "[lsquare w s" # these have funny behavior due to special cases for
--- 277,283 ----
    "{lcurly w s"
    "rcurly} w s"
!   "<angle> w s"
!   "<langle w s"
!   "rangle> w s"
    "[square] w s"
    "[lsquare w s" # these have funny behavior due to special cases for
***************
*** 317,323 ****
    "one#pound w s"
    ~ ` ! @ \# $ % ^ & _ - + = : "\;" \" ' , . ? "(" ")" { } []
- # | < > << >> &> 2>&1 1>&2
- # \\ # Need to test last to avoid ; escape in list.
- #    # Make tools need help when this is the last argument.
    )
  IF(NOT MINGW)
--- 314,317 ----
***************
*** 326,329 ****
--- 320,337 ----
    LIST(APPEND CHECK_ARGS * /)
  ENDIF(NOT MINGW)
+ 
+ # The windows command shell does not support a double quote by itself:
+ #   double\"quote
+ # without messing up quoting of arguments following it.
+ 
+ # Make tools need help with escaping a single backslash
+ #   \
+ # at the end of a command because they think it is a continuation
+ # character.
+ 
+ # We now have special cases for shell operators:
+ #   | < > << >> &> 2>&1 1>&2
+ # to allow custom commands to perform redirection.
+ 
  FOREACH(arg ${CHECK_ARGS})
    SET(ARG "${arg}")