diff options
| author | michelou <michelou@epfl.ch> | 2007-05-16 12:56:00 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-05-16 12:56:00 +0000 |
| commit | 73b2db5db4fc7316467b51299994b47065bde74d (patch) | |
| tree | aa6de487ddc4ae28b14551b49486c583b2d9b915 /build.xml | |
| parent | dfb90463874fdb27902d052c91e8db88cc19f0ce (diff) | |
| download | scala-73b2db5db4fc7316467b51299994b47065bde74d.tar.gz scala-73b2db5db4fc7316467b51299994b47065bde74d.tar.bz2 scala-73b2db5db4fc7316467b51299994b47065bde74d.zip | |
fixed OSGi version number
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1014,6 +1014,13 @@ GENERATES A DISTRIBUTION </section> </manifest> </jar> + <!-- version ::= major('.'minor('.'micro('.'qualifier)?)?)? --> + <!-- see http://www2.osgi.org/javadoc/r4/org/osgi/framework/Version.html --> + <propertyregex + property="osgi.version.number" input="${version.number}" + regexp="([^-]*)(-.*)?" select="\1" + /> + <echo level="verbose" message="OSGI version: ${osgi.version.number}"/> <jar destfile="${dist.current.dir}/lib/${lib.jar.name}"> <fileset dir="${strap.dir}/lib/library"/> <fileset dir="${strap.dir}/lib/actors"/> @@ -1034,10 +1041,10 @@ GENERATES A DISTRIBUTION <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-Name" value="Scala Library Bundle"/> <attribute name="Bundle-SymbolicName" value="scala_library"/> - <attribute name="Bundle-Version" value="${version.number}"/> + <attribute name="Bundle-Version" value="${osgi.version.number}"/> <attribute name="Bundle-Vendor" value="${vendor.name}"/> <!-- CAUTION! Do not remove superflous blanks (Ant bug) --> - <attribute name="Export-Package" value="scala, scala.actors, scala.actors.remote, scala.collection, scala.collection.immutable, scala.collection.jcl, scala.collection.mutable, scala.compat, scala.concurrent, scala.io, scala.mobile, scala.ref, scala.reflect, scala.runtime,scala.testing, scala.text, scala.util, scala.util.automata, scala.util.grammar, scala.util.logging, scala.util.parsing, scala.util.regexp, scala.xml,scala.xml.dtd, scala.xml.factory, scala.xml.parsing, scala.xml.path, scala.xml.pull, scala.xml.transform;version="${version.number}""/> + <attribute name="Export-Package" value="scala, scala.actors, scala.actors.remote, scala.collection, scala.collection.immutable, scala.collection.jcl, scala.collection.mutable, scala.compat, scala.concurrent, scala.io, scala.mobile, scala.ref, scala.reflect, scala.runtime,scala.testing, scala.text, scala.util, scala.util.automata, scala.util.grammar, scala.util.logging, scala.util.parsing, scala.util.regexp, scala.xml,scala.xml.dtd, scala.xml.factory, scala.xml.parsing, scala.xml.path, scala.xml.pull, scala.xml.transform;version="${osgi.version.number}""/> <attribute name="Import-Package" value="javax.xml.parsers, org.xml.sax, org.xml.sax.helpers"/> <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/> </manifest> |