summaryrefslogtreecommitdiff
path: root/build.xml
Commit message (Collapse)AuthorAgeFilesLines
* Echo the location of JUnit test failure reports in `ant test.junit`.Jason Zaugg2013-08-271-0/+1
| | | | For other dummies like me hammering out "My First Scalac JUnit Test."
* Use scala-partest 1.0-RC4Adriaan Moors2013-08-211-0/+3
| | | | | | | | | | 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.
* Move partest to https://github.com/scala/scala-partestAdriaan Moors2013-08-201-105/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* SI-7624 Fix -feature warnings and build with -featureSimon Ochsenreither2013-08-151-1/+1
| | | | | | | | | | | | | | | 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.
* Merge pull request #2741 from retronym/topic/intellij-modularAdriaan Moors2013-08-081-0/+16
|\ | | | | Scrubbing up the IntelliJ Config
| * Scrubbing up the IntelliJ ConfigJason Zaugg2013-07-291-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | Make junit runner quiet when tests pass.Grzegorz Kossakowski2013-07-271-1/+1
| | | | | | | | | | | | 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.
* | Update sbt interface version to 0.12.4.Grzegorz Kossakowski2013-07-271-1/+1
|/ | | | | | | 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.
* Unfork jline: use vanilla jline 2.11 as a dependency.Adriaan Moors2013-07-051-15/+24
| | | | | | | | 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
* Spin off parser combinators to scala-parser-combinators.jar.Adriaan Moors2013-07-051-8/+36
|
* Spin off src/library/scala/xml to src/xml/scala/xml.Adriaan Moors2013-07-051-23/+58
| | | | | | | | | | | | | | | | | | 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.
* Merge remote-tracking branch 'scala-2.10.x/junit' into masterGrzegorz Kossakowski2013-06-161-2/+58
|\
| * Add support for JUnit testsGrzegorz Kossakowski2013-06-151-2/+58
| | | | | | | | | | | | | | | | 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.
* | SI-7287 include all compiler sources in -src.jarAdriaan Moors2013-05-241-3/+9
| |
* | Merge pull request #2483 from adriaanm/merge-2.10.xPaul Phillips2013-05-021-0/+2
|\ \ | | | | | | Merge 2.10.x
| * | Merge 2.10.x into masterAdriaan Moors2013-05-021-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * SI-6532 emit debug info in compiled java.Paul Phillips2013-04-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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;
* | | Update ScalaCheck to 1.10.1.Som Snytt2013-04-301-0/+2
|/ / | | | | | | Puts test-interface on the class path.
* | Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.xPaul Phillips2013-04-081-25/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * if starr.use.released fetch Scala ${starr.version} for STARRAdriaan Moors2013-04-041-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * assume build.release when maven.version.suffix is setAdriaan Moors2013-04-041-0/+4
| |
| * make quick.done depend on quick.bin againAdriaan Moors2013-04-041-2/+2
| |
* | SI-6289 Partest in technicolor and showing javac errorsSom Snytt2013-04-041-60/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge 2.10.x into master again (no conflicts).Adriaan Moors2013-04-021-5/+13
|\|
| * comments to address reviewer feedbackAdriaan Moors2013-04-021-5/+13
| |
* | Merge 2.10.x into masterAdriaan Moors2013-04-021-103/+142
|\| | | | | | | | | Conflicts: build.xml
| * formattingAdriaan Moors2013-04-021-13/+13
| |
| * Preliminary support for zinc.Adriaan Moors2013-04-021-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | To use Zinc with the ant build: - install zinc and symlink the installed zinc script to ${basedir}/tools/zinc (${basedir} is where build.xml and the rest of your checkout resides) - make sure to set ZINC_OPTS to match ANT_OPTS! - invoke ant as `ant -Dstarr.version="2.10.1" -Dlocker.skip=1` (zinc does not work if locker is only classfiles, needs jars TODO rework the build to pack locker and build using that when using zinc?) Mostly to enable dog fooding of incremental compilation work for now.
| * Regularity for build.xml: 1 output dir / projectAdriaan Moors2013-04-021-90/+89
| | | | | | | | | | | | | | Untangle actors, msil builds from library/compiler builds. For further regularity, always build java files. TODO: update IDE projects
| * get rid of args element in staged-scalacAdriaan Moors2013-04-011-18/+10
| |
* | Merge remote tracking branch 'origin/2.10.x' into ↵Jason Zaugg2013-04-021-362/+310
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | topic/merge-2.10.x-to-v2.11.0-M2-74-g00e6c8b Conflicts: bincompat-backward.whitelist.conf bincompat-forward.whitelist.conf build.xml src/compiler/scala/reflect/reify/utils/Extractors.scala src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala src/compiler/scala/tools/nsc/transform/patmat/MatchOptimization.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/partest/scala/tools/partest/nest/ReflectiveRunner.scala src/reflect/scala/reflect/internal/Types.scala src/reflect/scala/reflect/runtime/JavaUniverse.scala test/files/run/inline-ex-handlers.check test/files/run/t6223.check test/files/run/t6223.scala test/scaladoc/scalacheck/IndexTest.scala
| * Strip version suffix from diffutils.Adriaan Moors2013-03-291-9/+11
| |
| * Use java-diff-utils for diffing in partest.Adriaan Moors2013-03-291-23/+35
| | | | | | | | | | | | | | | | We now use the unified diff format, hence the updated check files. It's not clear to me how partest's classpath is managed, but the approach in this commit works for the ant task and script invocation. The diffutils jar is injected in the parent classloader.
| * Clean up pack targets. Better dependency tracking.Adriaan Moors2013-03-271-89/+97
| | | | | | | | | | | | | | | | | | | | Target pack.@{project} is considered up to date iff classes emitted by quick.@{project} are. TODO: encapsulate "classes emitted by quick.@{project}". For now, they are duplicated as references to `${build-@{stage}.dir}/classes/@{destproject}` (in staged-scalac and *.build.path)
| * ant clean only zaps the quick stageAdriaan Moors2013-03-271-2/+2
| |
| * Run test.scaladoc before test.suite. Fail fast.Adriaan Moors2013-03-271-1/+1
| |
| * Let continuations library sources determine docs.lib's actualityAdriaan Moors2013-03-261-0/+1
| |
| * Preparation for faster PR validationAdriaan Moors2013-03-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | Added starr.number, so that `ant -propertyfile starr.number -Dlocker.skip=1` works across branches. Introduced target `test.core`, which skips `test.stability`, since that requires `locker == quick`, whereas `locker == starr` with the above settings. (It's interesting to see for which files it fails when that assumption is broken.) Stability will still be tested on a nightly basis. It's rarely broken.
| * Remove duplication in java builds of fjbg/asm/forkjoinAdriaan Moors2013-03-261-66/+31
| |
| * Formatting. Introduce {asm,forkjoin,fjbg}-classes props.Adriaan Moors2013-03-251-74/+79
| |
| * remove unused ant targets: test.ant, test.classload, test.positionsAdriaan Moors2013-03-251-100/+0
| |
| * run test.bc as part of tests on 2.10.xAdriaan Moors2013-03-251-7/+10
| | | | | | | | also added test.bc-opt target as binary compatibility differs between (non)optimized builds...
| * restored dependency of pack.done on quick.binAdriaan Moors2013-03-251-1/+2
| |
| * Fix typos in build.xmlAdriaan Moors2013-03-241-6/+6
| |
| * Merge scala/2.10.x into build-cleanup-2.10Adriaan Moors2013-03-231-28/+49
| |\ | | | | | | | | | | | | Conflicts: build.xml
| | * Reduce duplication and increase verbosity in MiMa execution.Jason Zaugg2013-03-161-91/+44
| | | | | | | | | | | | | | | This helps to see whether we've broken forward or backward binary compatibility.
* | | Merge 2.10.x into masterAdriaan Moors2013-03-251-2139/+1253
|\| | | | | | | | | | | | | | | | | Merges the relevant part of #2295 (build.xml cleanup), with the relevant differences in build.xml carried forward, as well as a fix in interactive/RangePositions for the sbt interface.
| * | Allow getting STARR via maven, also: locker.skipAdriaan Moors2013-03-231-5/+35
| | | | | | | | | | | | | | | Use `ant -Dstarr.version="2.11.0-M2" -Dlocker.skip=YESSIR`, to build quick using 2.11.0-M2 (skipping locker, using starr instead).
| * | Use stage/project for taskname instead of scalacforkAdriaan Moors2013-03-231-2/+2
| | |
| * | Sanity for build.xml: exscriptus&positus delendus est.Adriaan Moors2013-03-231-2431/+1262
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced copy/pasting to the best of my antabilities. The next person to duplicate anything without written permission will be sentenced to a week in xmhell. While I was at it, made sure that layering is respected. The quick phase exclusively uses the locker compiler for building. The jar task will fail when trying to create an empty jar. Replaced the crazy if/unless/depends constructs by if/then/else. Version suffix computation should now be comprehensible. I threw in some validation to make sure the various suffixes are consistent. Also, no more init/pre-foo tasks unless absolutely necessary. Introduced a couple of macros to capture the essence of staged compilation. Notes: - remove lib.extra, standardize on aux.libs - collapse *.javac.path and *.build.path - rename starr.classpath to starr.compiler.path - only repl needs jline, locker.compiler.path = locker.comp.build.path + forkjoin - more uniform build.paths (compiler = reflect + library) - uniformity means slightly bigger classpaths (e.g. forkjoin is only used in library, but inherited by compiler) - pruned: some spurious dependencies removed - compilerpathref = compiler build path - silence test.osgi, by hook or by crook - centralized clean tasks - reduce duplication in property usage - fix pack.xml to pack scaladoc/partest instead of scaladoc/scala-partest - TODO: -XDignore.symbol.file necessary for library? only needed for forkjoin? - document usage from jenkins, fix typo: partest.scalac*_*opts New targets: - quick-opt - strap-opt - test.bc - test.osgi - test.osgi.comp - test.osgi.init - test.stability-opt Removed/replaced targets: - asm.clean asm.lib asm.start - bc.run - dist.latest dist.latest.unix dist.latest.win dist.start - docs.all docs.manmaker docs.pre-comp docs.pre-continuations-plugin - docs.pre-jline docs.pre-lib docs.pre-man docs.pre-partest docs.pre-scalap - forkjoin.clean forkjoin.lib forkjoin.pack forkjoin.start - graph.clean - init.build.nopatch.release init.build.patch.release init.build.release - init.build.snapshot init.build.suffix.done init.extra.tasks - init.fail.bad.jdk init.hasbuildnum init.hasmavensuffix init.jars - init.jars.check init.maven.jars init.maven.tasks init.osgi.suffix - init.osgi.suffix.final init.osgi.suffix.snapshot init.testjava6 - init.version.done init.version.git init.version.release init.version.snapshot - init.warn.jdk7 locker.pre-comp locker.pre-lib locker.pre-reflect - locker.unlock.comp locker.unlock.lib locker.unlock.pre-comp - locker.unlock.pre-lib locker.unlock.pre-reflect locker.unlock.reflect - osgi.clean osgi.test osgi.test.comp osgi.test.init - pack.clean pack.pre-bin pack.pre-comp pack.pre-lib pack.pre-partest - pack.pre-plugins pack.pre-reflect pack.pre-scalap pack.start - palo.comp palo.lib palo.pre-bin palo.pre-comp palo.pre-lib palo.pre-reflect - palo.reflect palo.start quick.pre-bin - quick.pre-comp quick.pre-interactive quick.pre-lib quick.pre-partest - quick.pre-plugins quick.pre-reflect quick.pre-repl quick.pre-scalacheck - quick.pre-scaladoc quick.pre-scalap - sbt.clean sbt.compile sbt.done sbt.libs sbt.start - starr.clean - strap.clean strap.pre-comp strap.pre-lib strap.pre-reflect strap.start - test.debug test.pre-run
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 07:35:41 +0000