fix a bunch of 'space in the path' problems with batch scripts

This commit is contained in:
Allen Webster 2021-05-09 14:31:39 -07:00
parent aa30cffdee
commit 27e81c4f73
7 changed files with 11 additions and 13 deletions

View File

@ -14,7 +14,7 @@ REM 5. cleanup after the metadata generator
REM All output files are generated in the current directory when the script is run REM All output files are generated in the current directory when the script is run
set location=%cd% set location=%cd%
set me="%~dp0" set me=%~dp0
cd %me% cd %me%
cd .. cd ..
set custom_root=%cd% set custom_root=%cd%
@ -36,21 +36,20 @@ if "%binname%" == "" set binname="custom_4coder"
set opts=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX set opts=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX
set opts=%opts% /GR- /nologo /FC set opts=%opts% /GR- /nologo /FC
set opts=%opts% -I%custom_root% set opts=%opts% -I"%custom_root%"
set opts=%opts% /D OS_WINDOWS=1 /D OS_LINUX=0 /D OS_MAC=0 set opts=%opts% /D OS_WINDOWS=1 /D OS_LINUX=0 /D OS_MAC=0
set opts=%opts% %mode% set opts=%opts% %mode%
set preproc_file=4coder_command_metadata.i set preproc_file=4coder_command_metadata.i
set meta_opts=/P /Fi%preproc_file% /DMETA_PASS set meta_opts=/P /Fi"%preproc_file%" /DMETA_PASS
set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%% set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%%
set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis
call cl %opts% %meta_opts% %target% call cl %opts% %meta_opts% "%target%"
call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator
metadata_generator -R "%custom_root%" "%cd%\%preproc_file%" metadata_generator -R "%custom_root%" "%cd%\%preproc_file%"
call cl %opts% "%target%" /Fe%binname% %build_dll%
call cl %opts% %target% /Fe%binname% %build_dll%
REM file spammation preventation REM file spammation preventation
del metadata_generator* del metadata_generator*

View File

@ -14,7 +14,7 @@ REM 5. cleanup after the metadata generator
REM All output files are generated in the current directory when the script is run REM All output files are generated in the current directory when the script is run
set location=%cd% set location=%cd%
set me="%~dp0" set me=%~dp0
cd %me% cd %me%
cd .. cd ..
set custom_root=%cd% set custom_root=%cd%
@ -41,16 +41,15 @@ set opts=%opts% /D OS_WINDOWS=1 /D OS_LINUX=0 /D OS_MAC=0
set opts=%opts% %mode% set opts=%opts% %mode%
set preproc_file=4coder_command_metadata.i set preproc_file=4coder_command_metadata.i
set meta_opts=/P /Fi%preproc_file% /DMETA_PASS set meta_opts=/P /Fi"%preproc_file%" /DMETA_PASS
set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%% set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%%
set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis
call cl %opts% %meta_opts% %target% call cl %opts% %meta_opts% "%target%"
call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator
metadata_generator -R "%custom_root%" "%cd%\%preproc_file%" metadata_generator -R "%custom_root%" "%cd%\%preproc_file%"
call cl %opts% "%target%" /Fecustom_4coder %build_dll%
call cl %opts% %target% /Fecustom_4coder %build_dll%
REM file spammation preventation REM file spammation preventation
del metadata_generator* del metadata_generator*

View File

@ -5,5 +5,5 @@ where /q cl
IF %ERRORLEVEL% == 0 (EXIT /b) IF %ERRORLEVEL% == 0 (EXIT /b)
SET SCRIPTS_PATH=%~dp0 SET SCRIPTS_PATH=%~dp0
%SCRIPTS_PATH%\setup_cl_generic.bat amd64 "%SCRIPTS_PATH%\setup_cl_generic.bat" amd64

View File

@ -1,6 +1,6 @@
@echo off @echo off
SET SCRIPTS_PATH=%~dp0 SET SCRIPTS_PATH=%~dp0
%SCRIPTS_PATH%\setup_cl_generic.bat amd64_x86 "%SCRIPTS_PATH%\setup_cl_generic.bat" amd64_x86

BIN
custom/custom_4coder.dll Normal file

Binary file not shown.

BIN
custom/custom_4coder.pdb Normal file

Binary file not shown.

BIN
custom/vc140.pdb Normal file

Binary file not shown.