Hi Mark,

On Fri, Jan 20, 2012 at 9:17 AM, Laurent Bigonville<bi...@debian.org>
wrote:

Could you please considere adding OSGi information to the java
binding.

These meta informations seems to be required to be able to built
eclipse completely from the source.

I maintain Subclipse and contribute to the maintenance of JavaHL in
Subversion.  I do not really have any objections to the concept but it
would be helpful to have a patch created as a patch to Subversion
itself and the trunk version.  It looks like the patch in the link is
to the Debian-specific packaging (and for an older version of SVN).

I'm the original author of Debian packaging of Subclipse. As you requested,
here is attached a patch against Subversion trunk. Also I improved it a bit
so that Bundle-Version attribute in manifest is correctly set during build.

It would be nice if this can be also commited to 1.6.x and 1.7.x branches if
they are still supported (Debian now packages versions from 1.6). As far as
I tested, the patch should apply without problems.

The link also says this:

"This jar is a dependency of eclipse-subclipse package. Attached patch
adds the needed metadata."

I have no idea what Debian might be doing in its own packaging but in
Subclipse itself this is not true.  Subclipse does not use the
svn-javahl.jar file from Subversion.  The JavaHL API is wrapped in an
Eclipse plugin that Subclipse itself provides and this plugin of
course has all of the OSGI information included since it is a plugin.

I'm aware of that, but in Debian we prefer to reuse already packaged libraries
rather than bundle their code with applications, so Subclipse is patched to
depend on external javahl jar. I think the change we are requesting here
doesn't have any impact on the way Subclipse upstream uses javaHL, so you can
still bundle it inside the plugin if you like.

Thanks for your cooperation.

Regards,

Jakub
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 1234484)
+++ Makefile.in	(working copy)
@@ -297,8 +297,11 @@
 
 ### Automate JAR creation using Makefile generator's javahl-java.jar
 ### property.  Enhance generator to support JAR installation.
+JAVAHL_MANIFEST_IN = $(abs_srcdir)/subversion/bindings/javahl/Manifest.in
+JAVAHL_MANIFEST = subversion/bindings/javahl/Manifest
 INSTALL_EXTRA_JAVAHL_JAVA=\
-	$(JAR) cf $(JAVAHL_JAR) -C subversion/bindings/javahl/classes org; \
+	sed s/%bundleVersion/$(PACKAGE_VERSION)/ $(JAVAHL_MANIFEST_IN) > $(JAVAHL_MANIFEST); \
+	$(JAR) cfm $(JAVAHL_JAR) $(JAVAHL_MANIFEST) -C subversion/bindings/javahl/classes org; \
 	$(INSTALL_DATA) $(JAVAHL_JAR) $(DESTDIR)$(javahl_javadir);
 
 INSTALL_EXTRA_JAVAHL_LIB=@INSTALL_EXTRA_JAVAHL_LIB@
Index: subversion/bindings/javahl/Manifest.in
===================================================================
--- subversion/bindings/javahl/Manifest.in	(revision 0)
+++ subversion/bindings/javahl/Manifest.in	(revision 0)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Subversion Java API binding
+Bundle-Vendor: Tigris.org
+Bundle-SymbolicName: org.tigris.subversion.javahl
+Bundle-Version: %bundleVersion
+Export-Package: org.tigris.subversion.javahl

Reply via email to