Skip to content

Commit

Permalink
Formatting. Introduce {asm,forkjoin,fjbg}-classes props.
Browse files Browse the repository at this point in the history
  • Loading branch information
@adriaanm
adriaanm committed Mar 26, 2013
1 parent 3bb1af9 commit d85c3f1
Showing 1 changed file with 79 additions and 74 deletions.
153 changes: 79 additions & 74 deletions build.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -74,64 +74,66 @@ targets exercised:


<property environment="env"/> <property environment="env"/>
<!-- Prevents system classpath from being used --> <!-- Prevents system classpath from being used -->
<property name="build.sysclasspath" value="ignore"/> <property name="build.sysclasspath" value="ignore"/>


<!-- Defines the repository layout --> <!-- Defines the repository layout -->
<property name="docs.dir" value="${basedir}/docs"/> <property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/> <property name="lib.dir" value="${basedir}/lib"/>
<property name="src.dir" value="${basedir}/src"/> <property name="src.dir" value="${basedir}/src"/>
<property name="partest.dir" value="${basedir}/test"/> <property name="partest.dir" value="${basedir}/test"/>


<property name="lib-ant.dir" value="${lib.dir}/ant"/> <property name="lib-ant.dir" value="${lib.dir}/ant"/>
<!-- For developers: any jars placed in this dir will be added to the classpath <!-- For developers: any jars placed in this dir will be added to the classpath
of all targets and copied into quick/pack/etc builds. --> of all targets and copied into quick/pack/etc builds. -->
<property name="lib-extra.dir" value="${lib.dir}/extra"/> <property name="lib-extra.dir" value="${lib.dir}/extra"/>


<!-- Loads custom properties definitions --> <!-- Loads custom properties definitions -->
<property file="${basedir}/build.properties"/> <property file="${basedir}/build.properties"/>
<!-- Generating version number --> <!-- Generating version number -->
<property file="${basedir}/build.number"/> <property file="${basedir}/build.number"/>


<!-- Sets location of pre-compiled libraries --> <!-- Sets location of pre-compiled libraries -->
<property name="library.starr.jar" value="${lib.dir}/scala-library.jar"/> <property name="library.starr.jar" value="${lib.dir}/scala-library.jar"/>
<property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/> <property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/>
<property name="compiler.starr.jar" value="${lib.dir}/scala-compiler.jar"/> <property name="compiler.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
<property name="msil.starr.jar" value="${lib.dir}/msil.jar"/> <property name="msil.starr.jar" value="${lib.dir}/msil.jar"/>
<property name="jline.jar" value="${lib.dir}/jline.jar"/> <property name="jline.jar" value="${lib.dir}/jline.jar"/>
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
<property name="scalacheck.jar" value="${lib.dir}/scalacheck.jar"/> <property name="scalacheck.jar" value="${lib.dir}/scalacheck.jar"/>


<!-- Sets location of build folders --> <!-- Sets location of build folders -->
<property name="build.dir" value="${basedir}/build"/> <property name="build.dir" value="${basedir}/build"/>
<property name="build-asm.dir" value="${build.dir}/asm"/> <property name="build-libs.dir" value="${build.dir}/libs"/>
<property name="build-locker.dir" value="${build.dir}/locker"/> <property name="build-asm.dir" value="${build.dir}/asm"/>
<property name="build-palo.dir" value="${build.dir}/palo"/> <property name="build-fjbg.dir" value="${build-libs.dir}"/>
<property name="build-quick.dir" value="${build.dir}/quick"/> <property name="build-forkjoin.dir" value="${build-libs.dir}"/>
<property name="build-pack.dir" value="${build.dir}/pack"/> <property name="build-locker.dir" value="${build.dir}/locker"/>
<property name="build-osgi.dir" value="${build.dir}/osgi"/> <property name="build-palo.dir" value="${build.dir}/palo"/>
<property name="build-strap.dir" value="${build.dir}/strap"/> <property name="build-quick.dir" value="${build.dir}/quick"/>
<property name="build-docs.dir" value="${build.dir}/scaladoc"/> <property name="build-pack.dir" value="${build.dir}/pack"/>
<property name="build-libs.dir" value="${build.dir}/libs"/> <property name="build-osgi.dir" value="${build.dir}/osgi"/>
<property name="build-sbt.dir" value="${build.dir}/sbt-interface"/> <property name="build-strap.dir" value="${build.dir}/strap"/>

<property name="build-docs.dir" value="${build.dir}/scaladoc"/>
<property name="test.osgi.src" value="${partest.dir}/osgi/src"/> <property name="build-sbt.dir" value="${build.dir}/sbt-interface"/>
<property name="test.osgi.classes" value="${build-osgi.dir}/classes"/>

