| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
- Create the directory for the output file when building an OSGi
bundle. Otherwise a publishing command would fail if dist/mkPack had
not been run before.
- Depend only on “packagedArtifact” in “mkPack”, not on “packageBin”.
The latter is sbt’s standard packaging task but some of the required
dependencies need to be packaged as OSGi bundles.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This replicates the results of `ant -Dlocker.skip=1 distpack` with the
following differences:
- The POM files produced by the ant build under dists/maven still
contain unresolved variables like `@VERSION@`. The ant build resolves
them in the actual publishing process. The sbt build generates the
correct version numbers directly.
- Scaladoc sets in the ant build are created with the scaladoc tool from
“quick”. The sbt build uses the STARR scaladoc.
- The scaladoc sets for scala-actors, scala-compiler, scala-reflect and
scalap from the ant build contain documentation for the classes
`Null`, `Nothing`, `Any` and `AnyRef`. The sbt build omits those
classes from all doc sets (except for scala-library, of course) under
the assumption that this is a bug in the ant build.
Other idiosyncracies of the ant build like declaring a packaging type of
`jar` (instead of `bundle`) for OSGi bundles, or using slightly
different module names and descriptions in scaladocs, OSGi bundles and
POMs, are reproduced faithfully for now.
Publishing from the sbt build is done in the usual sbt way. No actual
publishing targets are currently defined in the build. In order to test
stability of the publishing process, the `publishDists` task can be used
to publish to dists/maven-sbt with the same directory layout and naming
conventions employed by the ant build for publishing to dists/maven.
Source and binary JARs are OSGi-enabled. For the source JARs this is
done by hand-crafting the appropriate MANIFEST.MF entries (like the ant
build does). Binary JARs are packaged with BND, using the same outdated
BND version as the ant build for now to get identical results. We do not
use sbt-osgi because it depends on a newer version of BND (probably OK
to upgrade in the future) and does not allow a crucial bit of
configuration that we need: Setting the classpath for BND. In sbt-osgi
this is always `fullClasspath in Compile` whereas we really want
`products in Compile in packageBin` to keep things simple.
|
|
|
|
|
|
|
| |
It is not enough to check the return value of `process()` to determine
whether a class file should be kept or deleted. The classes that should
not be kept are only known after processing everything and files that
have already been written to disk may need to be deleted.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Move version-related code into a separate VersionUtil object
- Fix the canonical version. The sbt build previously took the full
version including the suffix (plus timestamp and hash) whereas the ant
build uses the version without the suffix
- Include the version number in the generated scaladocs
- Add project descriptions and include them in the scaladocs (like the
ant build does)
- Add other missing scaladoc options to the sbt build
- Copy resources in all subprojects when building dist/mkQuick and
fix `includeFilter` settings to include all required files
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reusing parts of #4593, this commits adds two additional subprojects to
the sbt build:
- repl-jline, which is already used by the ant build, builds the part of
the REPL that depends on JLine. The actual JLine depenency is moved to
this project.
- repl-jline-shaded uses JarJar to create a shaded version of repl-jline
and jline.jar.
Unlike the ant build, this setup does not use any circular dependencies.
dist/mkBin puts all of quick/repl, quick/repl-jline and
quick/repl-jline-shaded onto the classpath of build-sbt/quick/bin/scala.
A future addition to the sbt build for building build-sbt/pack will have
to put the generated classfiles into the correct JARs, mirroring the old
structure.
|
|
|
|
| |
because why not, the sbt build is experimental anyway
|
|
|
|
|
|
|
|
|
|
| |
Shell scripts are generated with `mkBin` sbt task that calls ScalaTool.
ScalaTool is defined in project/ and is a port of Ant task that lives
in scala.tools.ant.ScalaTool. While porting, we've simplified the code
significantly.
The `mkBin` task is defined in a new subproject: dist. This subproject
will become responsible for building the distribution in the future.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It mimics the ant build as closely as necessary to compare the produced
artifacts between the two builds, to build confidence in the transition:
- all projects are built into the same directories in build/quick
- include legacy projects: forkjoin, asm, actors
- TODO: Include forkjoin & asm into library & compiler jars, respectively.
We don't carry over ant's built-in bootstrapping process;
this will be scripted outside of the build, publishing layers locally.
NOTE: the root project cannot be named `scala`:
it shadows the `scala` package in e.g., `projectConsole`.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Difficult though it may be to accept, it must go. We couldn't keep it
working with active maintenance; after eight months of neglect there is
no chance. Nobody is working on it or using it. The code will remain in
the history if anyone wants it.
One of the most annoying experiences one can have when building a new
project is finding out one has been fiddling with an abandoned build
system which isn't even expected to work. Sometimes I check out a scala
project and there is a build.xml, a pom.xml, and a project directory.
We should not be among those who sow such build confusion.
|
|
|
|
|
|
| |
Fixes mostly "a int", "a a thing" kind of typos.
Also removes trailing whitespaces, useless empty lines and commented
println() from "test/files/run/ctries-new/iterator.scala".
|
|\
| |
| | |
SI-6964 Remove build managers, both simple and refined.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Deprecated in 2.10.0, out to pasture in 2.11.0.
Users are advised to migrate to:
https://github.com/typesafehub/zinc
http://www.scala-sbt.org/
|
|/
|
|
|
| |
We need to eliminate these sort of shifting sands to make
the SBT build a viable option.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit 'refs/pull/1718/head':
Expunged the .net backend.
Conflicts:
build.detach.xml
build.examples.xml
build.xml
project/Build.scala
src/compiler/scala/tools/ant/Scalac.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
src/compiler/scala/tools/nsc/transform/Mixin.scala
src/intellij/compiler.iml.SAMPLE
tools/buildcp
|
| |
| |
| |
| |
| |
| |
| |
| | |
It lives on in a branch born from this commit's parent.
It's abrupt; no attempt is made to offer a "smooth transition"
for the serious msil userbase, population zero. If anyone feels
very strongly that such a transition is necessary, I will be
happy to talk you into feeling differently.
|
|/
|
|
|
| |
Get rid of GenJVM and everything that refers to it.
Also get rid of GenAndroid since it's dead code that refers to GenJVM.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* commit 'refs/pull/1574/head': (24 commits)
Fixing issue where OSGi bundles weren't getting used for distribution.
Fixes example in Type.asSeenFrom
Fix for SI-6600, regression with ScalaNumber.
SI-6562 Fix crash with class nested in @inline method
Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013
Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013
SI-6606 Drops new icons in, replaces abstract types placeholder icons
SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings
Labeling scala.reflect and scala.reflect.macros experimental in the API docs
Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov
Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later
SI-6399 Adds API docs for Any and AnyVal
Removing actors-migration from main repository so it can live on elsewhere.
Fix for SI-6597, implicit case class crasher.
SI-6578 Harden against synthetics being added more than once.
SI-6556 no assert for surprising ctor result type
Removing actors-migration from main repository so it can live on elsewhere.
Fixes SI-6500 by making erasure more regular.
Modification to SI-6534 patch.
Fixes SI-6559 - StringContext not using passed in escape function.
...
Conflicts:
src/actors-migration/scala/actors/migration/StashingActor.scala
src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
src/compiler/scala/tools/nsc/settings/AestheticSettings.scala
src/compiler/scala/tools/nsc/transform/Erasure.scala
src/library/scala/Application.scala
src/library/scala/collection/immutable/GenIterable.scala.disabled
src/library/scala/collection/immutable/GenMap.scala.disabled
src/library/scala/collection/immutable/GenSeq.scala.disabled
src/library/scala/collection/immutable/GenSet.scala.disabled
src/library/scala/collection/immutable/GenTraversable.scala.disabled
src/library/scala/collection/mutable/GenIterable.scala.disabled
src/library/scala/collection/mutable/GenMap.scala.disabled
src/library/scala/collection/mutable/GenSeq.scala.disabled
src/library/scala/collection/mutable/GenSet.scala.disabled
src/library/scala/collection/mutable/GenTraversable.scala.disabled
src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled
|
| |
| |
| |
| |
| |
| |
| | |
* Removes actors-migration hooks from partest
* Removes actors-migration code
* removes actors-migration tests
* removes actors-migration distribution packaging.
|
| |
| |
| |
| |
| |
| |
| | |
* Removes actors-migration hooks from partest
* Removes actors-migration code
* removes actors-migration tests
* removes actors-migration distribution packaging.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# By Eugene Burmako (10) and others
# Via Josh Suereth (10) and Paul Phillips (9)
* origin/2.10.x: (32 commits)
Removing duplication from Duration.
Fixed positions in de-aliased special symbols and for automatically added `apply` methods.
Fixes SI-6285 - ParIterableLike no longer says sequential foreach.
SI-6274 Fix owners when eta-expanding function with byName param
Fixes typos in the ScalaDoc of StringContext
Allow nested calls to `askForResponse` in the presentation compiler.
Made Dynamic extend Any.
Fix for SI-6273, repl string interpolation.
Formatting cleanup in def typed.
Better errors for Any/AnyRef issues.
Fix for SI-6263, futile adaptation.
Suppressed 'possible cause' mis-warning.
Fix for SI-6034, covariant value classes.
Fixes SI-6290 by creating real instnaces of language features.
SBT build now works with SBT 0.12.
Removed previosuly uncommented code, added more diagnosis output to REPL.
Made instrumenter more robust by looking at tokens
Removed dead code.
Two fixes for the worksheet instrumenter
Fix SI-6294.
...
|
| |
| |
| |
| | |
Also fixed partest explosion that happened after partest redesign.
|
|/ |
|
|
|
|
| |
contributed by Carlo Dapor -- thanks!
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
hopefully.
|
|
|
|
|
|
|
|
| |
* Moved ASM sources to src/asm
* New ant task builds asm *ONCE*. Build times improve by a few seconds
* Fixed SBT build for new asm location. SBT build still broken from actors-migration and partest
Review by @magarciaEPFL
|
|
|
|
| |
exception.
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| | |
interface.
|
| |
| |
| |
| | |
SBT build should now mimic ant build for versions.
|
| |
| |
| |
| | |
up to par.
|
| | |
|
|/
|
|
| |
Another deprecated soul passes on to ether world.
|
|
|
|
| |
Review by: @jsuereth
|
| |
|
|
|
|
|
| |
* Added 'lock' key to write 'compile.lock' file to target dir.
* Added 'unlock' key to delete 'compile.lock' file to target dir.
|
|
|
|
| |
* SBT's version creation is now on par with tools/get-latest-version
|
|
|
|
|
| |
* SHA1 sum calculations are now done in pure Scala.
* Cache jar SHAs are checked for validity.
|
| |
|
|
|
|
| |
* One SHA resolve, now outputs lots of stack traces if parallel execution failure.
|
|
|
|
|
| |
Retreiving STARR from SHA repo is now parallel by default.
YAY for parallel collections.
|
|
|
|
|
|
|
| |
* The MSIL source code is now built at every layer as part
of the compiler project.
* The MSIL project is completely removed from other
references.
|
|
|
|
| |
directories.
|