Commit Graph

98 Commits

Author SHA1 Message Date
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
dubochet dd5f16778b The build file only creates symbolic links on UNIX platforms, copies otherwise.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5507 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-12 09:55:02 +00:00
dubochet a5c72ef870 The Scalac Ant task now supports a 'addparams' parameter for passing custom parameters to the compiler. Build script updated to use it too: set nsc.params to add custom parameters.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5485 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-09 18:28:11 +00:00
dubochet 3f498a8b93 Improved the ScalaTool Ant task to be more cross-platform.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5478 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-09 17:19:23 +00:00
dubochet 7e9d82c77c Updated the Ant build system:
1. Minor aesthetic changes to Scalac.
2. Added Ant task ScalaTool that automatically constructs wrappers for a tool. Wrapper templates are in ant/templates.
3. Modified build.xml to use ScalaTool.
4. Removed nsc/ant/NSC which is now obsolete (replaced by ant/Scalac).
5. Added a antlib.xml file that allows to load all ant tasks in one operation in an ant script.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5469 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-09 13:07:02 +00:00
dubochet 98ec0e162b Modified the generation of scripts in build/ to work when linked to from a symbolic link.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5448 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2006-01-04 16:57:36 +00:00
dubochet 2511ab5dbc 1. Moved the Scalac Ant task to a new location and updated it thorougly.
2. Modified the build script to use the new optional Ant tasks that have been added to 'lib/', which is much cleaner.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5410 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-23 18:17:24 +00:00
michelou 94cfad1f62 - added properties 'os.win', 'os.cygwin' and 'os.unix'
- Task 'symlink' is now called only if 'os.unix' is set



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5408 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-22 18:21:56 +00:00
michelou ad6290fab9 - corrected generation of executables for Cygwin and Windows
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5406 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-22 01:50:44 +00:00
dubochet faca6374b5 1. Modified the way paths are used in NSC. Removed as much magic as possible from 'util.ClassPath' and 'nsc.Settings'.
2. Improved the generation of a distribution.
3. 'scalanstest' works again.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5402 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-21 20:31:59 +00:00
dubochet 204fef47fc 1. Changed the generated scripts for UNIX so that they actually work.
2. Removed dead text in ant/NSC.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5397 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-20 13:43:47 +00:00
dubochet 840ec80d10 1. 'build.xml' now generates a simplified distribution.
2. Scripts no longer use the wrapper script but are self-contained.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5394 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-19 17:17:19 +00:00
dubochet f677c469bd Switching to the new build system and to the new build system. This is a MAJOR commit, so be careful when updating.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5390 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-19 13:49:03 +00:00
michelou 1c5f9fb0f3 - added missing package 'reflect'
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5374 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-16 19:53:23 +00:00
dubochet b20732db7d - NSC ant task updated to compile with NSC
- Build script now compiles it with NSC


git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5057 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-13 17:42:57 +00:00
michelou 63784272af - corrected typo in task 'distrib.cygwin'
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5042 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-09 23:59:05 +00:00
odersky fb95208bf3 *** empty log message ***
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5040 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-09 18:57:00 +00:00
odersky 6a4e8d3cd4 *** empty log message ***
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5039 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-09 18:55:10 +00:00
michelou 8d9dedea0f - added property 'os.cygwin'
- added task 'distrib.cygwin'


git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5037 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-09 18:16:39 +00:00
michelou 38a871c7fa - removed old Scala jars from TOOLS_CPATH's value
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5030 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-12-07 14:46:10 +00:00
dubochet 141861d4be SCABBUS now also supports the "print" option.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4994 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-30 17:16:11 +00:00
dragos deda4d5dbf Added local variable debugging information in the jvm backend, and corresponding options in the ant task.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4991 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-30 16:31:54 +00:00
emir ec8df32932 cleaned up main
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4940 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-18 14:58:59 +00:00
dubochet 35dc17990b At last: the annoying two files that build.pico.nslib was rebuilding everytime now no longer are.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4914 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-15 16:47:34 +00:00
dubochet 2d2bbe3dab New JARs now overwrite old ones instead of merely updating them.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4906 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-13 14:29:06 +00:00
michelou e760834ead - added creation of md5 checksums.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4899 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-09 17:06:48 +00:00
dubochet 37926e1320 Added check in doc to see whether the required classes are available.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4878 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-05 22:19:45 +00:00
dubochet c5dfb2f8d0 skip.nsc can be used when building a non-working version of nsc.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4868 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-04 16:43:49 +00:00
dubochet 16ae4e01a5 Changed path to use config instead of build.support.
test target now simply runs the test script.


git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4858 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-03 18:14:53 +00:00
dubochet 43939fde6e Corrected more error message for IzPack.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4856 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-03 17:24:48 +00:00
dubochet a12f6c5b06 Corrected error message for IzPack.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4855 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-03 17:07:01 +00:00
dubochet 5e3cb812e5 IzPack now works with a non-patched distribution.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4846 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-03 13:16:26 +00:00
dubochet d68a5829fc Updated files for new directory structure.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4844 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-03 10:10:34 +00:00
dubochet 3494c6c3f7 Better support for names of executables and the distribution itself.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4836 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-02 18:04:19 +00:00
dubochet 2fbe3547b9 Bug correction: When the docs.skip flag was used, distrib was broken.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@4833 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2005-11-02 17:34:59 +00:00