Skip to content

Commit

Permalink
Fix on Windows the open-process procedure which was not escaping the …
Browse files Browse the repository at this point in the history
…command line arguments properly. This was causing shell-command to fail also, bug gambit#152.
  • Loading branch information
feeley committed Jan 26, 2012
1 parent 8ccd2bd commit 747c3e3
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 88 deletions.
104 changes: 78 additions & 26 deletions bin/gambc-cc.bat.windows.in
Expand Up @@ -28,7 +28,9 @@ set GAMBCGSILIB=@GAMBCGSILIB_BAT@
set LIB_PREFIX=@LIB_PREFIX_BAT@
set LIB_EXTENSION=@LIB_EXTENSION_BAT@

if not "%1" == "obj" goto not_obj
if "%1" == "obj" goto obj
if not "%1" == ""obj"" goto not_obj
:obj

if not "%GAMBC_CC_VERBOSE%" == "yes" goto not_obj_verbose
echo.@BUILD_OBJ_ECHO_BAT@
Expand All @@ -39,7 +41,9 @@ echo.@BUILD_OBJ_ECHO_BAT@
goto end
:not_obj

if not "%1" == "dyn" goto not_dyn
if "%1" == "dyn" goto dyn
if not "%1" == ""dyn"" goto not_dyn
:dyn

if not "%GAMBC_CC_VERBOSE%" == "yes" goto not_dyn_verbose
echo.@BUILD_DYN_ECHO_BAT@
Expand All @@ -50,7 +54,9 @@ echo.@BUILD_DYN_ECHO_BAT@
goto end
:not_dyn

if not "%1" == "lib" goto not_lib
if "%1" == "lib" goto lib
if not "%1" == ""lib"" goto not_lib
:lib

if not "%GAMBC_CC_VERBOSE%" == "yes" goto not_lib_verbose
echo.@BUILD_LIB_ECHO_BAT@
Expand All @@ -61,7 +67,9 @@ echo.@BUILD_LIB_ECHO_BAT@
goto end
:not_lib

if not "%1" == "exe" goto not_exe
if "%1" == "exe" goto exe
if not "%1" == ""exe"" goto not_exe
:exe

if not "%GAMBC_CC_VERBOSE%" == "yes" goto not_exe_verbose
echo.@BUILD_EXE_ECHO_BAT@
Expand All @@ -72,112 +80,156 @@ echo.@BUILD_EXE_ECHO_BAT@
goto end
:not_exe

if not "%1" == "C_COMPILER" goto not_C_COMPILER
if "%1" == "C_COMPILER" goto C_COMPILER
if not "%1" == ""C_COMPILER"" goto not_C_COMPILER
:C_COMPILER
echo.%C_COMPILER%
goto end
:not_C_COMPILER

if not "%1" == "C_PREPROC" goto not_C_PREPROC
if "%1" == "C_PREPROC" goto C_PREPROC
if not "%1" == ""C_PREPROC"" goto not_C_PREPROC
:C_PREPROC
echo.%C_PREPROC%
goto end
:not_C_PREPROC

if not "%1" == "FLAGS_OBJ" goto not_FLAGS_OBJ
if "%1" == "FLAGS_OBJ" goto FLAGS_OBJ
if not "%1" == ""FLAGS_OBJ"" goto not_FLAGS_OBJ
:FLAGS_OBJ
echo.%FLAGS_OBJ%
goto end
:not_FLAGS_OBJ

if not "%1" == "FLAGS_DYN" goto not_FLAGS_DYN
if "%1" == "FLAGS_DYN" goto FLAGS_DYN
if not "%1" == ""FLAGS_DYN"" goto not_FLAGS_DYN
:FLAGS_DYN
echo.%FLAGS_DYN%
goto end
:not_FLAGS_DYN

if not "%1" == "FLAGS_LIB" goto not_FLAGS_LIB
if "%1" == "FLAGS_LIB" goto FLAGS_LIB
if not "%1" == ""FLAGS_LIB"" goto not_FLAGS_LIB
:FLAGS_LIB
echo.%FLAGS_LIB%
goto end
:not_FLAGS_LIB

if not "%1" == "FLAGS_EXE" goto not_FLAGS_EXE
if "%1" == "FLAGS_EXE" goto FLAGS_EXE
if not "%1" == ""FLAGS_EXE"" goto not_FLAGS_EXE
:FLAGS_EXE
echo.%FLAGS_EXE%
goto end
:not_FLAGS_EXE

if not "%1" == "DEFS_OBJ" goto not_DEFS_OBJ
if "%1" == "DEFS_OBJ" goto DEFS_OBJ
if not "%1" == ""DEFS_OBJ"" goto not_DEFS_OBJ
:DEFS_OBJ
echo.%DEFS_OBJ%
goto end
:not_DEFS_OBJ

if not "%1" == "DEFS_DYN" goto not_DEFS_DYN
if "%1" == "DEFS_DYN" goto DEFS_DYN
if not "%1" == ""DEFS_DYN"" goto not_DEFS_DYN
:DEFS_DYN
echo.%DEFS_DYN%
goto end
:not_DEFS_DYN

