updated OSGi manifest headers

1 files changed, 28 insertions, 10 deletions

diff --git a/build.xml b/build.xml
index 8405b073d5..0d7ba9dcbc 100644
--- a/build.xml
+++ b/build.xml
@@ -994,6 +994,14 @@ GENERATES A DISTRIBUTION
     <mkdir dir="${dist.current.dir}"/>
   <!-- Copy all requires libraries -->
     <mkdir dir="${dist.current.dir}/lib"/>
+    <property name="ant.version.number" value="[1.6"/>
+    <!-- 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/${comp.jar.name}">
       <fileset dir="${strap.dir}/lib/compiler"/>
       <zipfileset src="${fjbg.jar}"/>
@@ -1012,15 +1020,17 @@ GENERATES A DISTRIBUTION
           <attribute name="Implementation-Version" value="${version.number}"/>
           <attribute name="Implementation-Vendor" value="${vendor.name}"/>
         </section>
+        <attribute name="Bundle-DocURL" value="http://www.scala-lang.org/"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="Scala Compiler Bundle"/>
+        <attribute name="Bundle-SymbolicName" value="scala_compiler"/>
+        <attribute name="Bundle-Version" value="${osgi.version.number}"/>
+        <attribute name="Bundle-Vendor" value="${vendor.name}"/>
+        <attribute name="Export-Package" value="scala.tools.ant;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.ast;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.ast.parser;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.backend;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.doc;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.io;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.matching;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.models;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.symtab;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.symtab.classfile;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.symtab.clr;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.transform;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.typechecker;version=&#34;${osgi.version.number}&#34;,scala.tools.nsc.util;version=&#34;${osgi.version.number}&#34;,scala.tools.util;version=&#34;${osgi.version.number}&#34;"/>
+        <attribute name="Import-Package" value="org.apachge.ant.tools;version=&#34;${ant.version.number}&#34;,org.apachge.ant.tools.taskdefs;version=&#34;${ant.version.number}&#34;,org.apachge.ant.types;version=&#34;${ant.version.number}&#34;,org.apachge.ant.tools.util;version=&#34;${ant.version.number}&#34;,org.xml.sax"/>
+        <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
       </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"/>
@@ -1043,9 +1053,8 @@ GENERATES A DISTRIBUTION
         <attribute name="Bundle-SymbolicName" value="scala_library"/>
         <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;${osgi.version.number}&#34;"/>
-        <attribute name="Import-Package" value="javax.xml.parsers, org.xml.sax, org.xml.sax.helpers"/>
+        <attribute name="Export-Package" value="scala;version=&#34;${osgi.version.number}&#34;,scala.actors;version=&#34;${osgi.version.number}&#34;,scala.actors.remote;version=&#34;${osgi.version.number}&#34;,scala.collection;version=&#34;${osgi.version.number}&#34;,scala.collection.immutable;version=&#34;${osgi.version.number}&#34;,scala.collection.jcl;version=&#34;${osgi.version.number}&#34;,scala.collection.mutable;version=&#34;${osgi.version.number}&#34;,scala.compat;version=&#34;${osgi.version.number}&#34;,scala.concurrent;version=&#34;${osgi.version.number}&#34;,scala.io;version=&#34;${osgi.version.number}&#34;,scala.mobile;version=&#34;${osgi.version.number}&#34;,scala.ref;version=&#34;${osgi.version.number}&#34;,scala.reflect;version=&#34;${osgi.version.number}&#34;,scala.runtime;version=&#34;${osgi.version.number}&#34;,scala.testing;version=&#34;${osgi.version.number}&#34;,scala.text;version=&#34;${osgi.version.number}&#34;,scala.util;version=&#34;${osgi.version.number}&#34;,scala.util.automata;version=&#34;${osgi.version.number}&#34;,scala.util.grammar;version=&#34;${osgi.version.number}&#34;,scala.util.logging;version=&#34;${osgi.version.number}&#34;,scala.util.parsing;version=&#34;${osgi.version.number}&#34;,scala.util.regexp;version=&#34;${osgi.version.number}&#34;,scala.xml;version=&#34;${osgi.version.number}&#34;,scala.xml.dtd;version=&#34;${osgi.version.number}&#34;,scala.xml.factory;version=&#34;${osgi.version.number}&#34;,scala.xml.parsing;version=&#34;${osgi.version.number}&#34;,scala.xml.path;version=&#34;${osgi.version.number}&#34;,scala.xml.pull;version=&#34;${osgi.version.number}&#34;,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>
     </jar>
@@ -1064,6 +1073,15 @@ GENERATES A DISTRIBUTION
           <attribute name="Implementation-Version" value="${version.number}"/>
           <attribute name="Implementation-Vendor" value="${vendor.name}"/>
         </section>
+        <attribute name="Bundle-DocURL" value="http://www.scala-lang.org/"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="Scala DBC Library Bundle"/>
+        <attribute name="Bundle-SymbolicName" value="scala_dbc_library"/>
+        <attribute name="Bundle-Version" value="${osgi.version.number}"/>
+        <attribute name="Bundle-Vendor" value="${vendor.name}"/>
+        <attribute name="Export-Package" value="scala.dbc;version=&#34;${osgi.version.number}&#34;,scala.dbc.datatype;version=&#34;${osgi.version.number}&#34;,scala.dbc.exception;version=&#34;${osgi.version.number}&#34;,scala.dbc.result;version=&#34;${osgi.version.number}&#34;,scala.dbc.statement;version=&#34;${osgi.version.number}&#34;,scala.dbc.statement.expression;version=&#34;${osgi.version.number}&#34;,scala.dbc.syntax;version=&#34;${osgi.version.number}&#34;,scala.dbc.value;version=&#34;${osgi.version.number}&#34;,scala.dbc.vendor;version=&#34;${osgi.version.number}&#34;"/>
+        <attribute name="Import-Package" value="scala;version=&#34;${osgi.version.number}&#34;,scala.compat;version=&#34;${osgi.version.number}&#34;"/>
+        <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
       </manifest>
     </jar>