build_lib/bnd-0.0.249.jar jruby.bnd.template @@ -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.xml @@ -129,6 +129,11 @@ <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> <version>0.9.93</version> maven/jruby-complete/pom.xml @@ -129,6 +129,11 @@ <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> <version>0.9.93</version> maven/jruby/pom.xml d4c3ff3d68466a37c1701675c7fe64b04fabbf5c enebo enebo@961051c9-f516-0410-bf72-c9f7e237a7b7 http://github.com/bobmcwhirter/jruby/commit/52a780399710cfdc062c33dc87538b22067d72c5 52a780399710cfdc062c33dc87538b22067d72c5 2008-08-11T14:02:51-07:00 2008-08-11T14:02:51-07:00 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 3f3068a4ff4bad9fcd0d0447fe45eda23b66ac2c enebo enebo@961051c9-f516-0410-bf72-c9f7e237a7b7