[Git][java-team/equinox-framework][sudip/jni] 4 commits: Clean the binary files

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch sudip/jni at Debian Java Maintainers / equinox-framework


Commits:
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

- - - - -


3 changed files:

- + debian/clean
- debian/control
- debian/rules


Changes:

=====================================
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,8 +9,9 @@ Build-Depends:
  javahelper,
  libosgi-annotation-java,
  libservlet3.1-java,
- eclipse-debian-helper,
- libgtk-3-dev
+ 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
@@ -68,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


=====================================
debian/rules
=====================================
@@ -6,17 +6,18 @@ 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
-	dh_gencontrol -plibequinox-executable-jni -- -v3.8.900+eclipse$(DEB_VERSION)
+
+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
 	jh_classpath -plibeclipse-osgi-services-java --classpath=/usr/share/java/eclipse-osgi-util.jar usr/share/java/eclipse-osgi-services.jar
 	jh_classpath -plibeclipse-osgi-compatibility-state-java   --classpath=/usr/share/java/eclipse-osgi.jar usr/share/java/eclipse-osgi-compatibility-state.jar
-
-override_dh_auto_build:
-	dh_auto_build
-	cd features/org.eclipse.equinox.executable.feature/library/gtk && ./build.sh -os linux -arch $(DEB_HOST_GNU_CPU)



View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/-/compare/96bc3bbc2471d6996a6222633a5f416e862923c7...eaf8148827dc6857fcccc8d534f2975243b3b486

-- 
View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/-/compare/96bc3bbc2471d6996a6222633a5f416e862923c7...eaf8148827dc6857fcccc8d534f2975243b3b486
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/20201005/21ae9d69/attachment.html>