<property name="test.osgi.src" value="${partest.dir}/osgi/src"/>
<property name="dists.dir" value="${basedir}/dists"/> <property name="test.osgi.classes" value="${build-osgi.dir}/classes"/>


<property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/> <property name="dists.dir" value="${basedir}/dists"/>
<property name="partest.version.number" value="0.9.2"/>
<property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/>
<property name="partest.version.number" value="0.9.2"/>


<!-- These are NOT the flags used to run SuperSabbus, but the ones written <!-- These are NOT the flags used to run SuperSabbus, but the ones written
into the script runners created with scala.tools.ant.ScalaTool --> into the script runners created with scala.tools.ant.ScalaTool -->
<property name="java.flags" value="-Xmx256M -Xms32M"/> <property name="java.flags" value="-Xmx256M -Xms32M"/>
<property name="jvm.opts" value=""/> <property name="jvm.opts" value=""/>


<!-- if ANT_OPTS is already set by the environment, it will be unaltered, <!-- if ANT_OPTS is already set by the environment, it will be unaltered,
but if it is unset it will take this default value. --> but if it is unset it will take this default value. -->
<property name="env.ANT_OPTS" value="-Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC" /> <property name="env.ANT_OPTS" value="-Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=192M -XX:+UseParallelGC" />


<property name="scalacfork.jvmargs" value="${env.ANT_OPTS} ${jvm.opts}"/> <property name="scalacfork.jvmargs" value="${env.ANT_OPTS} ${jvm.opts}"/>


<!-- =========================================================================== <!-- ===========================================================================
INITIALIZATION INITIALIZATION
Expand Down Expand Up @@ -211,7 +213,7 @@ targets exercised:
</artifact:dependencies> </artifact:dependencies>
</then></if> </then></if>


<property name="maven-deps-done" value="yep!"/> <property name="maven-deps-done" value="yep!"/>
</then></if> </then></if>


<!-- NOTE: ant properties are write-once: second writes are silently discarded; the logic below relies on this --> <!-- NOTE: ant properties are write-once: second writes are silently discarded; the logic below relies on this -->
Expand All @@ -228,30 +230,30 @@ targets exercised:
- `version.suffix == maven.version.suffix == ""` - `version.suffix == maven.version.suffix == ""`
--> -->
<if><not><equals arg1="${version.bnum}" arg2="0"/></not><then> <if><not><equals arg1="${version.bnum}" arg2="0"/></not><then>
<property name="version.suffix" value="-${version.bnum}"/> <property name="version.suffix" value="-${version.bnum}"/>
</then></if> </then></if>


<if><or><not><isset property="version.suffix"/></not><equals arg1="${version.suffix}" arg2=""/></or><then> <if><or><not><isset property="version.suffix"/></not><equals arg1="${version.suffix}" arg2=""/></or><then>
<if><isset property="build.release"/><then> <if><isset property="build.release"/><then>
<property name="maven.version.suffix" value=""/> <property name="maven.version.suffix" value=""/>
<property name="version.suffix" value="${maven.version.suffix}"/> <property name="version.suffix" value="${maven.version.suffix}"/>
<if><equals arg1="${maven.version.suffix}" arg2=""/><then> <if><equals arg1="${maven.version.suffix}" arg2=""/><then>
<property name="osgi.version.suffix" value="-VFINAL"/></then> <property name="osgi.version.suffix" value="-VFINAL"/></then>
<else> <else>
<property name="osgi.version.suffix" value="${maven.version.suffix}"/></else></if></then></if></then> <property name="osgi.version.suffix" value="${maven.version.suffix}"/></else></if></then></if></then>
<else> <!-- version.suffix set and not empty --> <else> <!-- version.suffix set and not empty -->
<property name="maven.version.suffix" value="${version.suffix}"/> <property name="maven.version.suffix" value="${version.suffix}"/>
<property name="osgi.version.suffix" value="${version.suffix}"/></else></if> <property name="osgi.version.suffix" value="${version.suffix}"/></else></if>


<!-- not building a release and no version.suffix specified --> <!-- not building a release and no version.suffix specified -->
<property name="maven.version.suffix" value="-SNAPSHOT"/> <property name="maven.version.suffix" value="-SNAPSHOT"/>


