fixed OSGi version number

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@11064 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou 2007-05-16 12:56:00 +00:00
parent 1059953f4e
commit 4ace1792ad
1 changed files with 9 additions and 2 deletions

View File

@ -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=&#34;${version.number}&#34;"/>
<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=&#34;${osgi.version.number}&#34;"/>
<attribute name="Import-Package" value="javax.xml.parsers, org.xml.sax, org.xml.sax.helpers"/>
<attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
</manifest>