summaryrefslogtreecommitdiff
path: root/build.xml
Commit message (Collapse)AuthorAgeFilesLines
* [nomaster] Update MiMa and use new wildcard filterJason Zaugg2014-01-151-1/+1
| | | | | | | scala.reflect.internal._ now gets a free pass from binary compatibility checking. Previously, we had to excrutiatingly exclude violations individually.
* Partially revert f8d8f7d08d.Adriaan Moors2013-12-111-0/+1
| | | | | | | | Need `${dist.dir}/lib/scala-partest.jar` for maven publish. We still don't want to distribute it in the distribution, but will have to remove it in release script, as 2.10.x's build hasn't been refactoreded like master's, and I'm not backporting it.
* Update README, include doc/licenses in distroAdriaan Moors2013-12-101-9/+14
| | | | | | | | | | | We forgot to copy the licenses directory to the dists/ directory, so that they weren't included in the binary distribution. I did some house cleaning while I was at it. We no longer distribute ant as far as I can see (we used to for the sbt build, but that was long since removed). Added license for ASM, and Jansi (just to be sure).
* Remove docs/examples; they reside at scala/scala-distAdriaan Moors2013-12-091-6/+1
|
* Do not distribute partest and its dependencies.Adriaan Moors2013-12-091-8/+0
|
* Upgrade pax-url-aether to 1.6.0.Adriaan Moors2013-11-111-2/+4
| | | | | | | | | | | | | | Since our jenkins uses mirrors with passwords, we needed a fix for https://ops4j1.jira.com/browse/PAXURL-217 in order to run osgi.test on jenkins, now that we use maven more. We didn't hit this bug before because we were using a standard location for the maven local repository, but that causes problems with concurrent jenkins jobs accessing it. Also, upgrade STARR because Jenkins is using `skip.locker` now. See https://groups.google.com/d/msg/scala-internals/7R-Y5txP8NI/DX_JWFO2fu4J for a discussion of the problem this should fix.
* Allow retrieving STARR from non-standard repo for PR validationAdriaan Moors2013-11-061-0/+3
|
* Render relevant properties to buildcharacter.propertiesAdriaan Moors2013-11-061-0/+11
|
* [nomaster] SI-7862: MANIFEST.MF file for Scala sourcesIulian Dragos2013-09-231-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). Cherry picked from 655b7d2601d7db9e98bb405da0a67c9068c98626 Conflicts: build.xml After this commit: ``` % ant -q dist.src % for f in dists/scala-2.10.3-20130921-144112-892aa93cf7/src/*.jar; do \ echo $f \ unzip -p $f META-INF/MANIFEST.MF \ done dists/scala-2.10.3-20130921-144112-892aa93cf7/src/fjbg-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) dists/scala-2.10.3-20130921-144112-892aa93cf7/src/msil-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) dists/scala-2.10.3-20130921-144112-892aa93cf7/src/scala-actors-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) Bundle-Name: Scala Actors Sources Bundle-SymbolicName: org.scala-lang.scala-actors.source Bundle-Version: 2.10.3.v20130921-144112-892aa93cf7 Eclipse-SourceBundle: org.scala-lang.scala-actors;version="2.10.3.v201 30921-144112-892aa93cf7";roots:="." dists/scala-2.10.3-20130921-144112-892aa93cf7/src/scala-compiler-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) Bundle-Name: Scala Compiler Sources Bundle-SymbolicName: org.scala-lang.scala-compiler.source Bundle-Version: 2.10.3.v20130921-144112-892aa93cf7 Eclipse-SourceBundle: org.scala-lang.scala-compiler;version="2.10.3.v2 0130921-144112-892aa93cf7";roots:="." dists/scala-2.10.3-20130921-144112-892aa93cf7/src/scala-library-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) Bundle-Name: Scala Library Sources Bundle-SymbolicName: org.scala-lang.scala-library.source Bundle-Version: 2.10.3.v20130921-144112-892aa93cf7 Eclipse-SourceBundle: org.scala-lang.scala-library;version="2.10.3.v20 130921-144112-892aa93cf7";roots:="." dists/scala-2.10.3-20130921-144112-892aa93cf7/src/scala-partest-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) dists/scala-2.10.3-20130921-144112-892aa93cf7/src/scala-reflect-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) Bundle-Name: Scala Reflect Sources Bundle-SymbolicName: org.scala-lang.scala-reflect.source Bundle-Version: 2.10.3.v20130921-144112-892aa93cf7 Eclipse-SourceBundle: org.scala-lang.scala-reflect;version="2.10.3.v20 130921-144112-892aa93cf7";roots:="." dists/scala-2.10.3-20130921-144112-892aa93cf7/src/scala-swing-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) Bundle-Name: Scala Swing Sources Bundle-SymbolicName: org.scala-lang.scala-swing.source Bundle-Version: 2.10.3.v20130921-144112-892aa93cf7 Eclipse-SourceBundle: org.scala-lang.scala-swing;version="2.10.3.v2013 0921-144112-892aa93cf7";roots:="." dists/scala-2.10.3-20130921-144112-892aa93cf7/src/scalap-src.jar Manifest-Version: 1.0 Ant-Version: Apache Ant 1.8.4 Created-By: 1.6.0_37-b06-434-11M4509 (Apple Inc.) ```
* Merge pull request #2893 from adriaanm/backport-2880-2.10.xGrzegorz Kossakowski2013-09-111-2/+2
|\ | | | | update typesafe.artifactory-online.com to private-repo
| * update typesafe.artifactory-online.com to private-repoFrançois Garillot2013-08-291-2/+2
| |
* | [nomaster] SI-7790 No ScriptEngine in 2.10 buildSom Snytt2013-08-291-0/+2
|/ | | | | | | | | | | | | | | | | | 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.
* 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-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;
* 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-14 08:44:04 +0000