summaryrefslogtreecommitdiff
path: root/src/build/pack.xml
Commit message (Collapse)AuthorAgeFilesLines
* Inline src/build/pack.xml into build.xml.Adriaan Moors2013-10-211-263/+0
| | | | It tended too easily to get out of synch with build.xml.
* Use overwriting copy uniformly in our build.Jason Zaugg2013-10-181-11/+11
| | | | | | | | | | 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.
* Skip more under ant -Ddocs.skip.Jason Zaugg2013-10-181-2/+2
| | | | | | | | - 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
* Remove build.number.mavenJason Zaugg2013-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't find any justification for having this information in both build.number and build.number.maven. They have drifted apart on the 2.10.x branch, although that doesn't matter because build.number is correct, and loaded first, and Ant properties are write-once. I'm assuming that the Ant tasks in src/build/pack.xml are only invoked through the <antcall>-s in ./build.xml. Here's a test of that from the 2.10.x branch: % cat build.number #Tue Sep 11 19:21:09 CEST 2007 version.major=2 version.minor=10 version.patch=3 # This is the -N part of a version. if it's 0, it's dropped from maven versions. version.bnum=0 # Note: To build a release run ant with -Dbuild.release=true # To build an RC, run ant with -Dmaven.version.suffix=-RCN % cat build.number.maven version.major=2 version.minor=10 version.patch=0 % git diff diff --git a/build.xml b/build.xml index 3a83aa4..5cb952c 100644 --- a/build.xml +++ b/build.xml @@ -62,6 +62,9 @@ TODO: <target name="distpack" depends="dist.done, docs.done"> <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inh + <target name="distpack.maven.info"> + <ant antfile="${src.dir}/build/pack.xml" target="pack-maven.info" inheritall="yes" i + <target name="distpack-maven" depends="dist.done, docs.done"> <ant antfile="${src.dir}/build/pack.xml" target="pack-maven.done" inheritall="yes" i diff --git a/src/build/pack.xml b/src/build/pack.xml index 20c4034..56863ff 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -133,6 +133,10 @@ MAIN DISTRIBUTION PACKAGING <mkdir dir="${dists.dir}/maven/${version.number}"/> </target> + <target name="pack-maven.info"> + <echo message="version.patch = ${version.patch}"/> + </target> + <target name="pack-maven.libs" depends="pack-maven.start"> <macrodef name="mvn-copy-lib"> <attribute name="mvn.artifact.name"/> % ant distpack.maven.info Buildfile: /Users/jason/code/scala2/build.xml distpack.maven.info: pack-maven.info: [echo] version.patch = 3 Notice how the stale `version.patch=0` in build.number.maven is ignored.
* Remove scala-xml and scala-parser-combinatorsAdriaan Moors2013-08-271-11/+4
| | | | | | | | | | | | | | | | | | | 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.
* Move partest to https://github.com/scala/scala-partestAdriaan Moors2013-08-201-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* Unfork jline: use vanilla jline 2.11 as a dependency.Adriaan Moors2013-07-051-11/+0
| | | | | | | | 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-0/+5
|
* Spin off src/library/scala/xml to src/xml/scala/xml.Adriaan Moors2013-07-051-0/+5
| | | | | | | | | | | | | | | | | | 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.
* No more duplication in maven-deploy.xml.Adriaan Moors2013-07-051-2/+4
| | | | | I just couldn't stand the incredible mess in there anymore. More cleanup to come. For now, suffice it to say you need only add one line per new module.
* use relative symlink in distpackAdriaan Moors2013-04-301-1/+3
| | | | | | | | To simplify building a release on jenkins, we run distpack-opt in one job, store the `dists/` directory in a tar ball, archive that artifact and copy it to the downstream jobs that package on windows and unix. To make the tarball portable between machines, it must not use absolute symlinks.
* Sanity for build.xml: exscriptus&positus delendus est.Adriaan Moors2013-03-231-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Removing actors-migration from main repository so it can live on elsewhere.Josh Suereth2012-10-301-5/+0
| | | | | | | * Removes actors-migration hooks from partest * Removes actors-migration code * removes actors-migration tests * removes actors-migration distribution packaging.
* Allow skipping the xz archivesLukas Rytz2012-08-091-12/+27
| | | | Using 'ant -Darchives.skipxz=true'
* Introduces scala-reflect.jarEugene Burmako2012-06-081-0/+3
|
* Adding the Actor Migration Kit.Vojin Jovanovic2012-05-181-0/+6
| | | | | | | | | | | | 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
* Good-bye, scala.dbc.Paul Phillips2012-04-201-4/+1
| | | | Another deprecated soul passes on to ether world.
* Remove sbaz and references from master repository.Josh Suereth2012-03-271-106/+2
|
* Removed git from source repo generation.Josh Suereth2012-03-271-0/+1
|
* Added latest link for sources so we can include them in distributions.Josh Suereth2012-03-271-1/+15
|
* Separating Scala Actors from the Scala Library.Vojin Jovanovic2012-03-191-3/+6
| | | | | | | | | Scala actors are now in scala-actors.jar. Changes that were done are: - Fixed partest to include actors library for various test usages - Created the entry for the new jar in build.xml - Added maven entries for scala actors Review by: @jsuereth
* Fixed maven deployment issues for new versioning scheme.Josh Suereth2012-03-161-3/+0
|
* Modified build for new versioning scheme.Josh Suereth2012-03-161-0/+1
|
* create relative symlinks in ant scriptsLukas Rytz2012-03-151-1/+1
|
* Javadoc + Source jar generation is now complete for maven deployment.Josh Suereth2012-02-201-4/+31
|
* fix maven publish version numbersLukas Rytz2012-02-071-0/+3
|
* updated scaladoc comments, did some cleanupmichelou2011-09-131-29/+29
|
* slightly better handling of .tar, .tgz, .txzAntonio Cunei2011-05-181-9/+9
|
* Small change to keep WinZip happy.Antonio Cunei2011-05-181-7/+10
| | | | | | | | Apparently some Windows tools are able to detect the fact that the .tgz is really a .gz archive of one file, which originally did not have the .tar suffix. That is pretty unusual, since even "gz -l" will list the .tar suffix. In any event, this small change should make everyone happy.
* Excluding presentation test from sbaz-packaged ...Antonio Cunei2011-03-291-1/+2
| | | | | Excluding presentation test from sbaz-packaged test suite.
* include files/specialized/*.txt in the set of f...Antonio Cunei2011-03-291-1/+1
| | | | | | include files/specialized/*.txt in the set of files packaged in the test sbp.
* Introducing xz compression in nightly builds.Antonio Cunei2011-03-261-39/+36
| | | | | Also removed some obsolete targets related to the old 1.4 version.
* Upgraded to latest maven-ant-tasks jarJosh Suereth2011-03-051-1/+1
|
* Modified scala build to push jline artifact to ...Josh Suereth2011-01-221-1/+9
| | | | | | Modified scala build to push jline artifact to maven repositories. Review by: extempore
* added scalacheck.jar and *.test files to the sc...Lukas Rytz2010-04-141-1/+2
| | | | | | added scalacheck.jar and *.test files to the scala-test sbaz package. no review.
* moved plugin folder back to 'misc/scala-devel/p...Lukas Rytz2010-04-111-1/+3
| | | | | | | | moved plugin folder back to 'misc/scala-devel/plugins'. moved bash completion to scala-tool-support (see r21449). include continuations in compiler sbaz package. replaced some tabs by spaces. review by extempore.
* Added continuations to maven deployment.Josh Suereth2010-03-121-1/+19
|
* fixed scala-devel sbaz packageLukas Rytz2009-11-131-1/+1
|
* removing msil from trunk.Lukas Rytz2009-10-081-56/+0
|
* scalap re-added to distribution packaging section.Antonio Cunei2009-10-081-1/+1
|
* fix #1484Lukas Rytz2009-09-301-0/+4
|
* fix for #1660.Lukas Rytz2009-05-281-1/+1
|
* merged changes from maven2 branch (include scal...Lukas Rytz2009-02-171-0/+2
| | | | | merged changes from maven2 branch (include scalap as maven package)
* added build scripts for scalapLukas Rytz2009-02-091-1/+15
|
* fixed #1651Lukas Rytz2009-01-201-0/+3
|
* ant: use copy instead of copyfileLukas Rytz2008-11-261-2/+2
|
* - make "latest" symlink in dists/mavenLukas Rytz2008-11-051-1/+13
| | | | | | - maven-deploy.xml takes parameter settings.file (ant deploy.snapshot -Dsettings.file=/path/to/settings.xml)
* propagating to trunk fix for #1463Antonio Cunei2008-10-311-1/+1
|
* merged work from maven2 branch into trunkLukas Rytz2008-10-311-5/+59
|
* . scala.swing api is now included in the main apiLukas Rytz2008-10-161-5/+5
| | | | | | . the downloadable scala-api.tgz is now called scala-devel-docs.tgz, and contains the same files as the correspondent sbaz package
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 03:46:38 +0000