diff options
| author | Martin Taal | 2012-10-23 11:57:53 +0000 |
|---|---|---|
| committer | Martin Taal | 2012-10-23 11:57:53 +0000 |
| commit | 9516e0e5abb4f720d6de936062992e322df95ad2 (patch) | |
| tree | c87bd95e714caddeff7fcaf12357ce5e4ae7b9ed /build | |
| parent | 09b372f6f62dc787d6520ad9d08c578017597212 (diff) | |
| download | org.eclipse.emf.teneo-9516e0e5abb4f720d6de936062992e322df95ad2.tar.gz org.eclipse.emf.teneo-9516e0e5abb4f720d6de936062992e322df95ad2.tar.xz org.eclipse.emf.teneo-9516e0e5abb4f720d6de936062992e322df95ad2.zip | |
Added version qualifier computation
Diffstat (limited to 'build')
3 files changed, 35 insertions, 2 deletions
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/ant_common.xml b/build/org.eclipse.emf.teneo.releng.buckminster/ant_common.xml index 09eebe5df..2852f2ce5 100755 --- a/build/org.eclipse.emf.teneo.releng.buckminster/ant_common.xml +++ b/build/org.eclipse.emf.teneo.releng.buckminster/ant_common.xml @@ -15,6 +15,37 @@ build setup: http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/build.xml?root=Tools_BUCKMINSTER&view=markup --> <project> + + <!-- + Computes the version qualifier on the basis of the filename of a generated jar file. + It is difficult to get this information directly from buckminster, therefore + computing it from a filename. + --> + <macrodef name="computeVersionQualifier"> + <attribute name="directory" /> + <attribute name="pattern" /> + <sequential> + + <path id="versionQualifierFileName.id"> + <fileset dir="@{directory}"> + <include name="@{pattern}" /> + </fileset> + </path> + + <property name="versionQualifierFileName" refid="versionQualifierFileName.id" /> + + <script language="javascript"> + <![CDATA[ + var lastIndex = versionQualifierFileName.lastIndexOf('.'); + var version = versionQualifierFileName.substring(0, lastIndex); + lastIndex = version.lastIndexOf('.'); + version = version.substring(lastIndex + 1); + project.setProperty('versionQualifier', version); + ]]> + </script> + </sequential> + </macrodef> + <!-- This macro executes the default application of an eclipse installation that resides in the folder ${buildtools}/@app --> diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/ant_maven.xml b/build/org.eclipse.emf.teneo.releng.buckminster/ant_maven.xml index 34d6169f3..4a04488dd 100755 --- a/build/org.eclipse.emf.teneo.releng.buckminster/ant_maven.xml +++ b/build/org.eclipse.emf.teneo.releng.buckminster/ant_maven.xml @@ -4,8 +4,8 @@ <macrodef name="teneo.maven"> <attribute name="name"/> <sequential> - <property name="mavenVersion" value="${teneo.version}-v${buildTimestamp}"/> - <property name="teneoVersion" value="${teneo.version}.v${buildTimestamp}"/> + <property name="mavenVersion" value="${teneo.version}-${versionQualifier}"/> + <property name="teneoVersion" value="${teneo.version}.${versionQualifier}"/> <property name="eclipse.jarFile" value="${rootPath}/output/@{name}_${teneo.version}-osgi.bundle/jar/@{name}_${teneoVersion}.jar"/> <property name="eclipse.sourceJarFile" value="${rootPath}/output/@{name}_${teneo.version}-osgi.bundle/source.jar/@{name}.source_${teneoVersion}.jar"/> <property name="maven.jarFile" value="${mavenPath}/@{name}-${mavenVersion}.jar"/> diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml index f28b8dd85..b62c2c862 100755 --- a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml +++ b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml @@ -100,6 +100,8 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu <echo message="Testing" /> <ant dir="${basedir}/test" antfile="teneo_test.xml" target="run" inheritRefs="true" /> + <computeVersionQualifier directory="${rootPath}/output/org.eclipse.emf.teneo_${teneo.version}-osgi.bundle/jar" pattern="org.eclipse.emf.teneo*.jar"/> + <echo message="Building maven" /> <teneo.maven name="org.eclipse.emf.teneo"/> <teneo.maven name="org.eclipse.emf.teneo.annotations"/> |