[Git][java-team/equinox-framework][master] 7 commits: Build libequinox-executable-jni

[Sudip Mukherjee]

Sudip Mukherjee pushed to branch master at Debian Java Maintainers / equinox-framework


Commits:
291f1064 by Sudip Mukherjee at 2020-10-04T21:24:09+01:00
Build libequinox-executable-jni

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>

- - - - -
96bc3bbc by Sudip Mukherjee at 2020-10-04T21:24:09+01:00
Add changelog for 4.17-2 release

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>

- - - - -
b9de6160 by Emmanuel Bourg at 2020-10-05T10:22:01+02:00
Clean the binary files

- - - - -
34de7b38 by Emmanuel Bourg at 2020-10-05T11:04:02+02:00
Support building only the arch specific package

- - - - -
089894ef by Emmanuel Bourg at 2020-10-05T12:14:44+02:00
Extract the version of libequinox-executable-jni from feature.xml

- - - - -
eaf81488 by Emmanuel Bourg at 2020-10-05T12:14:48+02:00
Added a dependency on libequinox-executable-jni to libequinox-launcher-java

- - - - -
50ad8453 by Sudip Mukherjee at 2020-10-07T22:24:29+01:00
Prepare to upload to unstable

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>

- - - - -


5 changed files:

- debian/changelog
- + debian/clean
- debian/control
- + debian/libequinox-executable-jni.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+equinox-framework (4.17-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Sudip Mukherjee ]
+  * Build libequinox-executable-jni.
+    - Launcher was unable to connect to JNIBridge.
+
+  [ Emmanuel Bourg ]
+  * Clean the binary files.
+  * Support building only the arch specific package.
+  * Extract the version of libequinox-executable-jni from feature.xml.
+  * Added a dependency on libequinox-executable-jni to libequinox-launcher-java.
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com>  Wed, 07 Oct 2020 22:23:21 +0100
+
 equinox-framework (4.17-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/clean
=====================================
@@ -0,0 +1,3 @@
+features/org.eclipse.equinox.executable.feature/library/gtk/eclipse
+features/org.eclipse.equinox.executable.feature/library/gtk/*.o
+features/org.eclipse.equinox.executable.feature/library/gtk/*.so


=====================================
debian/control
=====================================
@@ -9,7 +9,9 @@ Build-Depends:
  javahelper,
  libosgi-annotation-java,
  libservlet3.1-java,
- eclipse-debian-helper
+ eclipse-debian-helper (>= 1.8),
+ libgtk-3-dev,
+ xmlstarlet
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/java-team/equinox-framework.git
 Vcs-Browser: https://salsa.debian.org/java-team/equinox-framework
@@ -67,7 +69,7 @@ Description: Eclipse OSGi Utility Classes
 
 Package: libequinox-launcher-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libequinox-executable-jni
 Description: Eclipse Equinox Launcher
  The Equinox Framework component is tasked with being a full implementation
  to the OSGi Core Framework R4 specification. In addition, the Framework
@@ -75,3 +77,14 @@ Description: Eclipse Equinox Launcher
  that facilitate the use of Equinox OSGi in end-user product scenarios.
  .
  This package contains the org.eclipse.equinox.launcher bundle.
+
+Package: libequinox-executable-jni
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Eclipse Platform Launcher Executables
+ The Equinox Framework component is tasked with being a full implementation
+ to the OSGi Core Framework R4 specification. In addition, the Framework
+ component produces launchers, bootstrap infrastructure and application models
+ that facilitate the use of Equinox OSGi in end-user product scenarios.
+ .
+ This package contains the org.eclipse.equinox.executable JNI library.


=====================================
debian/libequinox-executable-jni.install
=====================================
@@ -0,0 +1 @@
+features/org.eclipse.equinox.executable.feature/library/gtk/eclipse_*.so /usr/lib/jni


=====================================
debian/rules
=====================================
@@ -1,14 +1,21 @@
 #!/usr/bin/make -f
 
 include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
 
 %:
 	dh $@ --buildsystem=eclipse_bundles --with javahelper
 
-override_dh_gencontrol:
+override_dh_auto_build-arch:
+	cd features/org.eclipse.equinox.executable.feature/library/gtk && ./build.sh -os linux -arch $(DEB_HOST_GNU_CPU)
+
+override_dh_gencontrol-indep:
 	# Use the bundle versions as package versions
 	awk 'system("dh_gencontrol -p"$$4" -- -v"$$2"+eclipse$(DEB_VERSION)")' debian/bundles.properties
 
+override_dh_gencontrol-arch:
+	dh_gencontrol -plibequinox-executable-jni -- -v$(shell xmlstarlet sel -t -v '//feature/@version' features/org.eclipse.equinox.executable.feature/feature.xml | sed 's/.qualifier//')+eclipse$(DEB_VERSION)
+
 override_jh_classpath:
 	jh_classpath -plibeclipse-osgi-java          --classpath=/usr/share/java/osgi.annotation.jar   usr/share/java/eclipse-osgi.jar
 	jh_classpath -plibeclipse-osgi-util-java     --classpath=/usr/share/java/eclipse-osgi.jar      usr/share/java/eclipse-osgi-util.jar



View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/-/compare/bffe776e2e1203f1b6ad48fa150d8e448fb2a45d...50ad84537b513e75a57e503541861239609aa7dd

-- 
View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/-/compare/bffe776e2e1203f1b6ad48fa150d8e448fb2a45d...50ad84537b513e75a57e503541861239609aa7dd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201007/36ae66b2/attachment.html>