Permalink
Browse files

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
  • Loading branch information...
1 parent 28a661e commit b4b116db4200fbda8ceba9148ccbd05118ee03b1 @enebo enebo committed Aug 11, 2008
Showing with 31 additions and 1 deletion.
  1. +15 −1 build.xml
  2. BIN build_lib/bnd-0.0.249.jar
  3. +6 −0 jruby.bnd.template
  4. +5 −0 maven/jruby-complete/pom.xml
  5. +5 −0 maven/jruby/pom.xml
View
@@ -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">
View
Binary file not shown.
View
@@ -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
@@ -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>
View
@@ -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>

0 comments on commit b4b116d

Please sign in to comment.