JRUBY-2741: OSGify jruby.jar in the release jruby distribution (patch by Hendy Irawan)

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7437 961051c9-f516-0410-bf72-c9f7e237a7b7

Author: enebo

build.xml

@@ -217,7 +217,7 @@
           </and>
       </condition>
       <antcall target="_jarjar_internal_"/>
-      
+            
       <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0rc7.jar"/>
       <jarjar destfile="${lib.dir}/jruby.jar" compress="false">
         <fileset dir="${jruby.classes.dir}"/>
@@ -228,6 +228,20 @@
         </manifest>
         <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm.@1"/>
       </jarjar>
+      <antcall target="_osgify-jruby_" />
+  </target>
+
+  <!-- Use Bnd to wrap the JAR generated by jarjar in above task -->
+  <target name="_osgify-jruby_">
+    <filter token="JRUBY_VERSION" value="${version.jruby}"/>
+    <copy file="${basedir}/jruby.bnd.template" tofile="${build.dir}/jruby.bnd" filtering="true"/>
+    <taskdef resource="aQute/bnd/ant/taskdef.properties"
+      classpath="${build.lib.dir}/bnd-0.0.249.jar"/>
+    <bndwrap definitions="${build.dir}" output="${lib.dir}">
+      <fileset file="${lib.dir}/jruby.jar" />
+    </bndwrap>
+    <move file="${lib.dir}/jruby.jar$" tofile="${lib.dir}/jruby.jar" 
+      overwrite="true" />
   </target>
 
   <target name="_jarjar_internal_" unless="jarjar.uptodate">

build_lib/bnd-0.0.249.jar

@@ -0,0 +1,6 @@
+Export-Package: org.jruby.*;version="@JRUBY_VERSION@"
+Import-Package: !org.jruby.*, *;resolution:=optional
+Bundle-Version: @JRUBY_VERSION@
+Bundle-Description: JRuby @JRUBY_VERSION@ OSGi bundle
+Bundle-Name: JRuby @JRUBY_VERSION@
+Bundle-SymbolicName: org.jruby.jruby

jruby.bnd.template

@@ -128,6 +128,11 @@
                   <artifactId>asm-tree</artifactId>
                   <version>3.0</version>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>biz.aQute</groupId>
+                  <artifactId>bnd</artifactId>
+                  <version>0.0.249</version>
+                </artifactItem>
                 <artifactItem>
                   <groupId>jline</groupId>
                   <artifactId>jline</artifactId>

maven/jruby-complete/pom.xml

@@ -128,6 +128,11 @@
                   <artifactId>asm-tree</artifactId>
                   <version>3.0</version>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>biz.aQute</groupId>
+                  <artifactId>bnd</artifactId>
+                  <version>0.0.249</version>
+                </artifactItem>
                 <artifactItem>
                   <groupId>jline</groupId>
                   <artifactId>jline</artifactId>