Skip to content

re-apply patch #1024 #1042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Dec 4, 2021
Merged

re-apply patch #1024 #1042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ def _create_batch_scripts_initial(self):
rem get a normalize path
set WINPYDIRBASETMP=%~dp0..
pushd %WINPYDIRBASETMP%
set WINPYDIRBASE=%CD%
set WINPYDIRBASE=%__CD__%
set WINPYDIRBASETMP=
popd

Expand Down Expand Up @@ -1375,8 +1375,8 @@ def _create_batch_scripts_initial(self):
)
)
) else (
rem if it it launched from another directory , we keep it that one echo %CD%
if not "%CD%\"=="%~dp0" set WINPYWORKDIR1="%CD%"
rem if it it launched from another directory , we keep it that one echo %__CD__%
if not "%__CD__%\"=="%~dp0" set WINPYWORKDIR1="%__CD__%"
)

rem remove some potential last \
Expand Down