Skip to content

Faster build 2.10 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,15 @@ TODO:
<!-- BND support -->
<typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />

<artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/>

<!-- 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.use.released"/><then>
<echo message="Using Scala ${starr.version} for STARR."/>
<artifact:dependencies pathId="starr.core.path">
<artifact:remoteRepository refid="extra-repo"/>
<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}"/>
Expand Down Expand Up @@ -416,6 +419,17 @@ TODO:
<echo message=" OSGi version: ${osgi.version.number}" />
<echo message="canonical version: ${version.number}" />

<echoproperties destfile="buildcharacter.properties">
<propertyset>
<propertyref regex="time.*" />
<propertyref regex="git.*" />
<propertyref name="java.vm.name" />
<propertyref regex=".*version.*" />
<propertyref regex="scalac.args.*" />
<propertyref name="scalacfork.jvmargs" />
</propertyset>
</echoproperties>

<!-- validate version suffixes -->
<if><equals arg1="${maven.version.suffix}" arg2="-SNAPSHOT"/><then>
<condition property="version.suffixes.consistent"><and>
Expand Down
20 changes: 20 additions & 0 deletions src/build/maven/maven-deploy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,21 @@
</sequential>
</macrodef>

<!-- IDE needs swing/actors/continuations -->
<macrodef name="deploy-remote-core">
<attribute name="repository" />
<attribute name="version" />
<sequential>
<deploy-remote name="scala-library" version="@{version}" repository="@{repository}"/>
<deploy-remote name="scala-reflect" version="@{version}" repository="@{repository}"/>
<deploy-remote name="scala-compiler" version="@{version}" repository="@{repository}" />
<deploy-remote name="jline" version="@{version}" repository="@{repository}"/>
<deploy-remote name="scala-swing" version="@{version}" repository="@{repository}"/>
<deploy-remote name="scala-actors" version="@{version}" repository="@{repository}"/>
<deploy-remote-plugin name="continuations" version="@{version}" repository="@{repository}"/>
</sequential>
</macrodef>

<!-- PGP Signed deployment -->
<macrodef name="deploy-remote-signed-single">
<attribute name="pom" />
Expand Down Expand Up @@ -268,6 +283,11 @@
<deploy-remote-all version="${maven.version.number}" repository="${remote.snapshot.repository}" />
</target>

<!-- for PR validation -->
<target name="deploy-core.snapshot" depends="deploy.remote.init">
<deploy-remote-core version="${maven.version.number}" repository="${remote.snapshot.repository}" />
</target>

<target name="deploy.release" depends="deploy.remote.init" unless="version.is.snapshot" description="Deploys the bundled files as a release into the desired remote Maven repository">
<deploy-remote-all version="${maven.version.number}" repository="${remote.release.repository}" />
</target>
Expand Down