summaryrefslogtreecommitdiff
path: root/build.xml
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge pull request #948 from gkossakowski/target-1.6Lukas Rytz2012-07-201-13/+13
|\ | | | | Deprecate all JVM 1.5 targets and make 1.6 default.
| * Switch to 1.6 target for all javac invocations.Grzegorz Kossakowski2012-07-191-13/+13
| | | | | | | | | | | | | | | | Switch to 1.6 target for all javac invocations we perform in build.xml. This way we do not emit java 1.5 byte-code either from scalac or javac. This commit should complete the move off java 1.5 byte-code.
* | Merge pull request #925 from VladUreche/issue/scaladocAdriaan Moors2012-07-201-9/+38
|\ \ | | | | | | Fix a bunch of scaladoc issues: SI-3314 SI-4888 SI-5235 SI-5558 SI-4324 SI-5780 SI-4887 SI-3695 SI-4224 SI-4497 SI-5079 SI-6073 SI-5533 SI-5784
| * | Scaladoc: GroupsVlad Ureche2012-07-191-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group class members based on their semantic relationship. To do this: - @group on members, only need to do it for the non-overridden members - -groups flag passes to scaladoc, groups="on" in ant - @groupdesc Group Group Description to add descriptions - @groupname Group New name for group - @groupprio Group <int> (lower is better) See test/scaladoc/run/groups.scala for a top-to-bottom example
| * | SI-4360 Adds prefixes to scaladocVlad Ureche2012-07-161-8/+30
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a long-standing issue in scaladoc: It was unable to disambiguate between entries with the same name. One example is: immutable.Seq: trait Seq[+A] extends Iterable[A] with Seq[A] ... What's that? Seq extends Seq? No, immutable.Seq extends collection.Seq, but scaladoc was unable to show that. Now it does, depending on the template you're in. Prefixes are relative and can go back: -scala.collection.Seq has subclasses *immutable.Seq* and *mutable.Seq* -scala.immutable.Seq extends *collection.Seq* Unfortunately the price we pay for this is high, a 20% slowdown in scaladoc. This is why there is a new flag called -no-prefixes that disables the prefixes in front of types. Btw, it also fixes the notorious "booleanValue: This member is added by an implicit conversion from Boolean to Boolean ...". That's now java.lang.Boolean, so it becomes clear. Conflicts: src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala
* / evicts calls to reify from our codebaseEugene Burmako2012-07-201-1/+1
|/ | | | | | | | | | | | | Until reflection design is stabilized (i.e. 2.10.0 final is released), it's a good idea to refrain from using reify in our codebase (either directly in quasiquotes, or indirectly via materialized type tags). This increases the percentage of changes to reflection that don't require rebuilding the starr. The change to build.xml will expose reifications going on during our build (by printing out their results to the console, so that they bug everyone), making it easier to spot and fix them.
* Partest: add `instrumented` test category.Grzegorz Kossakowski2012-07-161-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- (taken from README) Tests in `instrumented/` directory are executed the same way as in `run/` but they have additional byte-code instrumentation performed for profiling. You should put your tests in `instrumented/` directory if you are interested in method call counts. Examples include tests for specialization (you want to count boxing and unboxing method calls) or high-level tests for optimizer where you are interested if methods are successfuly inlined (so they should not be called at runtime) or closures are eliminated (so no constructors of closures are called). Check `scala.tools.partest.instrumented.Instrumentation` to learn how to use the instrumentation infrastructure. The instrumentation itself is achieved by attaching a Java agent to the forked VM process that injects calls to profiler. Check `scala.tools.partest.javaagent.ProfilingAgent` for details. --- A few notes on low-level details of this change: * Partest now depends on asm library for byte-code instrumentation (`build.xml`) * Build additional jar called `scala-partest-javaagent.jar` that is used with `-javaagent:` option. (`build.xml`) * Set `-javaagent:` option for all tests in `instrumented/` directory. (`RunnerManger.scala`) * Introduce a new category of tests called `instrumented`. * Add one instrumented test to demonstrate usage and test new infrastructure itself. (`InstrumentationTest.scala`) Review by @phaller.
* FIXING THE SAME MISTAKE BUT IN STRAP. Yay for copy-paste ant-magicJosh Suereth2012-07-101-1/+1
|
* Fixed very bad build.xml issue and quick.bin missing ASM.Josh Suereth2012-07-101-1/+2
|
* Merge pull request #840 from jsuereth/fix/newstarr-with-sourceLukas Rytz2012-07-101-37/+31
|\ | | | | STARR now includes source
| * Added opt variant to replacestarrwinJosh Suereth2012-07-061-0/+6
| |
| * Fixed replacestarr to use packed libraries and also include source files.Josh Suereth2012-07-061-37/+25
| |
* | Scaladoc diff-firendly outputVlad Ureche2012-07-021-7/+10
|/ | | | | | | | | | | | | | | | | | | | | Scaladoc can create raw content files that we can easily diff and spot any modifications. There is a cool project by Stefan Zeiger to export the scaladoc model in JSON, but with the language and scaladoc being so quick to evolve, it'll be a pain to properly maintain. In the long-run, the plan is to sample a couple of raw files on each build and email me the diff. If I spot anything that may be wrong I can fix it, revert the commit or at least file a bug. For now, .html.raw files are generated on-demand, using ant -Dscaladoc.raw.output="yes" <targets> Also added a script that will do the job of diff-ing. Review by @jsuereth. Conflicts: src/compiler/scala/tools/nsc/doc/Settings.scala
* Merge pull request #719 from jsuereth/jdk7-friendly-buildJosh Suereth2012-06-151-40/+83
|\ | | | | Adding JDK7 friendly build with new partialdist(-opt) tasks.
| * Adding JDK7 friendly build with new partialdist(-opt) tasks.Josh Suereth2012-06-141-40/+83
| | | | | | | | | | * When running in JDK 7 issues a warning. * New partialdist, partialdist-opt tasks allow creating a distribution with no source/docs.
* | Merge pull request #708 from scalamacros/topic/fastlockerJosh Suereth2012-06-151-29/+64
|\ \ | |/ |/| fastlocker target for ant
| * fastlocker target for antEugene Burmako2012-06-151-29/+64
| | | | | | | | doesn't build msil in locker.comp
* | A tribute to https://github.com/scala/scala/pull/414Eugene Burmako2012-06-131-2/+2
|/
* MSIL now build as part of compiler.Josh Suereth2012-06-111-94/+90
| | | | | | * MSIL is now compiled/embedded with compiler * Tested building new STARR, everything groovy * Can probably remove msil/forkjoin/fjbg from STARR now that they're properly embedded/built.
* Forkjoin and fjbg are now always compiled in the build.Josh Suereth2012-06-111-97/+166
| | | | | * forkjoin.done/forkjoine.clean can test forkjoin source * fjbg.done/fjbg.clean can test fjbg source.
* fixes a bug with bat files invocation from antEugene Burmako2012-06-081-2/+10
| | | | | | http://ant.apache.org/manual/Tasks/exec.html Note that .bat files cannot in general by executed directly. One needs to execute the command shell executable cmd using the /c switch.
* the final touch: scala/reflect added to scaladoc!Eugene Burmako2012-06-081-1/+2
|
* Reverting 22c8dec5 and preventing bootstapping in scaladocVlad Ureche2012-06-081-7/+7
| | | | | Review by @dragos, @jsuereth. Required bootstrapping because the starr was ant tasks were invoking locker with -Ysourcepath instead of -sourcepath.
* Introduces scala-reflect.jarEugene Burmako2012-06-081-7/+227
|
* Fixes SI-4909 and SI-5763Vlad Ureche2012-06-081-7/+7
| | | | | | | | | | Finally, -sourcepath is split into: -Ysourcepath - for the library bootstrapping -doc-source-path - for scaladoc links to source code (squished the resident compiler test fix into this commit) Review by @jsuereth.
* macros: -Xmacros is now retiredEugene Burmako2012-06-081-1/+1
|
* Merge branch 'master' into asm-compiled-onceJosh Suereth2012-05-231-1/+23
|\
| * Fixing the build of actors.Vojin Jovanovic2012-05-231-1/+23
| |
* | ASM now compiled once in the build.Josh Suereth2012-05-231-42/+43
|/ | | | | | | | * 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
* Adding the Actor Migration Kit.Vojin Jovanovic2012-05-181-1/+43
| | | | | | | | | | | | Kit consists of: 1) The StashingActor which adopts an interface similar to Akka. 2) Props mockup for creating Akka like code 3) Pattern mockup 4) Test cases for every step in the migration. 5) MigrationSystem which will paired on the Akka side. Review of the code : @phaller Review of the build: @jsuereth
* Removing extraneous files.Paul Phillips2012-05-151-44/+0
| | | | Culling accumulated unnecessary code.
* compile Java files under src/compilerMiguel Garcia2012-05-081-0/+42
|
* make strap build use exact same compiler options as quick buildMiguel Garcia2012-05-081-11/+14
|
* Fixes to OSGi version number based on IDE team's suggestions.Josh Suereth2012-04-231-2/+21
|
*-. Merge commit 'refs/pull/414/head'; commit 'refs/pull/415/head'; commit ↵Paul Phillips2012-04-201-3/+3
|\ \ | | | | | | | | | 'refs/pull/416/head'; commit 'refs/pull/417/head'; commit 'refs/pull/418/head' into develop
| * | suppresses warnings introduced in a2115b2352Eugene Burmako2012-04-191-3/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | locker.lib: [javac] Compiling 1 source file to C:\Projects\Kepler\build\locker\classes\library [javac] C:\Projects\Kepler\src\library\scala\concurrent\impl\Unsafe.java:17: warning: sun.misc.Unsafe is Sun proprietary API and may be removed in a future release [javac] public final static sun.misc.Unsafe instance; [javac] ^ [javac] C:\Projects\Kepler\src\library\scala\concurrent\impl\Unsafe.java:20: warning: sun.misc.Unsafe is Sun proprietary API and may be removed in a future release [javac] sun.misc.Unsafe found = null; [javac] ^ [javac] C:\Projects\Kepler\src\library\scala\concurrent\impl\Unsafe.java:21: warning: sun.misc.Unsafe is Sun proprietary API and may be removed in a future release [javac] for(Field field : sun.misc.Unsafe.class.getDeclaredFields()) { [javac] ^ [javac] C:\Projects\Kepler\src\library\scala\concurrent\impl\Unsafe.java:22: warning: sun.misc.Unsafe is Sun proprietary API and may be removed in a future release [javac] if (field.getType() == sun.misc.Unsafe.class) { [javac] ^ [javac] C:\Projects\Kepler\src\library\scala\concurrent\impl\Unsafe.java:24: warning: sun.misc.Unsafe is Sun proprietary API and may be removed in a future release [javac] found = (sun.misc.Unsafe) field.get(null); [javac] ^ [javac] 5 warnings [propertyfile] Updating property file: C:\Projects\Kepler\build\locker\classes\library\library.properties [stopwatch] [locker.lib.timer: 0.908 sec]
* | Good-bye, scala.dbc.Paul Phillips2012-04-201-34/+0
| | | | | | | | Another deprecated soul passes on to ether world.
* | change com.typesafe.config dep to version 0.4.0Havoc Pennington2012-04-191-1/+1
|/
* Revert "change com.typesafe.config dep to version 0.4.0"Paul Phillips2012-04-141-1/+1
| | | | This reverts commit f67a00a3cef270835369b8ab1bb57cbe8b2bd2a3.
* change com.typesafe.config dep to version 0.4.0Havoc Pennington2012-04-131-1/+1
|
* Scaladoc feature that shows implicit conversionsVlad Ureche2012-04-131-67/+73
| | | | | | | See https://github.com/VladUreche/scala/tree/feature/doc-implicits for the history. See https://scala-webapps.epfl.ch/jenkins/view/scaladoc/job/scaladoc-implicits-nightly/ for nightlies. Many thanks fly out to Adriaan for his help with implicit search!
* Reconfigure build.xml so -Xmacros isn't lost.Paul Phillips2012-04-121-2/+3
| | | | | | For future reference, -Dscalac.args is how unknown things pass arbitrary parameters to scalac, so you don't want to put anything there you don't expect to lose.
* Revert "Enabled continuations plugin by default."Paul Phillips2012-04-121-3/+3
| | | | This reverts commit da35106f81a5c24e78ff51c95e10052ad4f23b18.
* Next generation of macrosEugene Burmako2012-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | Implements SIP 16: Self-cleaning macros: http://bit.ly/wjjXTZ Features: * Macro defs * Reification * Type tags * Manifests aliased to type tags * Extended reflection API * Several hundred tests * 1111 changed files Not yet implemented: * Reification of refined types * Expr.value splicing * Named and default macro expansions * Intricacies of interaction between macros and implicits * Emission of debug information for macros (compliant with JSR-45) Dedicated to Yuri Alekseyevich Gagarin
* fix for get-scala-commit-* on Windows (tested with Windows 7)Eugene Burmako2012-04-111-0/+2
|
* Fixed class cast exception thrown when re-initializing maven-ant-tasks.Josh Suereth2012-04-031-1/+3
|
* Maven repository dependencies are now added to distributions.Josh Suereth2012-03-311-1/+6
|
* Build.xml can now resolve artifacts from maven central and use them in the ↵Josh Suereth2012-03-311-2/+16
| | | | | | | | build. * Artifacts are resovled from maven central after the STARR repostiory * All maven dependencies are added to aux.libs (every classpath) * Typesafe config library is added by efault.