<if><equals arg1="${maven.version.suffix}" arg2="-SNAPSHOT"/><then> <if><equals arg1="${maven.version.suffix}" arg2="-SNAPSHOT"/><then>
<property name="osgi.version.suffix" value=""/> <property name="osgi.version.suffix" value=""/>
<property name="version.suffix" value=""/></then> <property name="version.suffix" value=""/></then>
<else> <else>
<property name="osgi.version.suffix" value="${maven.version.suffix}"/> <property name="osgi.version.suffix" value="${maven.version.suffix}"/>
<property name="version.suffix" value="${maven.version.suffix}"/></else></if> <property name="version.suffix" value="${maven.version.suffix}"/></else></if>




<exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" /> <exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" />
Expand All @@ -268,8 +270,8 @@ targets exercised:
</exec> </exec>


<!-- some default in case something went wrong getting the revision --> <!-- some default in case something went wrong getting the revision -->
<property name="git.commit.sha" value="unknown"/> <property name="git.commit.sha" value="unknown"/>
<property name="git.commit.date" value="unknown"/> <property name="git.commit.date" value="unknown"/>


<!-- We use the git describe to determine the OSGi modifier for our build. --> <!-- We use the git describe to determine the OSGi modifier for our build. -->
<property name="maven.version.number" <property name="maven.version.number"
Expand All @@ -278,9 +280,9 @@ targets exercised:
value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${osgi.version.suffix}-${git.commit.sha}"/> value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${osgi.version.suffix}-${git.commit.sha}"/>


<if><isset property="build.release"/><then> <if><isset property="build.release"/><then>
<property name="version.number" value="${maven.version.number}"/> <property name="version.number" value="${maven.version.number}"/>
</then><else> </then><else>
<property name="version.number" value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/> <property name="version.number" value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/>
</else></if> </else></if>


<condition property="has.java6"> <condition property="has.java6">
Expand All @@ -306,27 +308,27 @@ targets exercised:
</then></if> </then></if>


<!-- Allow this to be overridden simply --> <!-- Allow this to be overridden simply -->
<property name="sbt.latest.version" value="0.12.2"/> <property name="sbt.latest.version" value="0.12.2"/>


<property name="sbt.src.dir" value="${build-sbt.dir}/${sbt.latest.version}/src"/> <property name="sbt.src.dir" value="${build-sbt.dir}/${sbt.latest.version}/src"/>
<property name="sbt.lib.dir" value="${build-sbt.dir}/${sbt.latest.version}/lib"/> <property name="sbt.lib.dir" value="${build-sbt.dir}/${sbt.latest.version}/lib"/>


<property name="sbt.interface.jar" value="${sbt.lib.dir}/interface.jar"/> <property name="sbt.interface.jar" value="${sbt.lib.dir}/interface.jar"/>
<property name="sbt.interface.url" value="http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/> <property name="sbt.interface.url" value="http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/>
<property name="sbt.interface.src.jar" value="${sbt.src.dir}/compiler-interface-src.jar"/> <property name="sbt.interface.src.jar" value="${sbt.src.dir}/compiler-interface-src.jar"/>
<property name="sbt.interface.src.url" value="http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/${sbt.latest.version}/jars/compiler-interface-src.jar"/> <property name="sbt.interface.src.url" value="http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/${sbt.latest.version}/jars/compiler-interface-src.jar"/>




<!-- Additional command line arguments for scalac. They are added to all build targets --> <!-- Additional command line arguments for scalac. They are added to all build targets -->
<property name="scalac.args" value=""/> <property name="scalac.args" value=""/>
<property name="javac.args" value=""/> <property name="javac.args" value=""/>


<property name="scalac.args.always" value="" /> <property name="scalac.args.always" value="" />
<property name="scalac.args.optimise" value=""/> <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. --> <property name="scalac.args.optimise" value=""/> <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
<property name="scalac.args.all" value="${scalac.args.always} ${scalac.args} ${scalac.args.optimise}"/> <property name="scalac.args.all" value="${scalac.args.always} ${scalac.args} ${scalac.args.optimise}"/>
<property name="scalac.args.locker" value="${scalac.args.all}"/> <property name="scalac.args.locker" value="${scalac.args.all}"/>
<property name="scalac.args.quick" value="${scalac.args.all}"/> <property name="scalac.args.quick" value="${scalac.args.all}"/>
<property name="scalac.args.strap" value="${scalac.args.quick}"/> <property name="scalac.args.strap" value="${scalac.args.quick}"/>


<!-- This is the start time for the distribution --> <!-- This is the start time for the distribution -->
<tstamp prefix="time"> <tstamp prefix="time">
Expand All @@ -335,8 +337,8 @@ targets exercised:
</tstamp> </tstamp>


