| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A recent commit added 'overwrite=true' to all usages of the
Ant copy task.
This was enough to show up a bug in our dist.src and dist.docs
tasks, as was seen on the Windows build:
Failed to copy:
C:\Users\scala\.m2\repository\org\scala-lang\modules\scala-xml_2.11.0-M5\1.0-RC4\scala-xml_2.11.0-M5-1.0-RC4-javadoc.jar to
H:\jenkins\workspace\scala-nightly-windows\dists\scala-2.11.0-20131019-064627-8848f24161\doc\scala-devel-docs\C:\Users\scala\.m2\repository\org\scala-lang\modules\scala-xml_2.11.0-M5\1.0-RC4\scala-xml_2.11.0-M5-1.0-RC4-javadoc.jar ...
This commit uses a "flattening" copy to put the JARs directly into
scala-devel-docs.
The Ant docs note [1] this gotcha:
> Note that some resources (for example the file resource) return
> absolute paths as names and the result of using them without
> using a nested mapper (or the flatten attribute) may not be what
> you expect.
These appear to be the only places we fell into the trap:
ack '<file\b' --xml
build.xml
1948: <file file="${scala-xml-javadoc}"/>
1949: <file file="${scala-parser-combinators-javadoc}"/>
1992: <file-sets/>
2007: <file file="${scala-xml-sources}"/>
2008: <file file="${scala-parser-combinators-sources}"/>
[1] http://ant.apache.org/manual/Tasks/copy.html
|
| |\
| |
| | |
reflection sync
|
| | |
| |
| |
| |
| |
| |
| | |
- Include pack/lib/*.jar in the uptodatecheck
- (Hopefully that saves the next guy a few hours)
- Switch the the XML formatter (I couldn't find output from the other one)
and mention the output directory.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The staleness problem in our build had its roots in
the flawed uptodate check fixed in the previous commit,
but I spent a lot of time looking at these first. Maybe
one was also complicit.
We've got better things to worry about, so lets make
the all overwrite.
|
| | |
| |
| |
| |
| | |
A new file in ./build/pack/lib/scala-compiler.jar should trigger this task,
otherwise ./build/osgi/org.scala-lang.scala-compiler.jar becomes stale.
|
| |/
|
|
|
|
|
|
| |
- skip docs.lib, which doesn't route through the staged-docs
macro
- skip copying docs to the staged maven distribution
- skip maven local deploy of doc jar under this mode
- skip devel docs tarring
|
| |\
| |
| |
| |
| | |
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Typers.scala
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It can be situationally useful to run:
ant -Dskip.docs=1 dist-maven
When troubleshooting problems that require creation of
a distribution, such as pr-integrate-partest.
Scaladoc isn't incremental, so you burn
a few minutes for a single file change to the compiler or
library.
|
| |/ |
|
| |\
| |
| | |
Require Ant >= 1.8.2
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reportedly our build fails with Ant earlier incarnations.
Time to raise the bar.
Tested by temporarily setting the requirement to 1.8.5 and observing:
% ant init
Buildfile: /Users/jason/code/scala/build.xml
desired.jars.uptodate:
boot:
init:
BUILD FAILED
/Users/jason/code/scala/build.xml:216: Ant version 1.8.5 is required. You are running Apache Ant(TM) version 1.8.4 compiled on May 22 2012
|
| |/
|
|
|
|
|
| |
In order to be able to use published Scala jars as OSGi bundles in the
Eclipse build, Eclipse needs to match sources and binaries. That is
done by making source jars *source bundles*. This PR adds the required
manifest entries. Nothing else should be affected (file names remain
the same).
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
The 2.10 fix to remove the ScriptEngine service entry
was inadvertently forwarded to 2.11.
This commit reverts and adds a test.
This situation was entirely foreseen by retronym,
proving beyond doubt that he is in fact a time traveler,
as hinted by his name. He brings bugs forward into the
future and returns into the past with fixes and other
alien technology like scalaz.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... rather than just in `test.suite.init`.
Now:
% ant pack.done | egrep -i 'compiling|jar'
desired.jars.uptodate:
[quick.partest-extras] Compiling 1 file to /Users/jason/code/scala/build/quick/classes/partest-extras
[jar] Building jar: /Users/jason/code/scala/build/pack/lib/scala-partest-extras.jar
Note: Because of the recent changes to the way that the classpath
or partest is build up (it is done via `ant test.suite.init`), partest
no longer works with quick/classes, the classpath is always taken as
`pack`. So `ant quick.bin && ./test/partest` is insufficient; you need
to run `ant pack.done`, or just `ant` if you prefer brevity.
|
| |\
| |
| | |
Modularize: xml & parser-combinators
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This brings the external modules (xml, parsers)
back to the classpaths of build/(quick|pack)/bin/scala*.
Include the OSGIfied jars for external modules in dist.
(TODO: OSGI-fy externally)
Download javadoc/sources from maven and include in dist.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
To eliminate any delay between deploying partest to sonatype
and using it for development, we resolve it through sonatype.
Not acceptable for jars that ship as part of the release,
such as scaladoc (we'd see a jar others might not see).
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These modules move to their own repositories:
- https://github.com/scala/scala-xml (v1.0-RC3)
- https://github.com/scala/scala-parser-combinators (v1.0-RC1)
The modularization depends on the new partest, as the old one's
classpath handling did not support a modularized scala.
The compiler pom now depends on the artifacts published separately,
with versions specified in versions.properties.
NOTES:
- The osgi tests resolve the xml and parsers jars and osgi-fy them,
as they are no longer built locally.
TODO: Can we move the osgification to the module builds?
- Disabled local repositories: don't want to accidentally include
unpublished artifacts in releases etc.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bincompat-backward.whitelist.conf
bincompat-forward.whitelist.conf
src/reflect/scala/reflect/internal/SymbolTable.scala
src/reflect/scala/reflect/internal/util/WeakHashSet.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The service entry was inadvertendly added in
`e3b5e0ba40447970d621cfeed5cc1770df69884f`,
"Sanity for build.xml: exscriptus&positus delendus est,"
which is ant latin for: "Reduced copy/pasting to the best
of my antabilities."
With that degree of hubris, it was inevitable that the
commit introduced a copy/paste bug. What is the Attic
Greek for copy/paste?
I'm pretty sure that in fifth century Athens they would
just pound one inscription to rubble using a bigger
inscription. They had slaves for that kind of work.
You never hear about Socrates tweaking the build script.
That's the reason he never wrote anything down.
|
| | | |
| | |
| | |
| | | |
And all.clean will also junit.clean.
|
| |\ \ \
| | | |
| | | | |
update typesafe.artifactory-online.com to private-repo.typesafe.com
|
| | | | | |
|
| | |_|/
|/| |
| | |
| | | |
For other dummies like me hammering out "My First Scalac JUnit Test."
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
RC3 had a binary incompatibility that led to a crash in parsing options,
due to:
- https://github.com/scala/scala-partest/commit/9ff138ab4b
- https://github.com/scala/scala/commit/2b1563fa74
Also added sonatype as a repo for resolving partest,
so we don't have to wait for artifacts to synch to maven central.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As partest is now resolved from maven, `test/partest` uses `ant test.suite.init`
to determine the classpath (serialized to build/pack/partest.properties)
that's necessary to run `scala.tools.partest.nest.ConsoleRunner`.
Thus, partest gets exactly the same classpath, whether run from
the command line through `test/partest` or via `ant test`.
The version of partest we're using is specified by
properties defined in versions.properties (formerly `starr.number`).
Currently, we're using:
```
scala.binary.version=2.11.0-M4
partest.version.number=1.0-RC3
```
NOTES:
- The version of Scala being tested must be backwards binary compatible with
the version of Scala that was used to compile partest.
- Once 2.11 goes final, `scala.binary.version=2.11`, and `starr.version=2.11.0`.
- Need scalacheck on classpath for test/partest scalacheck tests.
- Removed atrophied ant tests (haven't been run/changed for at least two years
I checked 81d659141a as a "random" sample).
- Removed scalacheck. It's resolved as a partest dependency.
- For now, use a locally built scalap
- Kept the trace macro in the main repo (partest-extras)
- New targets for faster pr validation: test-core-opt, test-stab-opt
- Reused partest eclipse/intellij project to partest-extras
(note: the partest dependency is hard-coded)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I added a language.existential import to LazyCombiner.scala which
should not be necessary, but causes a spurious warning otherwise:
scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala:33:
warning: the existential type
scala.collection.parallel.mutable.LazyCombiner[_$1,_$2,_$3] forSome {
type _$1; type _$2; type _$3 <: scala.collection.generic.Growable[_$1] with scala.collection.generic.Sizing },
which cannot be expressed by wildcards, should be enabled by making the implicit value scala.language.existentials visible.
if (other.isInstanceOf[LazyCombiner[_, _, _]]) {
^
I created ticket SI-7750 to track this issue.
|
| |\ \ \
| | | |
| | | | |
Scrubbing up the IntelliJ Config
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Add recently sprouted modules (xml and parser-combinators)
- Replace some of the documentation with a setup script
- Update Ant build to copy Maven sourced JARs to ./build/deps.
These are included in the IntelliJ classpath.
- Define the library for Ant at the project level based on
./lib, rather than asking the user to define global library.
- Disable Type Aware Highlighting by default.
IntelliJ now can build everything within the IDE with CTRL-F9.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Do not show output printed to standard output by default.
When a test fails it will be recorded in a report but when it
passes we don't need any debugging logging to be printed.
|
| |/ /
| |
| |
| |
| |
| |
| | |
In particular, that version contains the
sbt/sbt@1b897a3a9422b698bf2c04103169a5eef1ff5b43 commit which removes
all residence compiler infrastructure and makes incremental compiler
less dependent on compiler internals.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Notes:
- no longer specifying terminal by class name in scripts (using 'unix')
- jline doesn't need a separate jansi dependency;
it includes its own version according to:
http://mvnrepository.com/artifact/jline/jline/2.11
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Summary:
- Remove the last vestiges of xml from Predef and Contexts.
- Change build to compile scala.xml to scala-xml.jar.
- Deploy scala-xml module to maven.
- Update partest accordingly.
Note:
An older compiler cannot use the new standard library to
compile projects that use XML. Thus, skipping locker will
break the build until we use 2.11.0-M4 for STARR.
In the future build process, where we drop locker,
we would have to release a milestone that supports the old
and the new approach to xml. As soon as we'd be using that
new milestone for starr, we could drop support for the old approach.
|
| |\| |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Add `test.junit` ant target that compiles and runs JUnit tests
found in `test/junit` directory.
Add `scala.tools.nsc.SampleTest` that demonstrates working
testing infrastructure.
|
| | | |
|
| |\ \
| | |
| | | |
Merge 2.10.x
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bincompat-forward.whitelist.conf
src/compiler/scala/tools/nsc/matching/Patterns.scala
src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
src/compiler/scala/tools/nsc/typechecker/Infer.scala
src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
test/files/neg/t5663-badwarneq.check
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Our handful of java source files weren't being compiled
with line numbers, sourcefile, and other debugger aids.
I don't really know how to test this so I'll enclose an
excerpt of the bytecode diff of scala.runtime.IntRef to show
that this change results in debug information.
2,3c2,4
> Compiled from "IntRef.java"
4a6
> SourceFile: "IntRef.java"
53a62,67
> LineNumberTable:
> line 18: 0
> LocalVariableTable:
> Start Length Slot Name Signature
> 0 10 0 this Lscala/runtime/IntRef;
> 0 10 1 elem I
62a77,81
> LineNumberTable:
> line 19: 0
> LocalVariableTable:
> Start Length Slot Name Signature
> 0 8 0 this Lscala/runtime/IntRef;
|
| |/ /
| |
| |
| | |
Puts test-interface on the class path.
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* origin/2.10.x:
if starr.use.released fetch Scala ${starr.version} for STARR
assume build.release when maven.version.suffix is set
make quick.done depend on quick.bin again
SI-7321 Memory leak in specialize on multiple compiler runs.
Take the N^2 out of the compiler's TreeSet.
SI-6900 Fix tailrec for dependent method types
Simplify interplay between Uncurry Info- and Tree-Transformers
Refactor existential related code out of types.
Add a cautionary comment to TreeSymSubstitutor.
SI-6715 Shouldn't return "" from TermNames.originalName
Backport #2289's TermNames.unexpandedName as TermNames.originalName
SI-7147 Diagnostic for unexplained assertion in presentation compiler.
SI-6793 Don't use super param accessors if inaccessible.
Correct sorting example for Ordering in scaladoc
Conflicts:
bincompat-backward.whitelist.conf
bincompat-forward.whitelist.conf
build.xml
src/compiler/scala/tools/nsc/transform/UnCurry.scala
src/reflect/scala/reflect/internal/StdNames.scala
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
I recommend creating a build.properties file as follows:
```
locker.skip=1
starr.use.released=1
```
This will download the Scala version specified in starr.number,
use it to build quick, skipping locker.
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Paulptest includes color and simplified test scarfing.
Scalap tests are moved to the conventional name and location.
Testicolor missed out on Josh Suereth's tweak to sort the files in
a compilation round. Restore sortiness to test sources.
Testicolor is due to one of Paul's branches on a timeline
that apparently did not include the destruction of planet
Earth and its colonies by the Xindi.
Thanks also to Szabolcs Berecz for his merge effort. Merging
is thankless work, but not as thankless as merging in a
timeline that actually does terminate in the destruction of
your home world and Enterprise.
Archer had a supremely difficult choice: rescue humanity or
live out his retirement with T'Pol waiting on him hand and
foot? I'm sure I don't know how I'd choose.
|
| |\| |
|
| | | |
|
| |\|
| |
| |
| |
| | |
Conflicts:
build.xml
|
| | | |
|
