Skip to content
Browse files

Revert "Added OSGI properties stuff to build/jar process for GlassFis…

…h and others."

This reverts commit a1d0428e8f13e343aff88311153b470a3378aaec.

See JRUBY-2741.


git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7208 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information...
1 parent 43ed020 commit d7ad2cc5210c21a33391f91961c72cb12a58bd14 @headius headius committed Jul 17, 2008
Showing with 0 additions and 24 deletions.
  1. +0 −17 build.xml
  2. BIN build_lib/bnd-0.0.249.jar
  3. +0 −7 jruby-osgi-properties.bnd
View
17 build.xml
@@ -209,25 +209,8 @@
<attribute name="Main-Class" value="org.jruby.Main"/>
</manifest>
</jarjar>
- <antcall target="osgify-jruby"/>
</target>
- <target name="osgify-jruby">
- <mkdir dir="${build.dir}/osgi"/>
- <filter token="JRUBY_VERSION" value="${version.jruby}"/>
- <copy file="${basedir}/jruby-osgi-properties.bnd" tofile="${build.dir}/osgi/jruby.bnd" filtering="true"/>
-
- <taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="${build.lib.dir}/bnd-0.0.249.jar"/>
- <bndwrap definitions="${build.dir}/osgi" output="${build.dir}/osgi">
- <fileset file="${lib.dir}/jruby.jar" />
- </bndwrap>
- <copy file="${build.dir}/osgi/jruby.jar$" tofile="${lib.dir}/jruby.jar"/>
-
- </target>
-
-
-
<path id="lib.classpath">
<pathelement location="${build.lib.dir}/retroweaver-rt-2.0.5.jar"/>
<pathelement location="${build.lib.dir}/backport-util-concurrent.jar"/>
View
BIN build_lib/bnd-0.0.249.jar
Binary file not shown.
View
7 jruby-osgi-properties.bnd
@@ -1,7 +0,0 @@
-version=@JRUBY_VERSION@
-Export-Package: *;resolution:=optional
-Import-Package: *;resolution:=optional
-Bundle-Version: ${version}
-Bundle-Description: JRuby @JRUBY_VERSION@ OSGi bundle
-Bundle-Name: JRuby @JRUBY_VERSION@
-Bundle-SymbolicName: org.jruby:jruby

0 comments on commit d7ad2cc

Please sign in to comment.
Something went wrong with that request. Please try again.