Merge 2.10.x: #2346 edition #2347

Merged
merged 7 commits into from Apr 4, 2013
Commits on Apr 2, 2013
  1. @adriaanm
  2. @adriaanm

    Regularity for build.xml: 1 output dir / project

    adriaanm committed Apr 2, 2013
    Untangle actors, msil builds from library/compiler builds.
    For further regularity, always build java files.
    
    TODO: update IDE projects
  3. @adriaanm

    Preliminary support for zinc.

    adriaanm committed Apr 2, 2013
    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.
  4. @adriaanm

    formatting

    adriaanm committed Apr 2, 2013
  5. @adriaanm

    Merge 2.10.x into master

    adriaanm committed Apr 2, 2013
    Conflicts:
    	build.xml
Commits on Apr 3, 2013
  1. @adriaanm
  2. @adriaanm