Skip to content

Commit 31f8eac

Browse files
authored
Fix issue with windows + braces in path (#24717)
Fixes: #24713
1 parent 1fe2dfa commit 31f8eac

27 files changed

+30
-27
lines changed

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,10 @@ jobs:
10561056
# windows and mac do not have separate build and test jobs, as they only run
10571057
# a limited set of tests; it is simpler and faster to do it all in one job.
10581058
test-windows:
1059-
working_directory: "~/path with spaces"
1059+
# Use spaces and other special chars in the path to emsdk to flush out
1060+
# issues with windows. In particular, the .bat file launches can have
1061+
# trouble with these.
1062+
working_directory: "~/path with spaces ()/"
10601063
executor:
10611064
name: win/server-2019
10621065
shell: bash.exe -eo pipefail

bootstrap.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

em++.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

em-config.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

emar.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

embuilder.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

emcc.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

emcmake.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

emconfigure.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (%~n0.bat) do (

emdwp.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
:: %~dp0 expansions will not work.
2424
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
2525
@if exist "%~f0" (
26-
set MYDIR=%~dp0
26+
set "MYDIR=%~dp0"
2727
goto FOUND_MYDIR
2828
)
2929
@for %%I in (tools\emdwp.bat) do (

0 commit comments

Comments
 (0)