Commit Graph

132 Commits

Author SHA1 Message Date
mihaylov 59a68b0451 replaced ${*.dir}/${exec.dir.name} with ${*.exec.dir} in build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6990 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-30 13:31:50 +00:00
dubochet ddc2197300 Exec Scripts (scala, scalac, etc.) are generated for every phase, now based on the source grabed at compile-time (no need to rebuild locker when testing the scripts anymore).
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6989 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-30 12:42:03 +00:00
michelou 87821afae8 corrected link to sbaz universe in **/build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6973 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-29 13:22:54 +00:00
michelou 06a21fbb11 added sbaz package 'scala-test'
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6959 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-28 17:43:55 +00:00
dubochet 474cd02f0b Fixed bug #557: Testing available memory before running SABBUS is now more robust.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6900 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-24 16:32:26 +00:00
michelou b05c62fea5 added library scala-dbc.jar to package scala-library-*.sbp
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6892 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-24 12:57:10 +00:00
michelou 83ee5348c9 fixed missing link when generating advert file in build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6884 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-23 20:10:55 +00:00
michelou ddb6b266a9 removed placeholder packages in file scala/build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6882 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-23 16:59:16 +00:00
dubochet a65b8b6802 Corrected scripts to circumvent class loader bug in scala runtime. Every class loads in the same classloader so that boxed arrays can load their content.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6864 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-21 17:43:21 +00:00
dubochet 7faa69b844 1. Updated the tool generation script (UNIX) to be compatible with that defined on the wiki.
2. ScalaTool Ant task updated to be more flexible.
3. Build now generates a separate archive for DBC (also changed in source layout).

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6853 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-20 15:58:47 +00:00
michelou 334d8e6147 corrected handling of version number in build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6812 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-16 19:35:29 +00:00
michelou beb284a232 added license and readme files to the doc
corrected classpath handling in tool-unix.tmpl



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6782 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-15 16:59:10 +00:00
spoon aee0ec096c In the scalaint script, define scala.boot.class.path .
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6781 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-15 16:57:15 +00:00
michelou d303223e7b propagate property 'version.number' to all dependencies
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6762 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-14 23:54:05 +00:00
michelou 83d94218b1 added '-' in property 'time.short' to be sbaz friendly
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6759 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-14 20:55:42 +00:00
spoon 7461ef79b7 fix the classpath for the "quick" scalaint script
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6731 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-13 12:03:04 +00:00
dubochet 304d0d48c3 Reverted back Stephane's incorrect changes to the versioning scheme. It needs to REMAIN THAT WAY to be compatible with SBaz.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6728 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-13 10:36:32 +00:00
michelou 9d5bb419c7 uses major/minor/patch versions before incrementing them
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6722 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-12 22:35:28 +00:00
michelou 95a10b4198 corrected missing path conversion on Cygwin for file 'generic-unix.tmpl'
added handling of option '-cp/-classpath' in file 'tool-windows.tmpl'
use task <copy> instead of <symlink> on Windows in file 'build.xml'



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6693 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-11 18:13:53 +00:00
dubochet 3c4e90560d Fixed some distribution-related build dependencies and improved the way devel, patch and minor distributions can be requested. Updated README to match current build script.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6653 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-09 15:16:53 +00:00
michelou f0f520ec0e added directory 'examples' to generated distribution
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6648 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-09 14:13:01 +00:00
dubochet 09589be99b Updated SABBUS to:
1. Generate better local distributions, same layout as a sbaz-managed directory. 
2. Consolidate Sbaz packages into a smaller set. Compatibility packages are also generated. 
3. Added number management (triggered by 'release' property). 
4. Scaladoc HTML documentation is now part of the distribution. 
5. Target 'docs.compiler' generates HTML documentation for compiler. 
6. FJBG is now insert into 'scala-compiler.jar' archive for distribution.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6638 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-08 21:37:50 +00:00
dubochet fc02f5427c Added a Scaladoc ant task and extended SABBUS to use it.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6632 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-08 16:29:16 +00:00
michelou 8a89650451 removed task 'examples' from build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6631 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-08 15:56:20 +00:00
michelou 0531efdbb7 added generation of 'scaladoc' command
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6625 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-08 10:08:40 +00:00
michelou a144685c6b changed version numbering
added Ant task 'examples'



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6619 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-07 16:42:36 +00:00
dubochet e06ba19bf3 Corrected clean-dependencies in SABBUS, cleaned-up style, plus various detail improvements.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5893 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-06 14:12:09 +00:00
michelou 80f843e4c2 also prints out hostname and OS in log file build.timers
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5891 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-06 12:14:04 +00:00
dubochet 112b107b77 Remove files that were not required for compilation. Clean ignore patterns.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5887 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-03 17:28:53 +00:00
mihaylov 743750f1a7 Use 'mixin class' instead of 'trait'
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5883 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-03 14:32:42 +00:00
michelou 2613f9c708 changed way to generate 'version.number' property,
added timers for locker, quick and strap phases



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5877 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-03-02 14:01:45 +00:00
spoon f263205894 be more tolerant of svnversion's output
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5863 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-27 16:38:50 +00:00
dubochet fca405c64f SABBUS is now less verbose by default.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5861 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-27 14:03:57 +00:00
michelou 7b7bf6bf11 version number now ends with svn revision number
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5846 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-24 18:04:17 +00:00
spoon 0c79e7d55a - generate a wrapper for scalaint
- renamed sbp files without the "2" (scala vs. scala2, etc.)


