Skip to content
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.

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

Fix for issue #12551 #13006

Merged
merged 2 commits into from
Jul 5, 2021
Merged

Conversation

michelou
Copy link
Contributor

@michelou michelou commented Jul 2, 2021

This fix consists of two groups of batch files:

  1. We add the following 4 batch files to directory dist/bin/; they are based on the corresponding bash scripts and should be kept in sync with them.
dist/bin/common.bat
dist/bin/scala.bat
dist/bin/scalac.bat
dist/bin/scaladoc.bat

NB. The generated distribution archive (e.g. scala3-3.0.2-RC1-bin-SNAPSHOT.zip) will include both the batch files and the bash scripts.

  1. The following batch file is based on the bash script winCmdTests; it is targeted at the Windows prompt while the bash script is targeted at Unix-like shells such as MingW, MSYS2 or WSL.
project/scripts/winCmdTests.bat

NB. This batch file is to be executed by the CI job running on a GitHub managed Windows machine.

@michelou michelou requested a review from liufengyun July 2, 2021 21:00
@griggt griggt linked an issue Jul 2, 2021 that may be closed by this pull request
Copy link
Contributor

@liufengyun liufengyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks awesome 👍

As long as the CI is green, LGTM

) else if "%__ARG%"=="-with-compiler" (
set _WITH_COMPILER=1
) else if "%__ARG%"=="-d" (
set "_JAVA_DEBUG=%_DEBUG_STR%"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, the -d is removed from the shell script, as well as _DEBUG_STR


if not exist "%_SITE_DIR%" mkdir "%_SITE_DIR%"
call "%_PREFIX%\bin\scaladoc.bat" -d "%_SITE_DIR%" -project Hello "%_SOURCE%"
endlocal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michelou michelou self-assigned this Jul 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Scala 3 Binaries on windows 7 64x not working
3 participants