Author: markphip Date: Mon Jan 23 15:54:22 2012 New Revision: 1234864 URL: http://svn.apache.org/viewvc?rev=1234864&view=rev Log: JavaHL: Include OSGI Manifest information in svn-javahl.jar
* Makefile.in (install-javahl): Use a manifest file when creating the JAR * subversion/bindings/javahl (svn:ignore): Ignore the Manifest file produced by build process * subversion/bindings/javahl/Manifest.in Template for OSGI Manifest information Patch by: Jakub Adam <[email protected]> Added: subversion/trunk/subversion/bindings/javahl/Manifest.in Modified: subversion/trunk/Makefile.in subversion/trunk/subversion/bindings/javahl/ (props changed) Modified: subversion/trunk/Makefile.in URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1234864&r1=1234863&r2=1234864&view=diff ============================================================================== --- subversion/trunk/Makefile.in (original) +++ subversion/trunk/Makefile.in Mon Jan 23 15:54:22 2012 @@ -297,8 +297,11 @@ SWIG_RB_SRC_DIR = $(abs_srcdir)/subversi ### 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@ Propchange: subversion/trunk/subversion/bindings/javahl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Jan 23 15:54:22 2012 @@ -3,3 +3,4 @@ classes include svn-javahl.jar test-work +Manifest Added: subversion/trunk/subversion/bindings/javahl/Manifest.in URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/Manifest.in?rev=1234864&view=auto ============================================================================== --- subversion/trunk/subversion/bindings/javahl/Manifest.in (added) +++ subversion/trunk/subversion/bindings/javahl/Manifest.in Mon Jan 23 15:54:22 2012 @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Apache Subversion JavaHL API +Bundle-Vendor: Apache Subversion +Bundle-SymbolicName: org.apache.subversion.javahl +Bundle-Version: %bundleVersion +Export-Package: org.apache.subversion.javahl, + org.apache.subversion.javahl.callback, + org.apache.subversion.javahl.types, + org.tigris.subversion.javahl
