Skip to content
This repository was archived by the owner on May 31, 2022. It is now read-only.

Commit 27e81c4

Browse files
author
Allen Webster
committed
fix a bunch of 'space in the path' problems with batch scripts
1 parent aa30cff commit 27e81c4

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

custom/bin/buildsuper_x64-win.bat

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ REM 5. cleanup after the metadata generator
1414
REM All output files are generated in the current directory when the script is run
1515

1616
set location=%cd%
17-
set me="%~dp0"
17+
set me=%~dp0
1818
cd %me%
1919
cd ..
2020
set custom_root=%cd%
@@ -36,21 +36,20 @@ if "%binname%" == "" set binname="custom_4coder"
3636

3737
set opts=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX
3838
set opts=%opts% /GR- /nologo /FC
39-
set opts=%opts% -I%custom_root%
39+
set opts=%opts% -I"%custom_root%"
4040
set opts=%opts% /D OS_WINDOWS=1 /D OS_LINUX=0 /D OS_MAC=0
4141
set opts=%opts% %mode%
4242

4343
set preproc_file=4coder_command_metadata.i
44-
set meta_opts=/P /Fi%preproc_file% /DMETA_PASS
44+
set meta_opts=/P /Fi"%preproc_file%" /DMETA_PASS
4545

4646
set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%%
4747
set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis
4848

49-
call cl %opts% %meta_opts% %target%
49+
call cl %opts% %meta_opts% "%target%"
5050
call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator
5151
metadata_generator -R "%custom_root%" "%cd%\%preproc_file%"
52-
53-
call cl %opts% %target% /Fe%binname% %build_dll%
52+
call cl %opts% "%target%" /Fe%binname% %build_dll%
5453

5554
REM file spammation preventation
5655
del metadata_generator*

custom/bin/buildsuper_x86-win.bat

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ REM 5. cleanup after the metadata generator
1414
REM All output files are generated in the current directory when the script is run
1515

1616
set location=%cd%
17-
set me="%~dp0"
17+
set me=%~dp0
1818
cd %me%
1919
cd ..
2020
set custom_root=%cd%
@@ -41,16 +41,15 @@ set opts=%opts% /D OS_WINDOWS=1 /D OS_LINUX=0 /D OS_MAC=0
4141
set opts=%opts% %mode%
4242

4343
set preproc_file=4coder_command_metadata.i
44-
set meta_opts=/P /Fi%preproc_file% /DMETA_PASS
44+
set meta_opts=/P /Fi"%preproc_file%" /DMETA_PASS
4545

4646
set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%%
4747
set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis
4848

49-
call cl %opts% %meta_opts% %target%
49+
call cl %opts% %meta_opts% "%target%"
5050
call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator
5151
metadata_generator -R "%custom_root%" "%cd%\%preproc_file%"
52-
53-
call cl %opts% %target% /Fecustom_4coder %build_dll%
52+
call cl %opts% "%target%" /Fecustom_4coder %build_dll%
5453

5554
REM file spammation preventation
5655
del metadata_generator*

custom/bin/setup_cl_x64.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ where /q cl
55
IF %ERRORLEVEL% == 0 (EXIT /b)
66

77
SET SCRIPTS_PATH=%~dp0
8-
%SCRIPTS_PATH%\setup_cl_generic.bat amd64
8+
"%SCRIPTS_PATH%\setup_cl_generic.bat" amd64
99

custom/bin/setup_cl_x86.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

33
SET SCRIPTS_PATH=%~dp0
4-
%SCRIPTS_PATH%\setup_cl_generic.bat amd64_x86
4+
"%SCRIPTS_PATH%\setup_cl_generic.bat" amd64_x86
55

66

custom/custom_4coder.dll

942 KB
Binary file not shown.

custom/custom_4coder.pdb

5.55 MB
Binary file not shown.

custom/vc140.pdb

420 KB
Binary file not shown.

0 commit comments

Comments
 (0)