git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5795 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-20 03:03:23 +00:00
michelou 8c812563f0 renamed 'scala*2' to 'scala*' in Ant file build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5769 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-16 09:43:31 +00:00
dubochet e1105bc5c3 Updated SABBUS to provide more information about the environment in which it is running.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5741 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-10 18:19:09 +00:00
michelou 8dbc0952c6 - prints out Java environment when executing build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5732 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-10 14:12:49 +00:00
spoon 775cb95a6b Make the scalac2 sbaz package depend on scalac2-support
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5705 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-02-03 15:13:42 +00:00
dubochet a1e46fe89d Corrected a classpath problem in the generated scripts in 'build/'.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5666 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-30 16:57:38 +00:00
dubochet 3c83163cf0 Removed the '-client' flag in the run scripts: it wasn't helpful after all.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5658 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-30 10:05:19 +00:00
michelou b9a575f621 - corrected value of nsc.excludes in file build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5640 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-26 12:39:54 +00:00
dubochet e0524c377a Scala now only works in client mode: server mode is too buggy for Scala.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5638 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-26 10:24:12 +00:00
dubochet 76ba4c3c7e Fixed some details in SABBUS so that it works flawlessly (hopefully).
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5613 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-20 16:38:11 +00:00
dubochet 8e372f3cb2 Mmmh, SABBUS wasn't working after all. Now it should.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5611 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-20 16:18:24 +00:00
dubochet 3727c6708f Updated a rather improved version of SABBUS which takes care of dependencies much better. Have a look at the updated README file for details.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5610 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-20 16:15:13 +00:00
dubochet 992c0eebc4 Updated Scalac to support a mode (triggered by setting 'scalacdebugging' to true) that prints the compiled files and any stack trace generated by the compiler.
Use it in SABBUS for quick and strap.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5583 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-19 15:32:26 +00:00
spoon 233eea8ad3 Three things to be friendly with Scala Bazaars:
1. Generate three sbp packages, not just one
  2. Fix the name of the bin scripts, e.g. scala22 --> scala2
  3. Do not include a Main-Class in the scalac jar file


git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5582 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-19 15:22:54 +00:00
dubochet 9f2e3501e6 Changed the product name in SABBUS to 'scala2'.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5578 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-19 09:52:23 +00:00
dubochet c5f3ec19a4 Added the Scala Bazaar archive generation Ant task. Modified the SABBUS build script to use it.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5575 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-19 09:35:35 +00:00