Skip to content

Loading…

some more build fixes #2359

Merged
merged 3 commits into from

2 participants

@adriaanm
The Scala Programming Language member

now i'm really-really done

really

review by @paulp


ps: for those who skim commit messages, today's protip says:

I recommend creating a build.properties file as follows:

locker.skip=1
starr.use.released=1

This will download the Scala version specified in starr.number,
use it to build quick, skipping locker.

adriaanm added some commits
@adriaanm adriaanm make quick.done depend on quick.bin again 7184bd3
@adriaanm adriaanm assume build.release when maven.version.suffix is set 3fe2e86
@adriaanm adriaanm if starr.use.released fetch Scala ${starr.version} for STARR
I recommend creating a build.properties file as follows:

```
locker.skip=1
starr.use.released=1
```

This will download the Scala version specified in starr.number,
use it to build quick, skipping locker.
dc3fa0a
@paulp

LGTM, but I think I've gone xml-blind.

@paulp paulp merged commit 53e031f into scala:2.10.x

1 check passed

Details default pr-checkin-per-commit Took 68 min.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 5, 2013
  1. @adriaanm
  2. @adriaanm
  3. @adriaanm

    if starr.use.released fetch Scala ${starr.version} for STARR

    adriaanm committed
    I recommend creating a build.properties file as follows:
    
    ```
    locker.skip=1
    starr.use.released=1
    ```
    
    This will download the Scala version specified in starr.number,
    use it to build quick, skipping locker.
This page is out of date. Refresh to see the latest.
Showing with 35 additions and 26 deletions.
  1. +35 −26 build.xml
View
61 build.xml
@@ -5,6 +5,14 @@
SuperSabbus for Scala core, builds the scala library and compiler. It can also package it as a simple distribution, tests it for stable bootstrapping and against the Scala test suite.
</description>
+<!-- HINTS
+
+ - for faster builds, have a build.properties in the same directory as build.xml that says:
+ locker.skip=1
+ starr.use.released=1
+
+-->
+
<!-- USAGE FROM JENKINS SCRIPTS IS (CURRENTLY) AS FOLLOWS:
ant $antArgs $scalacArgs $targets
@@ -16,14 +24,12 @@ scalacArgs examples:
"-Dscalac.args=\"-Yrangepos\" -Dpartest.scalac_opts=\"-Yrangepos\""
targets exercised:
- build-opt nightly test.suite test.continuations.suite test.scaladoc locker.done
+ locker.done build-opt nightly test.suite test.continuations.suite test.scaladoc
-->
<!-- 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 needs compiler jars)
-->
<!--
@@ -104,9 +110,13 @@ TODO:
<!-- Loads custom properties definitions -->
<property file="${basedir}/build.properties"/>
+
<!-- Generating version number -->
<property file="${basedir}/build.number"/>
+ <!-- read starr.version -->
+ <property file="${basedir}/starr.number"/>
+
<!-- Sets location of pre-compiled libraries -->
<property name="library.starr.jar" value="${lib.dir}/scala-library.jar"/>
<property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/>
@@ -219,15 +229,24 @@ TODO:
<!-- BND support -->
<typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
- <!-- Download STARR via maven if `starr.version` is specified.
+ <!-- Download STARR via maven if `starr.use.released` is set,
+ and `starr.version` is specified (see the starr.number properties file).
Want to slow down STARR changes, using only released versions. -->
- <if><isset property="starr.version"/><then>
+ <if><isset property="starr.use.released"/><then>
+ <echo message="Using Scala ${starr.version} for STARR."/>
<artifact:dependencies pathId="starr.core.path">
<dependency groupId="org.scala-lang" artifactId="scala-library" version="${starr.version}"/>
<dependency groupId="org.scala-lang" artifactId="scala-reflect" version="${starr.version}"/>
<dependency groupId="org.scala-lang" artifactId="scala-compiler" version="${starr.version}"/>
- </artifact:dependencies>
- </then></if>
+ </artifact:dependencies></then>
+ <else>
+ <path id="starr.core.path">
+ <pathelement location="${library.starr.jar}"/>
+ <pathelement location="${reflect.starr.jar}"/>
+ <pathelement location="${compiler.starr.jar}"/>
+ <pathelement location="${msil.starr.jar}"/>
+ </path></else>
+ </if>
<property name="maven-deps-done" value="yep!"/>
</then></if>
@@ -261,6 +280,10 @@ TODO:
<property name="maven.version.suffix" value="${version.suffix}"/>
<property name="osgi.version.suffix" value="${version.suffix}"/></else></if>
+ <!-- if a maven version suffix was set (or inferred), assume we're building a release -->
+ <if><isset property="maven.version.suffix"/><then>
+ <property name="build.release" value="1"/></then></if>
+
<!-- not building a release and no version.suffix specified -->
<property name="maven.version.suffix" value="-SNAPSHOT"/>
@@ -422,24 +445,10 @@ TODO:
<path refid="aux.libs"/>
</path>
- <!-- Download STARR (see above) via maven if `starr.version` is specified.
- Want to slow down STARR changes, using only released versions. -->
- <if><isset property="starr.version"/><then>
- <echo message="Using Scala ${starr.version} for STARR."/>
- <!-- <echo message="STARR classpath: ${ant.refid:starr.compiler.path}"/> -->
- </then><else>
- <path id="starr.core.path">
- <pathelement location="${library.starr.jar}"/>
- <pathelement location="${reflect.starr.jar}"/>
- <pathelement location="${compiler.starr.jar}"/>
- <pathelement location="${msil.starr.jar}"/>
- </path>
- </else></if>
-
- <!-- Skip locker with -Dlocker.skip=YESSIR. Uses STARR instead. -->
+ <!-- To skip locker, use -Dlocker.skip=1 -->
<if><isset property="locker.skip"/><then>
- <echo message="Skipping locker! Using STARR instead."/>
- <path id="locker.compiler.path"><path refid="starr.compiler.path"/></path>
+ <echo message="Using STARR to build the quick stage (skipping locker)."/>
+ <path id="locker.compiler.path" refid="starr.compiler.path"/>
<property name="locker.locked" value="locker skipped"/></then>
<else>
<path id="locker.compiler.path"><path refid="locker.compiler.build.path"/></path></else></if>
@@ -1178,11 +1187,11 @@ TODO:
</staged-uptodate>
</target>
- <target name="quick.bin" depends="init">
+ <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.scalacheck, quick.scalap, quick.swing, quick.plugins, quick.partest">
<staged-bin stage="quick" classpathref="quick.bin.tool.path"/>
</target>
- <target name="quick.done" depends="quick.lib, quick.reflect, quick.comp, quick.scalacheck, quick.scalap, quick.swing, quick.plugins, quick.partest, quick.bin"/>
+ <target name="quick.done" depends="quick.bin"/>
<target name="quick-opt" description="Optimized version of quick.done."> <optimized name="quick.done"/></target>
Something went wrong with that request. Please try again.