if not "%1" == "DEFS_LIB" goto not_DEFS_LIB
if "%1" == "DEFS_LIB" goto DEFS_LIB
if not "%1" == ""DEFS_LIB"" goto not_DEFS_LIB
:DEFS_LIB
echo.%DEFS_LIB%
goto end
:not_DEFS_LIB

if not "%1" == "DEFS_EXE" goto not_DEFS_EXE
if "%1" == "DEFS_EXE" goto DEFS_EXE
if not "%1" == ""DEFS_EXE"" goto not_DEFS_EXE
:DEFS_EXE
echo.%DEFS_EXE%
goto end
:not_DEFS_EXE

if not "%1" == "BUILD_OBJ" goto not_BUILD_OBJ
if "%1" == "BUILD_OBJ" goto BUILD_OBJ
if not "%1" == ""BUILD_OBJ"" goto not_BUILD_OBJ
:BUILD_OBJ
echo.%BUILD_OBJ%
goto end
:not_BUILD_OBJ

if not "%1" == "BUILD_DYN" goto not_BUILD_DYN
if "%1" == "BUILD_DYN" goto BUILD_DYN
if not "%1" == ""BUILD_DYN"" goto not_BUILD_DYN
:BUILD_DYN
echo.%BUILD_DYN%
goto end
:not_BUILD_DYN

if not "%1" == "BUILD_LIB" goto not_BUILD_LIB
if "%1" == "BUILD_LIB" goto BUILD_LIB
if not "%1" == ""BUILD_LIB"" goto not_BUILD_LIB
:BUILD_LIB
echo.%BUILD_LIB%
goto end
:not_BUILD_LIB

if not "%1" == "BUILD_EXE" goto not_BUILD_EXE
if "%1" == "BUILD_EXE" goto BUILD_EXE
if not "%1" == ""BUILD_EXE"" goto not_BUILD_EXE
:BUILD_EXE
echo.%BUILD_EXE%
goto end
:not_BUILD_EXE

if not "%1" == "DEFS" goto not_DEFS
if "%1" == "DEFS" goto DEFS
if not "%1" == ""DEFS"" goto not_DEFS
:DEFS
echo.%DEFS%
goto end
:not_DEFS

if not "%1" == "LIBS" goto not_LIBS
if "%1" == "LIBS" goto LIBS
if not "%1" == ""LIBS"" goto not_LIBS
:LIBS
echo.%LIBS%
goto end
:not_LIBS

if not "%1" == "GAMBCLIB_DEFS" goto not_GAMBCLIB_DEFS
if "%1" == "GAMBCLIB_DEFS" goto GAMBCLIB_DEFS
if not "%1" == ""GAMBCLIB_DEFS"" goto not_GAMBCLIB_DEFS
:GAMBCLIB_DEFS
echo.%GAMBCLIB_DEFS%
goto end
:not_GAMBCLIB_DEFS

if not "%1" == "GAMBCLIB" goto not_GAMBCLIB
if "%1" == "GAMBCLIB" goto GAMBCLIB
if not "%1" == ""GAMBCLIB"" goto not_GAMBCLIB
:GAMBCLIB
echo.%GAMBCLIB%
goto end
:not_GAMBCLIB

if not "%1" == "GAMBCGSCLIB" goto not_GAMBCGSCLIB
if "%1" == "GAMBCGSCLIB" goto GAMBCGSCLIB
if not "%1" == ""GAMBCGSCLIB"" goto not_GAMBCGSCLIB
:GAMBCGSCLIB
echo.%GAMBCGSCLIB%
goto end
:not_GAMBCGSCLIB

if not "%1" == "GAMBCGSILIB" goto not_GAMBCGSILIB
if "%1" == "GAMBCGSILIB" goto GAMBCGSILIB
if not "%1" == ""GAMBCGSILIB"" goto not_GAMBCGSILIB
:GAMBCGSILIB
echo.%GAMBCGSILIB%
goto end
:not_GAMBCGSILIB

if not "%1" == "LIB_PREFIX" goto not_LIB_PREFIX
if "%1" == "LIB_PREFIX" goto LIB_PREFIX
if not "%1" == ""LIB_PREFIX"" goto not_LIB_PREFIX
:LIB_PREFIX
echo.%LIB_PREFIX%
goto end
:not_LIB_PREFIX

if not "%1" == "LIB_EXTENSION" goto not_LIB_EXTENSION
if "%1" == "LIB_EXTENSION" goto LIB_EXTENSION
if not "%1" == ""LIB_EXTENSION"" goto not_LIB_EXTENSION
:LIB_EXTENSION
echo.%LIB_EXTENSION%
goto end
:not_LIB_EXTENSION
Expand Down
4 changes: 2 additions & 2 deletions include/stamp.h
Expand Up @@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/

#define ___STAMP_YMD 20120122
#define ___STAMP_HMS 20826
#define ___STAMP_YMD 20120126
#define ___STAMP_HMS 153712

0 comments on commit 747c3e3

Please sign in to comment.