summaryrefslogtreecommitdiff
path: root/build.xml
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* comments to address reviewer feedbackAdriaan Moors2013-04-021-5/+13
|
* 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
|
* 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.
* | 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
* test.done again checks bin compat (using mima 0.1.5)Adriaan Moors2013-03-011-4/+4
|
* check scala-swing for binary compatibilityAdriaan Moors2013-02-121-0/+31
|
* [nomaster] run mima both ways, filter out failuresAdriaan Moors2013-02-091-3/+39
| | | | | | | | | | Using @gkossakowski's contribution to mima (in 0.1.5-SNAPSHOT), make sure bc.run doesn't fail by filtering out all binary incompatibilities. Each subsequent commit will comment out the filters it makes irrelevant, until we only need to filter out permitted binary incompatibilities. We only allow binary incompatibilities in scala.reflect.internal.
* Add Bytecode test (ASM-based) to partest.Grzegorz Kossakowski2013-01-291-0/+1
| | | | | | | | | | | | | | | | | | | This commit introduces a new kind of test `Bytecode` that allows one to inspect bytecode generated for given piece of Scala code. The bytecode inspection is achieved by inspection of ASM trees. See the included example for details. NOTE: This commit does not introduce a new category of pratest tests. Bytecode tests should be run in `jvm` category of partest tests. Specific list of changes: * Add BytecodeTest that contains common utilities to partest * Add asm to classpath when compiling partest. That's not a new dependency as it's being already done for javac task we were running while compiling partest. * Add an example test that shows how to count null checks in given method.
* SI-6915 Updates copyright properties to 2002-2013James Iry2013-01-041-1/+1
| | | | | | | | The .scala header files had the right copyright dates but properties used to generate the information in e.g. "scala -version" hadn't been updated. review @adriaanm
* Merge remote-tracking branch 'origin/2.10.0-wip' into 2.10.0-wip-mergePaul Phillips2012-12-191-1/+6
|\ | | | | | | | | | | | | | | | | # By Eugene Burmako (1) and others # Via Adriaan Moors (2) and others * origin/2.10.0-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply
| * Fixing OSGi distribution.Josh Suereth2012-12-051-1/+6
| | | | | | | | | | | | | | | | There was some kind of wierd filesystem issue where ANT would overwrite jars or not, depending on timestamps. It was a non-repeatable failure. Rather than overwrite JARs and rely on ANT, let's just spell out the non-OSGI bundles. While I had hoped to avoid hard-coding these, it's probably best we've done so.
* | adds scala-reflect.jar to MIMA in antEugene Burmako2012-12-161-1/+14
| |
* | Now the test suite runs MIMA for compatibility testing.Josh Suereth2012-12-051-1/+35
|/ | | | | Failures are still not reported, thanks to MIMA not returnign non-0 exit codes on failure. I'll be patching MiMA seprately, but at least this will let us deal with failures in scala. Currently, we need to adapt the Vector speed improvements for binary compatibility.
* Fixing issue where OSGi bundles weren't getting used for distribution.Josh Suereth2012-11-041-1/+2
|
* Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-10-301-73/+4
| | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
* SI-6099 - Scaladoc for scala.concurrent incompleteHeather Miller2012-10-101-1/+1
| | | | | | This is a rebase and resubmission of @phaller's pull https://github.com/scala/scala/pull/1485 With the reviewers' comments additionally addressed
* turns on documentation of scala.reflect.runtimeEugene Burmako2012-10-031-1/+1
| | | | | | | | We definitely need to document scala.reflect.runtime.universe, therefore adding scala.reflect.runtime to skipPackages was a mistake. But then we need to make a bunch of internal classes private to reflect or to scala. Not very pretty, but it works.
* docs.pre-lib now checks for mods in reflectEugene Burmako2012-09-271-0/+1
|
* no longer docs scala.reflect.ioEugene Burmako2012-09-271-1/+1
| | | | | | | | | The only place we use something from scala.reflect.io in the public API is Symbol.associatedFile, so I've excluded scala.reflect.io from scaladoc and added a "warning: experimental" comment to associatedFile instead. I'd argue that this greatly simplifies the surface of reflection API (typing scala.reflect in the search bar now yields 3 packages instead of 4).
* no longer docs internal scala.reflect packagesEugene Burmako2012-09-271-7/+7
|
* Adds OSGi support / tests to Scala. Fixes SI-5822.Josh Suereth2012-09-181-7/+183
| | | | | | | * Adds BND manifest generation to the build. * Adds OSGi pax-exam testing infrastructure * Adds simple OSGi verification test for bundle resolution. * Modifies distribution to use bundles.
* Fix crasher from bug in maven ant tasks. Yippie.Josh Suereth2012-08-291-0/+2
|
* hotfix for SI-6293Eugene Burmako2012-08-281-1/+1
| | | | | We need to hide scala.reflect.macros.internal from scaladoc, not the entire scala.reflect.macros.
* cleanup of reflection- and macro-related stuffEugene Burmako2012-08-151-0/+1
| | | | | | mostly removes [Eugene] marks that I left back then and reviews related code some of those tokens got left in place, because I don't know to how fix them without imposing risks on 2.10.0
* some more copyright cleanup for 2012Adriaan Moors2012-08-101-1/+1
| | | | contributed by Carlo Dapor -- thanks!
* SBT compiler interface now compiled in ant build. Ensures those still using ↵Josh Suereth2012-08-061-2/+76
| | | | ant don't break the interface.
* Eliminated remainder of "catches Throwable" warnings.Paul Phillips2012-07-271-2/+2
| | | | | | | | And also non-exhaustive matches. And added -nowarn to the build options for scalacheck, we don't need to hear the warnings for code we aren't able to fix.
* Remove typesafe-config as dependency for library. Akka-actors will draw it in.Josh Suereth2012-07-251-1/+1
|