[Git][java-team/eclipse-platform-ui][master] 12 commits: Build the eclipse-jface bundle
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Sep 25 13:40:24 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / eclipse-platform-ui
Commits:
1e21b12d by Emmanuel Bourg at 2018-09-24T21:49:18Z
Build the eclipse-jface bundle
- - - - -
b209741d by Emmanuel Bourg at 2018-09-24T21:49:27Z
Standards-Version updated to 4.2.1
- - - - -
ee8495ea by Emmanuel Bourg at 2018-09-24T23:46:55Z
Build the org.eclipse.jface.databinding bundle
- - - - -
fb0693d5 by Emmanuel Bourg at 2018-09-25T08:17:59Z
Build the org.eclipse.e4.ui.css.core and org.eclipse.e4.ui.css.swt bundles
- - - - -
2c1a303f by Emmanuel Bourg at 2018-09-25T08:30:12Z
Build the org.eclipse.e4.ui.dialogs bundle
- - - - -
35a41051 by Emmanuel Bourg at 2018-09-25T09:38:33Z
Build the org.eclipse.e4.ui.di bundle
- - - - -
df00f1b0 by Emmanuel Bourg at 2018-09-25T10:27:30Z
Build the org.eclipse.e4.ui.services bundle
- - - - -
c77dbf15 by Emmanuel Bourg at 2018-09-25T10:27:45Z
Build the org.eclipse.e4.ui.bindings bundle
- - - - -
cf07f56d by Emmanuel Bourg at 2018-09-25T10:52:55Z
Build the org.eclipse.e4.ui.css.swt.theme bundle
- - - - -
b06ac9a0 by Emmanuel Bourg at 2018-09-25T11:04:03Z
Build the org.eclipse.e4.ui.swt.gtk bundle
- - - - -
764bd07a by Emmanuel Bourg at 2018-09-25T11:11:26Z
Build the org.eclipse.e4.ui.widgets bundle
- - - - -
091e52a2 by Emmanuel Bourg at 2018-09-25T12:37:48Z
Upload to unstable
- - - - -
6 changed files:
- debian/build.xml
- debian/bundles
- debian/changelog
- debian/control
- + debian/patches/01-fix-compilation-error.patch
- + debian/patches/series
Changes:
=====================================
debian/build.xml
=====================================
@@ -58,10 +58,110 @@
</make-bundle>
</target>
+ <!-- Eclipse Bindings Support -->
+ <target name="org.eclipse.e4.ui.bindings" depends="org.eclipse.core.commands,org.eclipse.e4.core.commands,org.eclipse.jface">
+ <make-bundle name="org.eclipse.e4.ui.bindings" depends="org.eclipse.core.commands,org.eclipse.e4.core.commands,org.eclipse.jface">
+ <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-contexts.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-di.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-di-annotations.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-services.jar"/>
+ <pathelement path="/usr/share/java/swt4.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse CSS Core Support -->
+ <target name="org.eclipse.e4.ui.css.core">
+ <make-bundle name="org.eclipse.e4.ui.css.core">
+ <pathelement path="/usr/share/java/equinox-common.jar"/>
+ <pathelement path="/usr/share/java/equinox-registry.jar"/>
+ <pathelement path="/usr/share/java/xml-apis-1.4.01.jar"/>
+ <pathelement path="/usr/share/java/xml-apis-ext.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse CSS SWT Support -->
+ <target name="org.eclipse.e4.ui.css.swt" depends="org.eclipse.e4.ui.css.core">
+ <make-bundle name="org.eclipse.e4.ui.css.swt" depends="org.eclipse.e4.ui.css.core">
+ <pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
+ <pathelement path="/usr/share/java/equinox-common.jar"/>
+ <pathelement path="/usr/share/java/equinox-preferences.jar"/>
+ <pathelement path="/usr/share/java/equinox-registry.jar"/>
+ <pathelement path="/usr/share/java/swt4.jar"/>
+ <pathelement path="/usr/share/java/xml-apis-1.4.01.jar"/>
+ <pathelement path="/usr/share/java/xml-apis-ext.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse CSS SWT Theme Support -->
+ <target name="org.eclipse.e4.ui.css.swt.theme" depends="org.eclipse.e4.ui.css.core,org.eclipse.e4.ui.css.swt">
+ <make-bundle name="org.eclipse.e4.ui.css.swt.theme" depends="org.eclipse.e4.ui.css.core,org.eclipse.e4.ui.css.swt">
+ <pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
+ <pathelement path="/usr/share/java/equinox-common.jar"/>
+ <pathelement path="/usr/share/java/equinox-preferences.jar"/>
+ <pathelement path="/usr/share/java/equinox-registry.jar"/>
+ <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+ <pathelement path="/usr/share/java/swt4.jar"/>
+ <pathelement path="/usr/share/java/xml-apis-1.4.01.jar"/>
+ <pathelement path="/usr/share/java/xml-apis-ext.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse UI Dependency Injection -->
+ <target name="org.eclipse.e4.ui.di">
+ <make-bundle name="org.eclipse.e4.ui.di">
+ <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-contexts.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-di.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-di-annotations.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-di-extensions-supplier.jar"/>
+ <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse e4 dialogs -->
+ <target name="org.eclipse.e4.ui.dialogs" depends="org.eclipse.core.commands,org.eclipse.jface">
+ <make-bundle name="org.eclipse.e4.ui.dialogs" depends="org.eclipse.core.commands,org.eclipse.jface">
+ <pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
+ <pathelement path="/usr/share/java/equinox-common.jar"/>
+ <pathelement path="/usr/share/java/icu4j.jar"/>
+ <pathelement path="/usr/share/java/swt4.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse UI Application Services -->
+ <target name="org.eclipse.e4.ui.services" depends="org.eclipse.core.commands,org.eclipse.e4.ui.di">
+ <make-bundle name="org.eclipse.e4.ui.services" depends="org.eclipse.core.commands,org.eclipse.e4.ui.di">
+ <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-contexts.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-di.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-di-annotations.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-services.jar"/>
+ <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+ <pathelement path="/usr/share/java/xml-apis-1.4.01.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse UI GTK Enhancements -->
+ <target name="org.eclipse.e4.ui.swt.gtk" depends="org.eclipse.e4.ui.css.swt.theme">
+ <make-bundle name="org.eclipse.e4.ui.swt.gtk" depends="org.eclipse.e4.ui.css.swt.theme">
+ <pathelement path="/usr/share/java/atinject-jsr330-api.jar"/>
+ <pathelement path="/usr/share/java/eclipse-e4-core-services.jar"/>
+ <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+ <pathelement path="/usr/share/java/swt4.jar"/>
+ </make-bundle>
+ </target>
+
+ <!-- Eclipse UI Custom widgets -->
+ <target name="org.eclipse.e4.ui.widgets">
+ <make-bundle name="org.eclipse.e4.ui.widgets">
+ <pathelement path="/usr/share/java/swt4.jar"/>
+ </make-bundle>
+ </target>
+
<!-- Eclipse JFace -->
- <target name="org.eclipse.jface">
- <!-- TODO requires a SWT update -->
- <make-bundle name="org.eclipse.jface">
+ <target name="org.eclipse.jface" depends="org.eclipse.core.commands">
+ <make-bundle name="org.eclipse.jface" depends="org.eclipse.core.commands">
<pathelement path="/usr/share/java/equinox-bidi.jar"/>
<pathelement path="/usr/share/java/equinox-common.jar"/>
<pathelement path="/usr/share/java/swt4.jar"/>
@@ -69,8 +169,8 @@
</target>
<!-- JFace Data Binding for SWT and JFace -->
- <target name="org.eclipse.jface.databinding" depends="org.eclipse.jface">
- <make-bundle name="org.eclipse.jface.databinding" depends="org.eclipse.jface">
+ <target name="org.eclipse.jface.databinding" depends="org.eclipse.core.commands,org.eclipse.core.databinding,org.eclipse.core.databinding.observable,org.eclipse.core.databinding.property,org.eclipse.jface">
+ <make-bundle name="org.eclipse.jface.databinding" depends="org.eclipse.core.commands,org.eclipse.core.databinding,org.eclipse.core.databinding.observable,org.eclipse.core.databinding.property,org.eclipse.jface">
<pathelement path="/usr/share/java/equinox-common.jar"/>
<pathelement path="/usr/share/java/swt4.jar"/>
</make-bundle>
=====================================
debian/bundles
=====================================
@@ -5,7 +5,16 @@ org.eclipse.core.databinding.observable
org.eclipse.core.databinding.property
org.eclipse.e4.core.commands
#org.eclipse.e4.emf.xpath
-#org.eclipse.jface
-#org.eclipse.jface.databinding
+org.eclipse.e4.ui.bindings
+org.eclipse.e4.ui.css.core
+org.eclipse.e4.ui.css.swt
+org.eclipse.e4.ui.css.swt.theme
+org.eclipse.e4.ui.di
+org.eclipse.e4.ui.dialogs
+org.eclipse.e4.ui.services
+org.eclipse.e4.ui.swt.gtk
+org.eclipse.e4.ui.widgets
+org.eclipse.jface
+org.eclipse.jface.databinding
#org.eclipse.ui
#org.eclipse.ui.workbench
=====================================
debian/changelog
=====================================
@@ -1,3 +1,21 @@
+eclipse-platform-ui (4.7.3-2) unstable; urgency=medium
+
+ * Build more bundles:
+ - org.eclipse.jface
+ - org.eclipse.jface.databinding
+ - org.eclipse.e4.ui.bindings
+ - org.eclipse.e4.ui.css.core
+ - org.eclipse.e4.ui.css.swt
+ - org.eclipse.e4.ui.css.swt.theme
+ - org.eclipse.e4.ui.di
+ - org.eclipse.e4.ui.dialogs
+ - org.eclipse.e4.ui.services
+ - org.eclipse.e4.ui.swt.gtk
+ - org.eclipse.e4.ui.widgets
+ * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 25 Sep 2018 14:36:03 +0200
+
eclipse-platform-ui (4.7.3-1) unstable; urgency=medium
* Initial release (Closes: #903658)
=====================================
debian/control
=====================================
@@ -6,19 +6,27 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
debhelper (>= 11~),
default-jdk,
+ libatinject-jsr330-api-java,
libcommons-jxpath-java,
libeclipse-core-expressions-java,
- libeclipse-osgi-java,
+ libeclipse-core-jobs-java,
+ libeclipse-core-runtime-java,
libeclipse-e4-core-contexts-java,
libeclipse-e4-core-services-java,
libeclipse-e4-core-di-java,
libeclipse-e4-core-di-annotations-java,
+ libeclipse-e4-core-di-extensions-supplier-java,
+ libeclipse-osgi-java,
+ libeclipse-osgi-services-java,
libequinox-bidi-java,
libequinox-common-java,
+ libequinox-preferences-java,
+ libequinox-registry-java,
libicu4j-java,
- libswt-gtk-4-java,
+ libswt-gtk-4-java (>= 4.7.3),
+ libxml-commons-external-java,
eclipse-debian-helper
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
Vcs-Git: https://salsa.debian.org/java-team/eclipse-platform-ui.git
Vcs-Browser: https://salsa.debian.org/java-team/eclipse-platform-ui
Homepage: https://www.eclipse.org/eclipse/platform-ui/
@@ -96,3 +104,195 @@ Description: Eclipse e4 core commands
Client Platform (RCP).
.
This package contains the org.eclipse.e4.core.commands bundle.
+
+Package: libeclipse-e4-ui-bindings-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libatinject-jsr330-api-java,
+ libeclipse-e4-core-contexts-java,
+ libeclipse-e4-core-di-java,
+ libeclipse-e4-core-di-annotations-java,
+ libeclipse-e4-core-services-java,
+ libswt-gtk-4-java (>= 4.7.3)
+Description: Eclipse Bindings Support
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.bindings bundle.
+
+Package: libeclipse-e4-ui-css-core-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libequinox-common-java,
+ libequinox-registry-java,
+ libxml-commons-external-java
+Description: Eclipse CSS Core Support
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.css.core bundle.
+
+Package: libeclipse-e4-ui-css-swt-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libeclipse-core-runtime-java,
+ libequinox-common-java,
+ libequinox-preferences-java,
+ libequinox-registry-java,
+ libswt-gtk-4-java (>= 4.7.3),
+ libxml-commons-external-java
+Description: Eclipse CSS SWT Support
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.css.swt bundle.
+
+Package: libeclipse-e4-ui-css-swt-theme-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libeclipse-core-runtime-java,
+ libequinox-common-java,
+ libequinox-preferences-java,
+ libequinox-registry-java,
+ libeclipse-osgi-services-java,
+ libswt-gtk-4-java (>= 4.7.3),
+ libxml-commons-external-java
+Description: Eclipse CSS SWT Theme Support
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.css.swt.theme bundle.
+
+Package: libeclipse-e4-ui-di-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libatinject-jsr330-api-java,
+ libeclipse-e4-core-contexts-java,
+ libeclipse-e4-core-di-java,
+ libeclipse-e4-core-di-annotations-java,
+ libeclipse-e4-core-di-extensions-supplier-java,
+ libeclipse-osgi-services-java
+Description: Eclipse UI Dependency Injection
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.di bundle.
+
+Package: libeclipse-e4-ui-dialogs-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libeclipse-core-jobs-java,
+ libequinox-common-java,
+ libicu4j-java,
+ libswt-gtk-4-java (>= 4.7.3)
+Description: Eclipse e4 dialogs
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.dialogs bundle.
+
+Package: libeclipse-e4-ui-services-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libatinject-jsr330-api-java,
+ libeclipse-e4-core-contexts-java,
+ libeclipse-e4-core-di-java,
+ libeclipse-e4-core-di-annotations-java,
+ libeclipse-e4-core-di-services-java,
+ libeclipse-osgi-services-java,
+ libxml-commons-external-java
+Description: Eclipse UI Application Services
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.services bundle.
+
+Package: libeclipse-e4-ui-swt-gtk-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libatinject-jsr330-api-java,
+ libeclipse-osgi-services-java,
+ libeclipse-e4-core-services-java,
+ libswt-gtk-4-java (>= 4.7.3)
+Description: Eclipse UI GTK Enhancements
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.swt.gtk bundle.
+
+Package: libeclipse-e4-ui-widgets-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libswt-gtk-4-java (>= 4.7.3)
+Description: Eclipse UI Custom widgets
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.e4.ui.widgets bundle.
+
+Package: libeclipse-jface-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libequinox-bidi-java,
+ libequinox-common-java,
+ libswt-gtk-4-java (>= 4.7.3)
+Description: Eclipse JFace
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.jface bundle.
+
+Package: libeclipse-jface-databinding-java
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${bundle:Depends},
+ libequinox-common-java,
+ libswt-gtk-4-java (>= 4.7.3)
+Description: Eclipse JFace Data Binding for SWT and JFace
+ The Eclipse Platform UI project is responsible for the runtime, user interface
+ and help components of Eclipse. Platform UI provides the basic building blocks
+ to create the Eclipse IDE and other Eclipse based applications called Rich
+ Client Platform (RCP).
+ .
+ This package contains the org.eclipse.jface.databinding bundle.
=====================================
debian/patches/01-fix-compilation-error.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Fixes a compilation error caused by an ambiguous lambda expression
+ (maybe a difference between javac and ecj?)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java
++++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageDescriptor.java
+@@ -288,7 +288,7 @@
+ * this fails.
+ */
+ try {
+- return new Image(device, this::getImageData);
++ return new Image(device, (ImageDataProvider) this::getImageData);
+ } catch (IllegalArgumentException | SWTException e) {
+ if (returnMissingImageOnError) {
+ try {
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01-fix-compilation-error.patch
View it on GitLab: https://salsa.debian.org/java-team/eclipse-platform-ui/compare/cc5ec8f3905cb943f7ee3f71049337652480e8f5...091e52a21737633e1b53bbe804db66929582dc1b
--
View it on GitLab: https://salsa.debian.org/java-team/eclipse-platform-ui/compare/cc5ec8f3905cb943f7ee3f71049337652480e8f5...091e52a21737633e1b53bbe804db66929582dc1b
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/20180925/780a953b/attachment.html>
More information about the pkg-java-commits
mailing list