<!-- some default in case something went wrong getting the revision --> <!-- some default in case something went wrong getting the revision -->
<property name="version.number" value="-unknown-"/> <property name="version.number" value="-unknown-"/>
<property name="init.avail" value="yes"/> <property name="init.avail" value="yes"/>


<!-- Local libs (developer use.) --> <!-- Local libs (developer use.) -->
<mkdir dir="${lib-extra.dir}"/> <mkdir dir="${lib-extra.dir}"/>
Expand Down Expand Up @@ -390,7 +392,10 @@ targets exercised:


<path id="forkjoin.classpath" path="${build-libs.dir}/classes/forkjoin"/> <path id="forkjoin.classpath" path="${build-libs.dir}/classes/forkjoin"/>
<path id="fjbg.classpath" path="${build-libs.dir}/classes/fjbg"/> <path id="fjbg.classpath" path="${build-libs.dir}/classes/fjbg"/>
<path id="asm.classpath" path="${build-asm.dir}/classes/"/> <path id="asm.classpath" path="${build-asm.dir}/classes"/>
<property name="forkjoin-classes" refid="forkjoin.classpath"/>
<property name="fjbg-classes" refid="fjbg.classpath"/>
<property name="asm-classes" refid="asm.classpath"/>


<!-- Compilers to use for the various stages. <!-- Compilers to use for the various stages.
Expand Down Expand Up @@ -1085,7 +1090,7 @@ targets exercised:
<exclude name="scala/actors/**"/> <exclude name="scala/actors/**"/>
</fileset> </fileset>
<fileset dir="${build-quick.dir}/classes/continuations-library"/> <fileset dir="${build-quick.dir}/classes/continuations-library"/>
<fileset dir="${build-libs.dir}/classes/forkjoin"/> <fileset dir="${forkjoin-classes}"/>
</jar> </jar>
<jar whenmanifestonly="fail" destfile="${build-pack.dir}/lib/scala-actors.jar"> <jar whenmanifestonly="fail" destfile="${build-pack.dir}/lib/scala-actors.jar">
<fileset dir="${build-quick.dir}/classes/library"> <fileset dir="${build-quick.dir}/classes/library">
Expand Down Expand Up @@ -1118,8 +1123,8 @@ targets exercised:
<jar whenmanifestonly="fail" destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF"> <jar whenmanifestonly="fail" destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
<service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/> <service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/>
<fileset dir="${build-quick.dir}/classes/compiler"/> <fileset dir="${build-quick.dir}/classes/compiler"/>
<fileset dir="${build-asm.dir}/classes"/> <fileset dir="${asm-classes}"/>
<fileset dir="${build-libs.dir}/classes/fjbg"/> <fileset dir="${fjbg-classes}"/>
</jar> </jar>
<copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/> <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/>
<copy todir="${build-pack.dir}/lib"> <copy todir="${build-pack.dir}/lib">
Expand Down Expand Up @@ -1216,14 +1221,14 @@ targets exercised:
<mkdir dir="${build-palo.dir}/lib"/> <mkdir dir="${build-palo.dir}/lib"/>
<jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-library.jar"> <jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-library.jar">
<fileset dir="${build-locker.dir}/classes/library"/> <fileset dir="${build-locker.dir}/classes/library"/>
<fileset dir="${build-libs.dir}/classes/forkjoin"/> <fileset dir="${forkjoin-classes}"/>
</jar> </jar>
<jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-reflect.jar" manifest="${basedir}/META-INF/MANIFEST.MF" <jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-reflect.jar" manifest="${basedir}/META-INF/MANIFEST.MF"
basedir="${build-locker.dir}/classes/reflect"/> basedir="${build-locker.dir}/classes/reflect"/>
<jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-compiler.jar" manifest="${basedir}/META-INF/MANIFEST.MF"> <jar whenmanifestonly="fail" destfile="${build-palo.dir}/lib/scala-compiler.jar" manifest="${basedir}/META-INF/MANIFEST.MF">
<fileset dir="${build-locker.dir}/classes/compiler"/> <fileset dir="${build-locker.dir}/classes/compiler"/>
<fileset dir="${build-asm.dir}/classes/"/> <fileset dir="${asm-classes}"/>
<fileset dir="${build-libs.dir}/classes/fjbg"/> <fileset dir="${fjbg-classes}"/>
</jar> </jar>
<copy file="${jline.jar}" toDir="${build-palo.dir}/lib"/> <copy file="${jline.jar}" toDir="${build-palo.dir}/lib"/>
</target> </target>
Expand Down

0 comments on commit d85c3f1

Please sign in to comment.