Skip to content

Multiple fixes for bin/dotc and bin/dotr #1324

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 6 commits into from
Jun 22, 2016

Conversation

felixmulder
Copy link
Contributor

@felixmulder felixmulder commented Jun 20, 2016

Multiple fixes for dotc script

Fix for repacking of dotty-interfaces

New algorithm for package tracing similar to proposal by @DarkDimius:

  1. Bash script checks for existance of $DOTTY_ROOT/.packages, if not
    found - rebuilds all packages and places their full paths in the
    .packages file in the following order:
    • dotty-interfaces
    • dotty
    • dotty-tests
  2. Checks if there are any files newer than those contained within
    .packages and if so - rebuilds that package
  3. Runs Java with correct classpath setup

Fixes #1321

Fixing coursier resolution

Coursier cannot resolve "org.scala-sbt" % "interface" % version" - but it can find "com.typesafe" % "sbt-interface" % version".

Fixes #1323

Address CI tests for dotc and dotr scripts

Implemented JUnit tests that check:

  • dotc script can build hello world and it successfully executes using dotr
  • dotc script can detect changes in dotty sources and rebuild dotty if needed
  • if no changes are done to dotty, dotc script is fast.

Fixes #1322

New algorithm similar to proposal by @DarkDimius:

1. Bash script checks for existance of `$DOTTY_ROOT/.packages`, if not
   found - rebuilds all packages and places their full paths in the
   `.packages` file in the following order:
    - dotty-interfaces
    - dotty
    - dotty-tests
2. Checks if there are any files newer than those contained within
   `.packages` and if so - rebuilds that package
3. Runs Java with correct classpath setup
@felixmulder felixmulder changed the title Rework dotc to choose correct packages fixing #1321 [WIP] Rework dotc to choose correct packages fixing #1321 Jun 20, 2016
@felixmulder felixmulder changed the title [WIP] Rework dotc to choose correct packages fixing #1321 Rework dotc to choose correct packages fixing #1321 Jun 20, 2016
@felixmulder felixmulder changed the title Rework dotc to choose correct packages fixing #1321 Multiple fixes for bin/dotc Jun 21, 2016
@felixmulder felixmulder changed the title Multiple fixes for bin/dotc Multiple fixes for bin/dotc and bin/dotr Jun 21, 2016
@felixmulder felixmulder force-pushed the fix/dotc-version#1321 branch 2 times, most recently from a37881f to 09bb08c Compare June 21, 2016 18:06
@felixmulder felixmulder force-pushed the fix/dotc-version#1321 branch from 09bb08c to 574681e Compare June 21, 2016 18:07
source $DOTTY_ROOT/bin/common

# CLASS_PATH is derived from the DOTTY_ROOT and SCALA_LIBRARY_JAR
CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-2.11/classes/:.:$SCALA_LIBRARY_JAR"
Copy link
Contributor

Choose a reason for hiding this comment

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

SCALA_BINARY_VERSION instead of 2.11.

@DarkDimius
Copy link
Contributor

Merging as it will get runner script working.

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