Skip to content

Remove refs to scala-xml in shell scripts #6653

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

Merged
merged 1 commit into from
Jun 11, 2019
Merged

Remove refs to scala-xml in shell scripts #6653

merged 1 commit into from
Jun 11, 2019

Conversation

michelou
Copy link
Contributor

@michelou michelou commented Jun 10, 2019

This PR is a follow-up of #5597.

Additional question about the modified file dist\bin\dotc:
Why does the variable $DOTTY_LIB appear twice in toolchain construction (I would remove the 1st occurence) ?!

  toolchain=""
  toolchain+="$SCALA_LIB$PSEP"
  toolchain+="$DOTTY_LIB$PSEP"
  toolchain+="$SCALA_ASM$PSEP"
  toolchain+="$SBT_INTF$PSEP"
  toolchain+="$DOTTY_INTF$PSEP"
  toolchain+="$DOTTY_LIB$PSEP"
  toolchain+="$DOTTY_COMP$PSEP"

For comparison, I don't have the repetition in the corresponding batch file dist\bin\dotc.bat (PR #5444):

set __TOOLCHAIN=%_SCALA_LIB%%_PSEP%
set __TOOLCHAIN=%__TOOLCHAIN%%_SCALA_ASM%%_PSEP%
set __TOOLCHAIN=%__TOOLCHAIN%%_SBT_INTF%%_PSEP%
set __TOOLCHAIN=%__TOOLCHAIN%%_DOTTY_INTF%%_PSEP%
set __TOOLCHAIN=%__TOOLCHAIN%%_DOTTY_LIB%%_PSEP%
set __TOOLCHAIN=%__TOOLCHAIN%%_DOTTY_COMP%%_PSEP%

Copy link
Member

@dottybot dottybot left a comment

Choose a reason for hiding this comment

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

Hello, and thank you for opening this PR! 🎉

All contributors have signed the CLA, thank you! ❤️

Have an awesome day! ☀️

@liufengyun
Copy link
Contributor

liufengyun commented Jun 10, 2019

@michelou Thanks for the catch. I think it's a typo, we should remove the duplicate path.

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.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants