diff options
| author | Antonio Cunei <antonio.cunei@typesafe.com> | 2014-01-22 00:49:45 +0100 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@typesafe.com> | 2014-01-22 02:02:30 +0100 |
| commit | b48c706219f33e51d7d7dd031915da66f9ddecfb (patch) | |
| tree | ceedffc089d38c9a2cd74104cf80bc8b0f5d9520 /build-ant-macros.xml | |
| parent | 115cd16aca35c8b4000b86f4affd4df243202fd2 (diff) | |
| download | scala-b48c706219f33e51d7d7dd031915da66f9ddecfb.tar.gz scala-b48c706219f33e51d7d7dd031915da66f9ddecfb.tar.bz2 scala-b48c706219f33e51d7d7dd031915da66f9ddecfb.zip | |
Add cross suffix customizability for modules
For each module whose version can be specified using
the property "xxx.version.number", it is now possible
to specify its cross version suffix by using an
optional property "xxx.cross.suffix".
If such a property is not defined, then continue to
use the string "_${scala.binary.version}", as before.
Diffstat (limited to 'build-ant-macros.xml')
| -rw-r--r-- | build-ant-macros.xml | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index 0b92f1dab1..458d1014c2 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -23,15 +23,35 @@ </sequential> </macrodef> + <!-- Set a property @{name}.cross to the actual cross suffix that should be + used when resolving the module "@{name}". If the (user-supplied) + @{name}.cross.suffix property exists then use that value, otherwise use + "_${scala.binary.version}". --> + <macrodef name="prepareCross"> + <attribute name="name" /> + <sequential> + <if> + <isset property="@{name}.cross.suffix" /> + <then> + <property name="@{name}.cross" value="${@{name}.cross.suffix}" /> + </then> + <else> + <property name="@{name}.cross" value="_${scala.binary.version}" /> + </else> + </if> + </sequential> + </macrodef> + <!-- Set property named @{name} to the jar resolved as @{jar}_${scala.binary.version}:jar. @{jar}_${scala.binary.version} must be a maven dependency. --> <macrodef name="propertyForCrossedArtifact"> <attribute name="name"/> <attribute name="jar"/> + <attribute name="suffix" default="${@{name}.cross}"/> <sequential> - <readProperty name="@{name}" property="@{jar}_${scala.binary.version}:jar"/> - <readProperty name="@{name}-sources" property="@{jar}_${scala.binary.version}:java-source:sources"/> - <readProperty name="@{name}-javadoc" property="@{jar}_${scala.binary.version}:java-source:javadoc"/> + <readProperty name="@{name}" property="@{jar}@{suffix}:jar"/> + <readProperty name="@{name}-sources" property="@{jar}@{suffix}:java-source:sources"/> + <readProperty name="@{name}-javadoc" property="@{jar}@{suffix}:java-source:javadoc"/> </sequential> </macrodef> |