Compare commits
No commits in common. "master" and "f22" have entirely different histories.
|
|
@ -1,7 +1,10 @@
|
|||
eclipse-*-src.tar.bz2
|
||||
*.rpm
|
||||
eclipse-build-*.tar.gz
|
||||
eclipse-build-*.tar.xz
|
||||
eclipse-3.8.0-*-src.tar.bz2
|
||||
/R4_platform-aggregator-*
|
||||
/eclipse-source.tar.bz2
|
||||
/eclipse-jdtpdeupdatesite.tar.bz2
|
||||
/x86_64
|
||||
/results_eclipse
|
||||
|
|
@ -11,4 +14,3 @@ eclipse-build-*.tar.xz
|
|||
/org.eclipse.linuxtools.eclipse-build-*.tar.bz2
|
||||
/org.eclipse.linuxtools.eclipse-build-*.tar.xz
|
||||
/org.eclipse.linuxtools.eclipse-build-*/
|
||||
/eclipse-platform-sources-*.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,664 +1,3 @@
|
|||
* Mon Apr 03 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-3
|
||||
- Build missing remote ant support jar
|
||||
|
||||
* Fri Mar 03 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-2
|
||||
- Re-enable test-framework for platform tests
|
||||
- Drop long-time broken efj script
|
||||
|
||||
* Fri Feb 24 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-1
|
||||
- Update to Neon.3
|
||||
- Upstreamed some changes from RHSCL
|
||||
|
||||
* Wed Feb 08 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-7
|
||||
- Hide the p2 Droplets from the Available Software Sites listing.
|
||||
- Guard against null URI path in droplet check for Install Wizard Combo.
|
||||
- Resolves: rhbz#1413778, rhbz#1420225
|
||||
|
||||
* Wed Jan 25 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-6
|
||||
- Fix bug in p2 Droplet detection of feature groups.
|
||||
|
||||
* Tue Jan 24 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-5
|
||||
- Hide the p2 Droplets from cluttering Install Wizard Combo.
|
||||
- Resolves: rhbz#1413778
|
||||
|
||||
* Mon Jan 16 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-4
|
||||
- Fix last javax.annotation reference
|
||||
|
||||
* Wed Jan 11 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-3
|
||||
- Drop dep on javax.annotation APIs, these should instead be provided by the JRE
|
||||
through the system bundle - rhbx#1392150
|
||||
|
||||
* Tue Jan 10 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-2
|
||||
- Non-bootstrap build
|
||||
|
||||
* Fri Jan 06 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-1
|
||||
- Update to Neon.2
|
||||
- Bootstrap build due to ant update
|
||||
- Port to new ant version
|
||||
- Rebuild for ECF update
|
||||
- Pull in usage plugin by default
|
||||
|
||||
* Mon Dec 05 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-7
|
||||
- Rebuild for new xz-java
|
||||
|
||||
* Wed Nov 09 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-6
|
||||
- Increase minimum memory for Eclipse/devstudio
|
||||
- Enable nashorn extension for javascript tools/devstudio
|
||||
- Resolves: rhbz#1380438
|
||||
|
||||
* Thu Oct 13 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-5
|
||||
- Fix build with new Glassfish EL packages
|
||||
- Patch to prefer x11 until wayland support improves
|
||||
|
||||
* Thu Sep 29 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.6.1-4
|
||||
- Bump for rebuild.
|
||||
|
||||
* Thu Sep 15 2016 Dennis Gilmore <dennis@ausil.us> - 1:4.6.1-3
|
||||
- set the bootstap macro to 0
|
||||
|
||||
* Thu Sep 15 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-2
|
||||
- Perform non-bootstrap build
|
||||
- Rebuild for new eclipse-ecf
|
||||
|
||||
* Wed Sep 14 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-1
|
||||
- Update to Neon.1 release.
|
||||
- Set qualifiers at source-modification-time instead of build-time, to
|
||||
eliminate descrepancies between architectures, rhbz#1374938
|
||||
- Set bootstrap flag for new primary architecture.
|
||||
|
||||
* Fri Sep 2 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.6.0-7
|
||||
- Rebuild for latest jsch.
|
||||
|
||||
* Thu Aug 18 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-6
|
||||
- Disable droplets being loaded by the reconciler.
|
||||
- Fix possible NPE in droplet p2.runnable property check.
|
||||
|
||||
* Fri Aug 05 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-5
|
||||
- Improve 'p2.runnable' check in ExtensionLocationArtifactRepository.
|
||||
|
||||
* Wed Aug 03 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-4
|
||||
- Add missing droplets logic to the EngineActivator.
|
||||
- Restore 'p2.runnable' property for droplets.
|
||||
|
||||
* Wed Jul 13 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-3
|
||||
- Update eclipse-pde-tp-support-droplets.patch to handle source bundles.
|
||||
- Change PopupDialog from SWT.COLOR_INFO* to SWT.COLOR_LIST*.
|
||||
|
||||
* Thu Jun 16 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.6.0-2
|
||||
- BR rhino and it's buildtime deps to unbreak build.
|
||||
|
||||
* Tue Jun 14 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-1
|
||||
- Update to Neon release
|
||||
|
||||
* Tue May 10 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.6.git201605092000
|
||||
- Update to latest I-build (M7)
|
||||
|
||||
* Fri Apr 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.5.git201604261105
|
||||
- Use webkit 2 by default, webkit 1 can still be used by setting SWT_WEBKIT2=0
|
||||
in the environment, rhbz#1303912
|
||||
- Ignore SWT.MOZILLA style when creating a browser widget and always use webkit
|
||||
because we cannot ship xulrunner support, rhbz#1210898
|
||||
- Drop unneeded requires from tests package
|
||||
- Add missing R on eclipse-filesystem to low-level sub-packages
|
||||
|
||||
* Tue Apr 26 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.4.git201604261105
|
||||
- Drop support for PDE building plug-ins in RPMs
|
||||
- Update to latest Neon I-build
|
||||
- Drop unnecessary SCL macros
|
||||
|
||||
* Fri Apr 22 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.3.git201604190800
|
||||
- Perform non-bootstrap build
|
||||
|
||||
* Fri Apr 22 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.2.git201604190800
|
||||
- PDE package cannot be noarch due to containing arch-specific source bundles
|
||||
|
||||
* Tue Apr 19 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.1.git201604190800
|
||||
- Update to Neon I-build (bootstrap build)
|
||||
- Drop upstreamed patches
|
||||
- Install all plugins with xmvn
|
||||
- JDT and PDE are now able to be noarch packages
|
||||
|
||||
* Sat Apr 16 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-10
|
||||
- Rebuild for new ECF
|
||||
|
||||
* Thu Apr 07 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.2-9
|
||||
- Support reading BundleInfo from p2 Droplets enabled installations.
|
||||
|
||||
* Tue Mar 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-8
|
||||
- Backport patch for ebz#486069, NPE in SWT when running on Wayland
|
||||
- Eliminate more test failures due to missing resources
|
||||
|
||||
* Fri Mar 25 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-7
|
||||
- Update e-b snapshot for updated ant dependency
|
||||
|
||||
* Thu Mar 24 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-6
|
||||
- Fix failure to run tests and backport patch for ebz#489953 in order to fix
|
||||
some unit tests
|
||||
|
||||
* Wed Mar 16 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-5
|
||||
- Rebuild for ECF and disable the build of some bundles that are not shipped
|
||||
|
||||
* Fri Mar 04 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-4
|
||||
- Backport patch for ebz#488226 for incorrect content assist colors,
|
||||
fixes rhbz#1253651 and rhbz#1196736
|
||||
- Fix broken link to mockito in tests
|
||||
|
||||
* Wed Mar 02 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-3
|
||||
- Fix mis-named Java 1.9 profile
|
||||
|
||||
* Mon Feb 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-2
|
||||
- Fix Lucene patch on F22
|
||||
|
||||
* Mon Feb 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-1
|
||||
- Update to Mars.2 release
|
||||
- Update eclipse-build snapshot
|
||||
|
||||
* Mon Feb 29 2016 Michael Simacek <msimacek@redhat.com> - 1:4.5.1-17
|
||||
- Rebuild for lucene-5.5.0
|
||||
|
||||
* Mon Feb 29 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.1-16
|
||||
- Rebuild for httpcomponents-client 4.5.2
|
||||
|
||||
* Thu Feb 25 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-15
|
||||
- Make BRs portable (thanks to Nicolas Lécureuil)
|
||||
|
||||
* Wed Feb 24 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.1-14
|
||||
- Gracefully handle broken symbolic links on initialization.
|
||||
|
||||
* Wed Feb 17 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-13
|
||||
- Preserve more test data that we cannot generate from source
|
||||
- Eliminate unnecessary manual requires from swt package
|
||||
|
||||
* Wed Feb 17 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-12
|
||||
- Make test framework correctly delete symlinks so that test suites may complete
|
||||
when e.g. pydev is installed rhbz#1290685
|
||||
- Backport patch to fix a webkit crash ebz#487712
|
||||
|
||||
* Mon Feb 08 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-11
|
||||
- Fix java declaration view rhbz#1305107
|
||||
|
||||
* Wed Feb 03 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-10
|
||||
- Fix symlinks for new lucene
|
||||
- Use %%global instead of %%define and other macro improvements
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.5.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jan 21 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.1-8
|
||||
- Rebuild for Lucene 5.4.0.
|
||||
|
||||
* Mon Jan 04 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.1-7
|
||||
- [GTK3.16+] gtk_widget_override_background_color is deprecated.
|
||||
- [GTK3] Eclipse IDE consumes CPU when idle
|
||||
- [GTK] Empty repositories view links have white backgrounds
|
||||
- Resolves: rhbz#1294697, rhbz#1269892
|
||||
- ebz#483096, ebz#484696, ebz#484729
|
||||
|
||||
* Sat Dec 05 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-6
|
||||
- Fix issues with background colour in some dialogs
|
||||
- ebz#478962, ebz#479998
|
||||
- Rebuild for new eclipse-ecf
|
||||
- Preserve jars containing runtime stubs used in tests
|
||||
|
||||
* Fri Nov 27 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-5
|
||||
- Fix some visual glitches when on recent versions of GTK
|
||||
- ebz#466314, ebz#481122, ebz#466500
|
||||
|
||||
* Tue Nov 03 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.1-4
|
||||
- Fix "Workspace chooser won't launch" on Wayland.
|
||||
- Resolves: rhbz#1277594
|
||||
|
||||
* Mon Nov 2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.1-3
|
||||
- Rebuild for new eclipse-ecf
|
||||
|
||||
* Tue Oct 13 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-2
|
||||
- Add patch for editor scrolling problem, rhbz#1198217
|
||||
|
||||
* Wed Sep 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-1
|
||||
- Update to Mars.1
|
||||
- Fix JDT javafx and annotation processor tests
|
||||
|
||||
* Wed Sep 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-19
|
||||
- Rebuild for new eclipse-ecf
|
||||
|
||||
* Wed Sep 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-18
|
||||
- Rebuild for new eclipse-ecf
|
||||
|
||||
* Mon Sep 07 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-17
|
||||
- Rebuild for httpcomponents-core-4.4.2
|
||||
|
||||
* Tue Sep 01 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-16
|
||||
- Modify copy-platform script to support p2 Droplets.
|
||||
|
||||
* Thu Aug 27 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-15
|
||||
- Add support for p2 Droplets.
|
||||
|
||||
* Wed Aug 26 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-14
|
||||
- Rebuild for new ECF
|
||||
|
||||
* Thu Aug 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-13
|
||||
- Add patch for rhbz#1255150
|
||||
- Always use UTC timestamps to prevent rpmdiff failures
|
||||
- Move eclipse provides away from PDE rhbz#1253898
|
||||
|
||||
* Tue Aug 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-12
|
||||
- Rebuild for new ECF
|
||||
|
||||
* Thu Aug 6 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-11
|
||||
- Update to newer e-b snapshot fixing appdata validation.
|
||||
|
||||
* Thu Jul 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-10
|
||||
- Preserve JDT core test data
|
||||
|
||||
* Wed Jul 22 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-9
|
||||
- Fix JDT Feature path for TargetDefinitionPersistenceTests (PDE)
|
||||
- SimpleConfiguratorUtils should handle base == null for tests
|
||||
- Locate the compressed platform archive for p2 AbstractReconcilerTest
|
||||
|
||||
* Mon Jul 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-8
|
||||
- Disable tests for Eclipse 2.x style plug-in support that we don't ship
|
||||
|
||||
* Fri Jul 17 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-7
|
||||
- Less PermSize settings - simply ignored in Java 8.
|
||||
|
||||
* Thu Jul 16 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-6
|
||||
- Eclipse.ini has no place in swt subpackage.
|
||||
|
||||
* Wed Jul 15 2015 Sopot Cela <scela@redhat.com> 1:4.5.0-5
|
||||
- Replaced javax.annotation provider from geronimo to glassfish
|
||||
|
||||
* Tue Jul 7 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-4
|
||||
- Add Maven metadata for SWT
|
||||
|
||||
* Thu Jul 02 2015 Sopot Cela <scela@redhat.com> 1:4.5.0-3
|
||||
- Patch dark theme patch to work on rawhide
|
||||
|
||||
* Wed Jul 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-2
|
||||
- Organise BR/Rs and drop ancient provides/obsoletes on rcp package
|
||||
|
||||
* Fri Jun 26 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-1
|
||||
- Update to tagged 4.5 release.
|
||||
- Switch to new e-b snapshot that properly symlinks all new deps.
|
||||
|
||||
* Thu Jun 25 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.33.git201506012000
|
||||
- Rebuild to include all deps of Lucene.
|
||||
|
||||
* Wed Jun 24 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.32.git201506012000
|
||||
- Non-boostrap build.
|
||||
|
||||
* Tue Jun 23 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.31.git201506012000
|
||||
- Rebuild against Lucene 5.x in bootstrap mode.
|
||||
|
||||
* Fri Jun 19 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-0.30.git201506012000
|
||||
- Fix Eclipse test framework.
|
||||
|
||||
* Fri Jun 19 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.29.git201506012000
|
||||
- Rebuild after the F23 mass rebuild to get metadata correct.
|
||||
|
||||
* Mon Jun 15 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.28.git201506012000
|
||||
- Non-bootstrap build
|
||||
|
||||
* Thu Jun 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.27.git201506012000
|
||||
- Include p2 directives for non-upstream arches
|
||||
|
||||
* Wed Jun 10 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.26.git201506012000
|
||||
- Add patch for stricter feature packaging.
|
||||
- Avoid incorrect servlet-api when building on F22
|
||||
- Add recommends on e4-importer
|
||||
- Bootstrap build to get the ball rolling again.
|
||||
|
||||
* Thu Jun 04 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-0.25.git201506012000
|
||||
- Rebuild after ecf rebuild
|
||||
|
||||
* Tue Jun 02 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.24.git201506012000
|
||||
- Fix pattern matching for x86/x86_64 arches
|
||||
|
||||
* Tue Jun 02 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.23.git201506012000
|
||||
- Update to latest I-build
|
||||
- Don't build contributor tools with external deps during bootstrap builds
|
||||
- Build only for the current architecture
|
||||
- Rebuild for EMF update
|
||||
|
||||
* Sun May 31 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.22.git201505272010
|
||||
- Rebuild after emf change.
|
||||
|
||||
* Fri May 29 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.21.git201505272010
|
||||
- Fix building without tomcat-servlet again.
|
||||
|
||||
* Fri May 29 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.20.git201505272010
|
||||
- BR gcc not gcc-c++ as there is no cpp sources built.
|
||||
|
||||
* Thu May 28 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.19.git201505272010
|
||||
- Update to latest I-build
|
||||
- Require latest egit for the releng tools.
|
||||
|
||||
* Tue May 19 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.18.git201505172000
|
||||
- Update to latest I-build.
|
||||
- Drop unneeded env variable export.
|
||||
|
||||
* Wed May 13 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.17.git201505122100
|
||||
- Rebuild for ECF 3.10.0
|
||||
- Update to latest I-build
|
||||
|
||||
* Tue May 05 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.16.git201505042000
|
||||
- Update to latest I-build to fix bundle dep cycle in PDE builds
|
||||
- Add test framework to contributor tools subpackage
|
||||
- Update eclipse-build snapshot to symlink and require xz-java
|
||||
|
||||
* Wed Apr 29 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.15.git201504280100
|
||||
- Contibutor-tools subpackage should be archful due to native methods
|
||||
|
||||
* Wed Apr 22 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.14.git201504280100
|
||||
- Rebuilt to eliminate optional dependencies of jxpath
|
||||
- Update to latest I-build
|
||||
|
||||
* Wed Apr 08 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.13.git201504081100
|
||||
- Update to latest I-build
|
||||
- Update eclipse-build snapshot
|
||||
- Simplify installation of PDE build scripts
|
||||
- Drop upstreamed hamcrest patch
|
||||
|
||||
* Wed Apr 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.12.git201503310800
|
||||
- Organise patches
|
||||
|
||||
* Wed Apr 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.11.git201503310800
|
||||
- Begin using mvn_install for installing dropins
|
||||
- This allows us to make sub-packages noarch
|
||||
|
||||
* Tue Mar 31 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.10.git201503310800
|
||||
- Update for latest I-build
|
||||
- New sub-package for contributor-tools
|
||||
- Unbundle osgi.annotations compile time dep
|
||||
- Rebuild for new eclipse-ecf/httpcomponents
|
||||
- Revert "Use better AppData screenshots" this is fixed upstream
|
||||
- Update eclipse-build snapshot
|
||||
|
||||
* Tue Mar 31 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-0.9.git201503172000
|
||||
- Rebuild for eclipse-ecf update
|
||||
|
||||
* Mon Mar 30 2015 Richard Hughes <rhughes@redhat.com> - 1:4.5.0-0.8.git201503172000
|
||||
- Use better AppData screenshots
|
||||
|
||||
* Wed Mar 25 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-0.7.git201503172000
|
||||
- Rebuild for jetty update
|
||||
|
||||
* Thu Mar 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-0.6.git201503172000
|
||||
- Rebuild for eclipse-ecf update
|
||||
|
||||
* Tue Mar 17 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.5.git201503172000
|
||||
- Update to latest I-build
|
||||
|
||||
* Wed Mar 04 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.4.git201503030800
|
||||
- Update to latest I-build
|
||||
- JDT requires only hamcrest-core
|
||||
- Rebuild for SR2 release of EMF
|
||||
|
||||
* Wed Feb 25 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.3.git201502240800
|
||||
- Update to latest I-build
|
||||
- Require jetty 9.2.9
|
||||
- Fix arm-build
|
||||
|
||||
* Wed Feb 18 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.2.git201502170800
|
||||
- Update to latest I-build
|
||||
- Unbundle third party libs from tests subpackage rhbz#1150185
|
||||
- Rebuild for new eclipse-ecf/httpcomponents
|
||||
|
||||
* Fri Jan 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.1.git201502100800
|
||||
- Update to latest 4.5.0 I-build
|
||||
- Drop upstreamed jetty9/servlet and workspace picker patches
|
||||
- Drop upstreamed patches for bug 903537 and bug 444143
|
||||
- Update eclipse-build snapshot for ant dependency
|
||||
- Ship missing features used by some other projects' target platform
|
||||
- Build with mvn_build macro
|
||||
- Some spec file clean-up
|
||||
|
||||
* Fri Jan 23 2015 Michael Simacek <msimacek@redhat.com> - 1:4.4.1-17
|
||||
- Rebuild against new jetty
|
||||
|
||||
* Mon Jan 19 2015 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-16
|
||||
- Rebuild for new eclipse-ecf/httpcomponents
|
||||
- Add patch to explicitly require hamcrest bundle from tests
|
||||
|
||||
* Mon Jan 12 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-15
|
||||
- Require newer batik with fixed obsoletes.
|
||||
|
||||
* Wed Dec 10 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-14
|
||||
- Rebuild for new eclipse-ecf.
|
||||
|
||||
* Tue Dec 9 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-13
|
||||
- Move to slimmer batik-css BR/R.
|
||||
|
||||
* Sat Nov 29 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.1-12
|
||||
- Make changes necessary for Tycho 0.22.0.
|
||||
|
||||
* Thu Nov 27 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-11
|
||||
- Update eclipse-build snapshot
|
||||
- Rebuild for ECF symlink changes
|
||||
|
||||
* Wed Nov 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-10
|
||||
- Update eclipse-build snapshot
|
||||
- Rebuild for EMF and icu4j symlink changes
|
||||
- Don't own dirs owned by eclipse-filesystem
|
||||
|
||||
* Tue Nov 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-9
|
||||
- Update dep on icu4j/ECF
|
||||
|
||||
* Mon Nov 17 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-8
|
||||
- Increase max heap size to 1024m
|
||||
- But don't do this as a patch, it doesn't work
|
||||
- Fix build ID to always be lexigraphically higher that upstream
|
||||
|
||||
* Wed Nov 12 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-7
|
||||
- Backport patch to make workspace selection dialog visible in the task manager
|
||||
- Tidy up SWT symlinks
|
||||
|
||||
* Wed Oct 29 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.1-6
|
||||
- Change external plugin references to requirements.
|
||||
- List external plugin references in the top-level category.
|
||||
|
||||
* Fri Oct 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-5
|
||||
- Rebuild for latest lucene.
|
||||
|
||||
* Mon Oct 20 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.1-4
|
||||
- Support loading symlinked bundles when location changes.
|
||||
|
||||
* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-3
|
||||
- Require latest EMF
|
||||
|
||||
* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-2
|
||||
- Fix s390 launcher build
|
||||
|
||||
* Fri Sep 26 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-1
|
||||
- Update to Luna SR1
|
||||
- Drop upstreamed patch and fix permissions on appdata files
|
||||
|
||||
* Tue Sep 16 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-19
|
||||
- Fix for autocomplete selection color.
|
||||
- Rebuild for latest jetty.
|
||||
|
||||
* Tue Sep 09 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-18
|
||||
- Symlink more equinox and some core jars into javadir
|
||||
- Enables tycho to unbundle it's eclipse platform jars
|
||||
- Update dep on lucene
|
||||
|
||||
* Sat Sep 6 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-17
|
||||
- Rebuild for lucene update.
|
||||
|
||||
* Thu Aug 28 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-16
|
||||
- Non-bootstrap build.
|
||||
|
||||
* Wed Aug 27 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-15
|
||||
- Build Eclipse bootstrapped.
|
||||
|
||||
* Tue Aug 26 2014 Sami Wagiaalla <swagiaal@edhat.com> - 1:4.4.0-15
|
||||
- Build agianst webkitgtk4.
|
||||
|
||||
* Tue Aug 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-14
|
||||
- Rebuild against new ECF
|
||||
|
||||
* Mon Aug 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-13
|
||||
- Drop custom buildId, to keep it lexographically greater than upstream's
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.4.0-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Mon Jul 28 2014 Sami Wagiaalla <swagiaal@redhat.com> 1:4.4.0-11
|
||||
- Add patch for webkit2 support.
|
||||
|
||||
* Mon Jul 28 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-10
|
||||
- Provide org.eclipse.tycho:org.eclipse.osgi.compatibility.state.
|
||||
|
||||
* Mon Jul 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-9
|
||||
- Rebuild for new ecf and asm.
|
||||
|
||||
* Wed Jul 16 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-8
|
||||
- Update eclipse-build snapshot
|
||||
- Tighten up deps on asm
|
||||
|
||||
* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-7
|
||||
- Add appstream addon metadata for JDT and PDE plugins
|
||||
- Only use GTK3 by default on F22 or newer, rhbz1118317
|
||||
|
||||
* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-6
|
||||
- Backport fix for eclipse bz438992
|
||||
- Only assemble products for current running target environment
|
||||
- Tidy up some unnecessary SCL bits
|
||||
|
||||
* Tue Jul 08 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5
|
||||
- Make GTK3 the default SWT implementation in eclipse.ini
|
||||
|
||||
* Wed Jul 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-4
|
||||
- Package the equinox.p2.discovery feature, obsolete the separate package
|
||||
- Update e-b snapshot
|
||||
- BR/R: gogo-command >= 0.14
|
||||
- Symlink mockito to system jar in testing package
|
||||
|
||||
* Fri Jun 27 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-3
|
||||
- Fix sed delimeter when dealing with paths.
|
||||
|
||||
* Thu Jun 26 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-2
|
||||
- Update eclipse-build with improvements to bundle testing.
|
||||
|
||||
* Wed Jun 25 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-1
|
||||
- Update to final Luna release
|
||||
- Rebuild against newer dependencies
|
||||
|
||||
* Tue Jun 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.31.git201406042000
|
||||
- Non bootstrap build.
|
||||
|
||||
* Tue Jun 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.30.git201406042000
|
||||
- Bootstrap build for aarch64.
|
||||
|
||||
* Fri Jun 13 2014 Michael Simacek <msimacek@redhat.com> - 1:4.4.0-0.29.git201406042000
|
||||
- Rebuild against new jetty
|
||||
|
||||
* Tue Jun 10 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.28.git201406042000
|
||||
- Drop jdt mvn depmaps.
|
||||
|
||||
* Thu Jun 05 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.27.git201406042000
|
||||
- Remove pre-built launcher binaries
|
||||
- Remove last uses of tomcat
|
||||
|
||||
* Tue Jun 03 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.26.git201406022000
|
||||
- Update to latest I-build
|
||||
|
||||
* Fri May 30 2014 Michael Simacek <msimacek@redhat.com> - 1:4.4.0-0.25.git201405252000
|
||||
- Rebuild against new jetty
|
||||
|
||||
* Tue May 27 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.24.git201405252000
|
||||
- Pass eclipse.javadoc as param to mvn call to fix javadoc generation.
|
||||
|
||||
* Tue May 27 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.23.git201405252000
|
||||
- Update to latest I-build.
|
||||
|
||||
* Fri May 23 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.22.git201405112000
|
||||
- Rebuild for new lucene/junit metadata.
|
||||
|
||||
* Wed May 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.21.git201405112000
|
||||
- Drop tomcat BR/Rs.
|
||||
|
||||
* Wed May 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.20.git201405112000
|
||||
- Drop cglib dep.
|
||||
- Apply jetty 9 patch unconditionally.
|
||||
|
||||
* Mon May 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.19.git201405112000
|
||||
- Drop unnecessary BRs
|
||||
- Update e-b snapshot for new felix-gogo-* jar locations
|
||||
|
||||
* Mon May 12 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.18.git201405112000
|
||||
- Update to latest I-build.
|
||||
- Move pre-luna changelog to separate file.
|
||||
|
||||
* Wed May 07 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.17.git201405062000
|
||||
- Update to latest I-build of Luna 4.4.0
|
||||
- New e-b snapshot for updated gnome appdata
|
||||
- Rebuilt for new dependency versions.
|
||||
|
||||
* Thu May 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.16.git201405010200
|
||||
- Update to latest I-build of Luna 4.4.0
|
||||
|
||||
* Mon Apr 28 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.15.git201404280800
|
||||
- Don't mirror emf and ecf into the final p2 repository
|
||||
|
||||
* Mon Apr 28 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.14.git201404280800
|
||||
- Update to latest I-build of Luna 4.4.0
|
||||
|
||||
* Thu Apr 24 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.13.git201404220800
|
||||
- Drop the use of custom jdtpde repository build from e-b
|
||||
- Don't use a custom product ID
|
||||
- Add BR on mockito
|
||||
- Fix pixmaps directory ownership
|
||||
|
||||
* Tue Apr 22 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.12.git201404220800
|
||||
- Update to latest I-build of Luna 4.4.0
|
||||
- Enable Java 8 specific bundles
|
||||
- Rebuild for updated lucene dependency
|
||||
|
||||
* Tue Apr 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.11.git201404150800
|
||||
- Update to latest I-build of Luna 4.4.0
|
||||
- Fix missing copy resource step on ppc64le
|
||||
- Don't build bundles that are only applicable on non-linux platforms
|
||||
|
||||
* Thu Apr 10 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.10.git201404081645
|
||||
- Drop unnecessary BR on GConf2-devel
|
||||
- Drop unneeded patch: fix-swt-build-in-rawhide
|
||||
|
||||
* Thu Apr 10 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.9.git201404081645
|
||||
- Make globbing work on arches that don't have platform specific fragments.
|
||||
|
||||
* Tue Apr 08 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.8.git201404081645
|
||||
- Update to latest I-build of Luna 4.4.0
|
||||
- Don't unnecessarily create platform specific fragments for o.e.core.net and
|
||||
o.e.core.filesystem.
|
||||
- Accomodate for ppc64le architecture.
|
||||
- Drop upstreamed patch: objectweb-asm
|
||||
|
||||
* Thu Apr 03 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.7.git201404011500
|
||||
- Fix symlinking junit when it is a directory.
|
||||
|
||||
* Thu Apr 03 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.6.git201404011500
|
||||
- Non-bootstrap build.
|
||||
|
||||
* Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.5.git201404011500
|
||||
- Add patch for org.ojectweb.asm -> org.ojectweb.asm.all
|
||||
|
||||
* Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.4.git201404011500
|
||||
- Move secondary-arch fragment generation into e-b.
|
||||
|
||||
* Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.3.git201404011500
|
||||
- Update eclipse-build snapshot
|
||||
|
||||
* Tue Apr 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.2.git201404011500
|
||||
- Update to latest I-build of Luna 4.4.0
|
||||
- Require objectweb-asm >= 5.0.1
|
||||
|
||||
* Mon Mar 24 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.1.M6
|
||||
- Update to M6 pre-release of Luna 4.4.0
|
||||
- Bootstrap build
|
||||
- Drop upstreamed patches: do-not-run-as-root, bug-408505,
|
||||
bug-404448, osgi-unpack-sources
|
||||
- Add patch to use mockito-core 1.9
|
||||
|
||||
* Sat Mar 22 2014 Mat Booth <fedora@matbooth.co.uk> - 1:4.3.2-5
|
||||
- Rebuild for new version of ICU.
|
||||
|
||||
|
|
@ -0,0 +1,231 @@
|
|||
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.sav 2015-06-10 10:05:23.943730974 +0300
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2015-06-10 10:05:50.820612421 +0300
|
||||
@@ -161,22 +161,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.jdt.launching.macosx"
|
||||
- os="macosx"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.jdt.launching.ui.macosx"
|
||||
- os="macosx"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.ant.launching"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml.sav 2015-06-10 12:56:37.342595242 +0300
|
||||
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 2015-06-10 12:57:16.684444749 +0300
|
||||
@@ -176,35 +176,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.equinox.security.macosx"
|
||||
- os="macosx"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.security.win32.x86"
|
||||
- os="win32"
|
||||
- arch="x86"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.security.win32.x86_64"
|
||||
- os="win32"
|
||||
- arch="x86_64"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.tukaani.xz"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.sav 2015-06-10 14:12:33.862436725 +0300
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2015-06-10 14:14:04.642140750 +0300
|
||||
@@ -137,16 +137,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"
|
||||
- os="macosx"
|
||||
- ws="cocoa"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.equinox.common"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
--- eclipse.platform.releng/features/org.eclipse.rcp/feature.xml.orig 2015-06-10 15:06:20.097805994 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.rcp/feature.xml 2015-06-10 15:06:25.923729658 +0100
|
||||
@@ -59,14 +59,4 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
- <plugin
|
||||
- id="org.eclipse.ui.cocoa"
|
||||
- os="macosx"
|
||||
- ws="cocoa"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
</feature>
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.orig 2015-06-02 10:18:54.000000000 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2015-06-10 16:36:59.459534609 +0100
|
||||
@@ -67,14 +67,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.compare.win32"
|
||||
- os="win32"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.core.filebuffers"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -365,35 +357,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.ui.win32"
|
||||
- ws="win32"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.core.filesystem.aix.ppc"
|
||||
- os="aix"
|
||||
- arch="ppc"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.core.filesystem.aix.ppc64"
|
||||
- os="aix"
|
||||
- arch="ppc64"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.core.filesystem.hpux.ia64"
|
||||
os="hpux"
|
||||
arch="ia64"
|
||||
@@ -453,26 +416,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.core.resources.win32.x86"
|
||||
- os="win32"
|
||||
- arch="x86"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.core.resources.win32.x86_64"
|
||||
- os="win32"
|
||||
- arch="x86_64"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.core.filesystem.win32.x86_64"
|
||||
os="win32"
|
||||
arch="x86_64"
|
||||
@@ -548,35 +491,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.equinox.security.win32.x86"
|
||||
- os="win32"
|
||||
- arch="x86"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.security.win32.x86_64"
|
||||
- os="win32"
|
||||
- arch="x86_64"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.security.macosx"
|
||||
- os="macosx"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- fragment="true"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.core.externaltools"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
--- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml.orig 2015-06-10 17:41:42.262002217 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml 2015-06-10 17:41:55.679822949 +0100
|
||||
@@ -132,13 +132,6 @@
|
||||
version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.swt.examples.ole.win32"
|
||||
- ws="win32"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.sdk.examples"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
|
|
@ -1,34 +1,8 @@
|
|||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
index 5fc0e73..ed7e4fa 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
- File[] listFiles = extension.listFiles();
|
||||
+
|
||||
+ // Support the additional 'eclipse' directory if it exists.
|
||||
+ File[] extensionFiles = extension.listFiles(new FilenameFilter() {
|
||||
+ public boolean accept(File dir, String name) {
|
||||
+ return name.equals("eclipse");
|
||||
+ }
|
||||
+ });
|
||||
+
|
||||
+ File[] listFiles;
|
||||
+ if (extensionFiles.length == 1) {
|
||||
+ listFiles = extensionFiles[0].listFiles();
|
||||
+ } else {
|
||||
+ listFiles = extension.listFiles();
|
||||
+ }
|
||||
// new magic - multiple info files, f.e.
|
||||
// egit.info (git feature)
|
||||
// cdt.link (properties file containing link=path) to other info file
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
index 12e4d89..77945ef 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils {
|
||||
@@ -156,7 +156,20 @@ public class SimpleConfiguratorUtils {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,360 @@
|
|||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>x86_64</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.x86_64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.x86_64</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>win32</ws>
|
||||
<arch>x86_64</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-win32.win32.x86_64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>win32.win32.x86_64</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2014-04-16 15:57:26.204834155 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>ppc64le</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc64le</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc64le</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>x86</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.x86</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.x86</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>win32</ws>
|
||||
<arch>x86</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-win32.win32.x86</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>win32.win32.x86</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>s390</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2014-04-16 15:53:08.146402075 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>s390x</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390x</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390x</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 2014-04-16 15:57:28.315796703 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>ppc64</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc64</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100
|
||||
@@ -27,4 +27,37 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>ppc</arch>
|
||||
</properties>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,165 @@
|
|||
From eec69d54257dd905a06e43fb705f40df9326414e Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kurtakov
|
||||
Date: Fri, 20 Nov 2015 13:24:54 +0200
|
||||
Subject: Bug 466314 - [GTK3] Text in Forms abbreviated
|
||||
|
||||
Switching from gtk_text_view_scroll_mark_onscreen to
|
||||
gtk_text_view_scroll_to_mark gives us total control over the alignment
|
||||
allowing us to alway position to the 0 0.
|
||||
|
||||
Change-Id: I4fc141980e96c81cf65ef076a0224f0e4eee47ba
|
||||
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
|
||||
---
|
||||
.../org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 20 ++++++++++----------
|
||||
.../Eclipse SWT PI/gtk/library/os_stats.c | 2 +-
|
||||
.../Eclipse SWT PI/gtk/library/os_stats.h | 2 +-
|
||||
.../gtk/org/eclipse/swt/internal/gtk/OS.java | 10 +++++++---
|
||||
.../gtk/org/eclipse/swt/widgets/Text.java | 12 ++++++------
|
||||
5 files changed, 25 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
index 7e937f0..c0dff7f 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
@@ -16167,16 +16167,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
|
||||
}
|
||||
#endif
|
||||
|
||||
-#ifndef NO__1gtk_1text_1view_1scroll_1mark_1onscreen
|
||||
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1mark_1onscreen)
|
||||
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
|
||||
-{
|
||||
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1mark_1onscreen_FUNC);
|
||||
- gtk_text_view_scroll_mark_onscreen((GtkTextView *)arg0, (GtkTextMark *)arg1);
|
||||
- OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1scroll_1mark_1onscreen_FUNC);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
#ifndef NO__1gtk_1text_1view_1scroll_1to_1iter
|
||||
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1to_1iter)
|
||||
(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
|
||||
@@ -16193,6 +16183,16 @@ fail:
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifndef NO__1gtk_1text_1view_1scroll_1to_1mark
|
||||
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1to_1mark)
|
||||
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
|
||||
+{
|
||||
+ OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1to_1mark_FUNC);
|
||||
+ gtk_text_view_scroll_to_mark((GtkTextView *)arg0, (GtkTextMark *)arg1, (gdouble)arg2, (gboolean)arg3, (gdouble)arg4, (gdouble)arg5);
|
||||
+ OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1scroll_1to_1mark_FUNC);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#ifndef NO__1gtk_1text_1view_1set_1editable
|
||||
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1editable)
|
||||
(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
|
||||
index 82775bd..bd9d7b5 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
|
||||
@@ -1183,8 +1183,8 @@ char * OS_nativeFunctionNames[] = {
|
||||
"_1gtk_1text_1view_1get_1visible_1rect",
|
||||
"_1gtk_1text_1view_1get_1window",
|
||||
"_1gtk_1text_1view_1new",
|
||||
- "_1gtk_1text_1view_1scroll_1mark_1onscreen",
|
||||
"_1gtk_1text_1view_1scroll_1to_1iter",
|
||||
+ "_1gtk_1text_1view_1scroll_1to_1mark",
|
||||
"_1gtk_1text_1view_1set_1editable",
|
||||
"_1gtk_1text_1view_1set_1justification",
|
||||
"_1gtk_1text_1view_1set_1tabs",
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
|
||||
index a1d68ed..016b472 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
|
||||
@@ -1193,8 +1193,8 @@ typedef enum {
|
||||
_1gtk_1text_1view_1get_1visible_1rect_FUNC,
|
||||
_1gtk_1text_1view_1get_1window_FUNC,
|
||||
_1gtk_1text_1view_1new_FUNC,
|
||||
- _1gtk_1text_1view_1scroll_1mark_1onscreen_FUNC,
|
||||
_1gtk_1text_1view_1scroll_1to_1iter_FUNC,
|
||||
+ _1gtk_1text_1view_1scroll_1to_1mark_FUNC,
|
||||
_1gtk_1text_1view_1set_1editable_FUNC,
|
||||
_1gtk_1text_1view_1set_1justification_FUNC,
|
||||
_1gtk_1text_1view_1set_1tabs_FUNC,
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
index cf8cda6..0ee6dda 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
@@ -12528,12 +12528,16 @@ public static final long /*int*/ gtk_text_view_new() {
|
||||
/**
|
||||
* @param text_view cast=(GtkTextView *)
|
||||
* @param mark cast=(GtkTextMark *)
|
||||
+ * @param within_margin cast=(gdouble)
|
||||
+ * @param use_align cast=(gboolean)
|
||||
+ * @param xalign cast=(gdouble)
|
||||
+ * @param yalign cast=(gdouble)
|
||||
*/
|
||||
-public static final native void _gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark);
|
||||
-public static final void gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark) {
|
||||
+public static final native void _gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign);
|
||||
+public static final void gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign) {
|
||||
lock.lock();
|
||||
try {
|
||||
- _gtk_text_view_scroll_mark_onscreen(text_view, mark);
|
||||
+ _gtk_text_view_scroll_to_mark(text_view, mark, within_margin, use_align, xalign, yalign);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
index 9aa3a52..2865cd5 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
@@ -414,7 +414,7 @@ public void append (String string) {
|
||||
OS.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length);
|
||||
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
|
||||
long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
|
||||
- OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
|
||||
+ OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
|
||||
}
|
||||
applySegments ();
|
||||
}
|
||||
@@ -1947,7 +1947,7 @@ public void insert (String string) {
|
||||
OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);
|
||||
OS.gtk_text_buffer_place_cursor (bufferHandle, start);
|
||||
long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
|
||||
- OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
|
||||
+ OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
|
||||
}
|
||||
applySegments ();
|
||||
}
|
||||
@@ -2340,7 +2340,7 @@ public void setSelection (int start) {
|
||||
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
|
||||
OS.gtk_text_buffer_place_cursor (bufferHandle, startIter);
|
||||
long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
|
||||
- OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
|
||||
+ OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2563,7 +2563,7 @@ void setText (char [] text) {
|
||||
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);
|
||||
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
|
||||
long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
|
||||
- OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
|
||||
+ OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
|
||||
Arrays.fill (buffer, (byte) 0);
|
||||
}
|
||||
sendEvent (SWT.Modify);
|
||||
@@ -2644,9 +2644,9 @@ public void showSelection () {
|
||||
checkWidget ();
|
||||
if ((style & SWT.SINGLE) != 0) return;
|
||||
long /*int*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
|
||||
- OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
|
||||
+ OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
|
||||
mark = OS.gtk_text_buffer_get_insert (bufferHandle);
|
||||
- OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
|
||||
+ OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
|
||||
}
|
||||
|
||||
int translateOffset (int offset) {
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
From ddcfd1f3efd70591480e6c053946618ef6696104 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Williams
|
||||
Date: Wed, 14 Oct 2015 13:41:06 -0400
|
||||
Subject: Bug 466500: [GTK3] Trying to resize quick outline or quick type
|
||||
hierarchy closes the popup
|
||||
|
||||
In PopupDialog, Shells with no children are closed on deactivation. On
|
||||
Linux-Gtk, this causes popups like the "Quick Outline" or "Quick
|
||||
Type Hierarchy" to close prematurely when opening the system menu,
|
||||
re-sizing, or moving the window with the mouse.
|
||||
|
||||
It is for this reason that we need to exclude the call to asyncClose()
|
||||
from running on Gtk. This also fixes bug 113577.
|
||||
|
||||
Tested on Gtk3.16.6, and Gtk2.24.
|
||||
|
||||
Change-Id: I4111ad961e2b4e57c90939e7cb0e982b7bf3b894
|
||||
Signed-off-by: Eric Williams <ericwill@redhat.com>---
|
||||
.../src/org/eclipse/jface/dialogs/PopupDialog.java | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java b/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java
|
||||
index 2068cc4..0d361af 100644
|
||||
--- a/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java
|
||||
+++ b/eclipse.platform.ui/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java
|
||||
@@ -588,13 +588,17 @@
|
||||
/*
|
||||
* Close if we are deactivating and have no child shells. If we
|
||||
* have child shells, we are deactivating due to their opening.
|
||||
- * On X, we receive this when a menu child (such as the system
|
||||
- * menu) of the shell opens, but I have not found a way to
|
||||
- * distinguish that case here. Hence bug #113577 still exists.
|
||||
+ *
|
||||
+ * Feature in GTK: this causes the Quick Outline/Type Hierarchy
|
||||
+ * Shell to close on re-size/movement on Gtk3. For this reason,
|
||||
+ * the asyncClose() call is disabled in GTK. See Eclipse Bugs
|
||||
+ * 466500 and 113577 for more information.
|
||||
*/
|
||||
if (listenToDeactivate && event.widget == getShell()
|
||||
&& getShell().getShells().length == 0) {
|
||||
- asyncClose();
|
||||
+ if (!Util.isGtk()) {
|
||||
+ asyncClose();
|
||||
+ }
|
||||
} else {
|
||||
/*
|
||||
* We typically ignore deactivates to work around
|
||||
|
|
@ -0,0 +1,145 @@
|
|||
diff --git a/eclipse.platform.ui/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBVisibleContrastColorFactory.java b/eclipse.platform.ui/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBVisibleContrastColorFactory.java
|
||||
new file mode 100644
|
||||
index 0000000..67b33c7
|
||||
--- /dev/null
|
||||
+++ b/eclipse.platform.ui/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/RGBVisibleContrastColorFactory.java
|
||||
@@ -0,0 +1,106 @@
|
||||
+/*******************************************************************************
|
||||
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
|
||||
+ * All rights reserved. This program and the accompanying materials
|
||||
+ * are made available under the terms of the Eclipse Public License v1.0
|
||||
+ * which accompanies this distribution, and is available at
|
||||
+ * http://www.eclipse.org/legal/epl-v10.html
|
||||
+ *
|
||||
+ * Contributors:
|
||||
+ * IBM Corporation - initial API and implementation
|
||||
+ *******************************************************************************/
|
||||
+package org.eclipse.ui.internal.themes;
|
||||
+
|
||||
+import java.util.Hashtable;
|
||||
+import org.eclipse.core.runtime.CoreException;
|
||||
+import org.eclipse.core.runtime.IConfigurationElement;
|
||||
+import org.eclipse.core.runtime.IExecutableExtension;
|
||||
+import org.eclipse.swt.graphics.RGB;
|
||||
+import org.eclipse.ui.themes.ColorUtil;
|
||||
+import org.eclipse.ui.themes.IColorFactory;
|
||||
+
|
||||
+/**
|
||||
+ * A <code>IColorFactory</code> that may be used to select a color with a higher
|
||||
+ * contrast. The input colors are specified as per method number two in
|
||||
+ * {@link org.eclipse.core.runtime.IExecutableExtension}.
|
||||
+ * <p>
|
||||
+ * Example usage:
|
||||
+ *
|
||||
+ * <pre>
|
||||
+ * <colorDefinition
|
||||
+ * label="Declaration view background"
|
||||
+ * id="org.eclipse.jdt.ui.DeclarationView.backgroundColor">
|
||||
+ * <colorFactory
|
||||
+ * plugin="org.eclipse.ui"
|
||||
+ * class="org.eclipse.ui.internal.themes.RGBContrastFactory">
|
||||
+ * <parameter name="foreground" value="0,0,0" />
|
||||
+ * <parameter name="background" value="COLOR_INFO_BACKGROUND" />
|
||||
+ * <parameter name="alternativeBackground" value="COLOR_LIST_BACKGROUND" />
|
||||
+ * </colorFactory>
|
||||
+ * </colorDefinition>
|
||||
+ * </pre>
|
||||
+ *
|
||||
+ * <p>
|
||||
+ * Returns <em>background</em> if <em>foreground</em> is visibly distinct from
|
||||
+ * <em>background</em>. Otherwise, returns <em>alternativeBackground</em> if
|
||||
+ * that color has more difference in brightness to the foreground. If both
|
||||
+ * colors are bad, returns <em>background</em>. The color values may be
|
||||
+ * specified as RGB triples or as SWT constants.
|
||||
+ *
|
||||
+ * @see org.eclipse.swt.SWT
|
||||
+ * @since 3.107.100
|
||||
+ */
|
||||
+// This class is used by org.eclipse.jdt.ui/plugin.xml to fix
|
||||
+// https://bugs.eclipse.org/477487
|
||||
+public class RGBVisibleContrastColorFactory implements IColorFactory, IExecutableExtension {
|
||||
+ private String fg, bg, altBg;
|
||||
+
|
||||
+ @Override
|
||||
+ public RGB createColor() {
|
||||
+ RGB cfg, cbg, cbgAlt;
|
||||
+
|
||||
+ if (fg != null) {
|
||||
+ cfg = ColorUtil.getColorValue(fg);
|
||||
+ } else {
|
||||
+ cfg = new RGB(0, 0, 0);
|
||||
+ }
|
||||
+ if (bg != null) {
|
||||
+ cbg = ColorUtil.getColorValue(bg);
|
||||
+ } else {
|
||||
+ cbg = new RGB(255, 255, 255);
|
||||
+ }
|
||||
+ if (altBg != null) {
|
||||
+ cbgAlt = ColorUtil.getColorValue(altBg);
|
||||
+ } else {
|
||||
+ cbgAlt = new RGB(255, 255, 255);
|
||||
+ }
|
||||
+
|
||||
+ float bfg = cfg.getHSB()[2];
|
||||
+ float bbg = cbg.getHSB()[2];
|
||||
+ float bbgAlt = cbgAlt.getHSB()[2];
|
||||
+
|
||||
+ if (Math.abs(bbg - bfg) < 0.5f && Math.abs(bbgAlt - bfg) > Math.abs(bbg - bfg)) {
|
||||
+ return cbgAlt;
|
||||
+ }
|
||||
+ return cbg;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * This executable extension requires parameters to be explicitly declared
|
||||
+ * via the second method described in the <code>IExecutableExtension</code>
|
||||
+ * documentation. This class expects that there will be three parameters,
|
||||
+ * <code>foreground</code>, <code>background</code> and
|
||||
+ * <code>alternativeBackground</code>. These values may either be RGB
|
||||
+ * triples or SWT constants.
|
||||
+ */
|
||||
+ @Override
|
||||
+ public void setInitializationData(IConfigurationElement config, String propertyName, Object data)
|
||||
+ throws CoreException {
|
||||
+ if (data instanceof Hashtable) {
|
||||
+ @SuppressWarnings("unchecked")
|
||||
+ Hashtable<String, String> table = (Hashtable<String, String>) data;
|
||||
+ fg = table.get("foreground"); //$NON-NLS-1$
|
||||
+ bg = table.get("background"); //$NON-NLS-1$
|
||||
+ altBg = table.get("alternativeBackground"); //$NON-NLS-1$
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/plugin.xml b/org.eclipse.jdt.ui/plugin.xml
|
||||
index e266d1a..f4b51ed 100644
|
||||
--- a/eclipse.jdt.ui/org.eclipse.jdt.ui/plugin.xml
|
||||
+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/plugin.xml
|
||||
@@ -1065,8 +1065,23 @@
|
||||
<colorDefinition
|
||||
label="%DeclarationViewBackgroundColor.label"
|
||||
categoryId="org.eclipse.jdt.ui.presentation"
|
||||
- value="COLOR_INFO_BACKGROUND"
|
||||
id="org.eclipse.jdt.ui.DeclarationView.backgroundColor">
|
||||
+ <colorFactory
|
||||
+ plugin="org.eclipse.ui"
|
||||
+ class="org.eclipse.ui.internal.themes.RGBVisibleContrastColorFactory">
|
||||
+ <parameter
|
||||
+ name="foreground"
|
||||
+ value="0,0,0">
|
||||
+ </parameter>
|
||||
+ <parameter
|
||||
+ name="background"
|
||||
+ value="COLOR_INFO_BACKGROUND">
|
||||
+ </parameter>
|
||||
+ <parameter
|
||||
+ name="alternativeBackground"
|
||||
+ value="COLOR_LIST_BACKGROUND">
|
||||
+ </parameter>
|
||||
+ </colorFactory>
|
||||
<description>
|
||||
%DeclarationViewBackgroundColor.description
|
||||
</description>
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,214 @@
|
|||
From 87d512619f0b0b05332e4c83f651f29bfa50c5e9 Mon Sep 17 00:00:00 2001
|
||||
From: Snjezana Peco
|
||||
Date: Tue, 24 Nov 2015 13:46:51 +0100
|
||||
Subject: Bug 478962 - [GTK3] Eclipse Mars SR1 consumes 60% CPU while idling
|
||||
|
||||
The
|
||||
https://git.gnome.org/browse/gtk+/commit/?id=fe51ac273c8045279a222c22a52d297d5ede4169
|
||||
commit changes the state of a node instead of copying the style info.
|
||||
When getting some properties (color, background color, border, padding),
|
||||
SWT changes the state of the node 0 (OS.GTK_STATE_FLAG_NORMAL) which
|
||||
sometimes causes a widget to continously repaint.
|
||||
For example:
|
||||
SWT uses the following method to get the background color:
|
||||
|
||||
OS.gtk_style_context_get_background_color (context,
|
||||
OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
|
||||
This method changes the state of a node to 0 (OS.GTK_STATE_FLAG_NORMAL).
|
||||
CTabFolder calls the method from inside the paint listener which causes an
|
||||
infinite painting loop.
|
||||
|
||||
This commit fixes the issue by using the widget's current style state
|
||||
instead of OS.GTK_STATE_FLAG_NORMAL.
|
||||
|
||||
Change-Id: I4dd27e3f6c5895a115fd76788ca2b2322aad6c4d
|
||||
Signed-off-by: Snjezana Peco <snjeza.peco@gmail.com>
|
||||
---
|
||||
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 8 ++++----
|
||||
.../gtk/org/eclipse/swt/internal/gtk/OS.java | 4 ++--
|
||||
.../gtk/org/eclipse/swt/widgets/Control.java | 17 +++++++++++------
|
||||
.../gtk/org/eclipse/swt/widgets/DateTime.java | 8 +++++---
|
||||
.../gtk/org/eclipse/swt/widgets/Spinner.java | 5 +++--
|
||||
.../Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java | 3 ++-
|
||||
6 files changed, 27 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
index c0dff7f..52ade78 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
@@ -18341,18 +18341,18 @@ fail:
|
||||
#endif
|
||||
|
||||
#ifndef NO__1gtk_1widget_1get_1state_1flags
|
||||
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1state_1flags)
|
||||
+JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1state_1flags)
|
||||
(JNIEnv *env, jclass that, jintLong arg0)
|
||||
{
|
||||
- jintLong rc = 0;
|
||||
+ jint rc = 0;
|
||||
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1state_1flags_FUNC);
|
||||
/*
|
||||
- rc = (jintLong)gtk_widget_get_state_flags((GtkWidget *)arg0);
|
||||
+ rc = (jint)gtk_widget_get_state_flags((GtkWidget *)arg0);
|
||||
*/
|
||||
{
|
||||
OS_LOAD_FUNCTION(fp, gtk_widget_get_state_flags)
|
||||
if (fp) {
|
||||
- rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
|
||||
+ rc = (jint)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
|
||||
}
|
||||
}
|
||||
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1state_1flags_FUNC);
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
index 0ee6dda..a7fb6fe 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
@@ -11855,8 +11855,8 @@ public static final void gtk_style_context_restore(long /*int*/ context) {
|
||||
/** @method flags=dynamic
|
||||
* @param self cast=(GtkWidget *)
|
||||
* */
|
||||
-public static final native long /*int*/ _gtk_widget_get_state_flags(long /*int*/ self);
|
||||
-public static final long /*int*/ gtk_widget_get_state_flags(long /*int*/ self) {
|
||||
+public static final native int _gtk_widget_get_state_flags(long /*int*/ self);
|
||||
+public static final int gtk_widget_get_state_flags(long /*int*/ self) {
|
||||
lock.lock();
|
||||
try {
|
||||
return _gtk_widget_get_state_flags(self);
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
index 7061084..ecf2da0 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
@@ -2585,8 +2585,9 @@
|
||||
}
|
||||
} else {
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (fontHandle);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(handle);
|
||||
GdkRGBA rgba = new GdkRGBA ();
|
||||
- OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
+ OS.gtk_style_context_get_background_color (context, styleState, rgba);
|
||||
if (rgba.alpha == 0) {
|
||||
return display.COLOR_WIDGET_BACKGROUND;
|
||||
}
|
||||
@@ -2625,8 +2626,9 @@ GdkColor getContextBackground () {
|
||||
GdkColor getContextColor () {
|
||||
long /*int*/ fontHandle = fontHandle ();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (fontHandle);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(handle);
|
||||
GdkRGBA rgba = new GdkRGBA ();
|
||||
- rgba = display.styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
+ rgba = display.styleContextGetColor (context, styleState, rgba);
|
||||
GdkColor color = new GdkColor ();
|
||||
color.red = (short)(rgba.red * 0xFFFF);
|
||||
color.green = (short)(rgba.green * 0xFFFF);
|
||||
@@ -2761,7 +2763,8 @@ long /*int*/ getFontDescription () {
|
||||
long /*int*/ fontHandle = fontHandle ();
|
||||
if (OS.GTK3) {
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (fontHandle);
|
||||
- return OS.gtk_style_context_get_font(context, OS.GTK_STATE_FLAG_NORMAL);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(fontHandle);
|
||||
+ return OS.gtk_style_context_get_font(context, styleState);
|
||||
}
|
||||
OS.gtk_widget_realize (fontHandle);
|
||||
return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
|
||||
@@ -3021,12 +3024,13 @@ Point getThickness (long /*int*/ widget) {
|
||||
int xthickness = 0, ythickness = 0;
|
||||
GtkBorder tmp = new GtkBorder();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (widget);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(widget);
|
||||
OS.gtk_style_context_save (context);
|
||||
OS.gtk_style_context_add_class (context, OS.GTK_STYLE_CLASS_FRAME);
|
||||
- OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ OS.gtk_style_context_get_padding (context, styleState, tmp);
|
||||
xthickness += tmp.left;
|
||||
ythickness += tmp.top;
|
||||
- OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ OS.gtk_style_context_get_border (context, styleState, tmp);
|
||||
xthickness += tmp.left;
|
||||
ythickness += tmp.top;
|
||||
OS.gtk_style_context_restore (context);
|
||||
@@ -5595,7 +5599,8 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us
|
||||
if (OS.GTK3 && !draw && (state & CANVAS) != 0) {
|
||||
GdkRGBA rgba = new GdkRGBA();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (handle);
|
||||
- OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(handle);
|
||||
+ OS.gtk_style_context_get_background_color (context, styleState, rgba);
|
||||
draw = rgba.alpha == 0;
|
||||
}
|
||||
if (draw) {
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
|
||||
index 12bca54..81780bd 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
|
||||
@@ -296,13 +296,14 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
|
||||
if (OS.GTK3) {
|
||||
GtkBorder tmp = new GtkBorder ();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (textEntryHandle);
|
||||
- OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(textEntryHandle);
|
||||
+ OS.gtk_style_context_get_padding (context, styleState, tmp);
|
||||
trim.x -= tmp.left;
|
||||
trim.y -= tmp.top;
|
||||
trim.width += tmp.left + tmp.right;
|
||||
trim.height += tmp.top + tmp.bottom;
|
||||
if ((style & SWT.BORDER) != 0) {
|
||||
- OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ OS.gtk_style_context_get_border (context, styleState, tmp);
|
||||
trim.x -= tmp.left;
|
||||
trim.y -= tmp.top;
|
||||
trim.width += tmp.left + tmp.right;
|
||||
@@ -1738,7 +1739,8 @@ GtkBorder getGtkBorderPadding () {
|
||||
//In Gtk3, acquire border.
|
||||
GtkBorder gtkBorderPadding = new GtkBorder ();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (textEntryHandle);
|
||||
- OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, gtkBorderPadding);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(textEntryHandle);
|
||||
+ OS.gtk_style_context_get_padding (context, styleState, gtkBorderPadding);
|
||||
return gtkBorderPadding;
|
||||
} else {
|
||||
//in GTK2 hard code the padding
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
|
||||
index 7550122..3bbb886 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
|
||||
@@ -255,9 +255,10 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
|
||||
if (OS.GTK3) {
|
||||
GtkBorder tmp = new GtkBorder();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (handle);
|
||||
- OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(handle);
|
||||
+ OS.gtk_style_context_get_padding (context, styleState, tmp);
|
||||
if ((style & SWT.BORDER) != 0) {
|
||||
- OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ OS.gtk_style_context_get_border (context, styleState, tmp);
|
||||
trim.x -= tmp.left;
|
||||
trim.y -= tmp.top;
|
||||
trim.width += tmp.left + tmp.right;
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
index ee9172e..8d5d0ba 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
@@ -591,7 +591,8 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
|
||||
if (OS.GTK3) {
|
||||
GtkBorder tmp = new GtkBorder();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (handle);
|
||||
- OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ int styleState = OS.gtk_widget_get_state_flags(handle);
|
||||
+ OS.gtk_style_context_get_padding (context, styleState, tmp);
|
||||
trim.x -= tmp.left;
|
||||
trim.y -= tmp.top;
|
||||
trim.width += tmp.left + tmp.right;
|
||||
@@ -598,7 +602,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
|
||||
trim.width += tmp.left + tmp.right;
|
||||
trim.height += tmp.top + tmp.bottom;
|
||||
if ((style & SWT.BORDER) != 0) {
|
||||
- OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
|
||||
+ OS.gtk_style_context_get_border (context, styleState, tmp);
|
||||
trim.x -= tmp.left;
|
||||
trim.y -= tmp.top;
|
||||
trim.width += tmp.left + tmp.right;
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
From 531d3f18481988494e77b5f1ded92a7f346ea14d Mon Sep 17 00:00:00 2001
|
||||
From: Eric Williams
|
||||
Date: Wed, 28 Oct 2015 10:52:36 -0400
|
||||
Subject: Bug 480986: [Wayland] Workspace chooser won't launch
|
||||
|
||||
gtk_size_allocate() in Shell is called more often on Wayland. These
|
||||
additional and unexpected calls trigger an infinite recursive call to
|
||||
resizeBounds(), which causes non-resizable Shells/Dialogs to crash.
|
||||
|
||||
The fix is to only resize Shells that have the SWT.RESIZE attribute
|
||||
enabled.
|
||||
|
||||
Tested on Gtk3.16 on Wayland, Gtk3.16 on X, and Gtk2.24. AllNonBrowser
|
||||
JUnit test cases pass on Gtk3 running X. There are some irregularities
|
||||
with test cases on Wayland, as outlined in bug 480893.
|
||||
|
||||
Change-Id: I55612d8486cdd512e275a8a7456e0197ed717c75
|
||||
Signed-off-by: Eric Williams <ericwill@redhat.com>
|
||||
---
|
||||
.../Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
|
||||
index d65af5c..49ae036 100644
|
||||
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
|
||||
@@ -1528,10 +1528,15 @@ long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
|
||||
OS.gtk_widget_get_allocation (shellHandle, widgetAllocation);
|
||||
int width = widgetAllocation.width;
|
||||
int height = widgetAllocation.height;
|
||||
- if (!resized || oldWidth != width || oldHeight != height) {
|
||||
+
|
||||
+ // Bug 474235: on Wayland gtk_size_allocate() is called more frequently, causing an
|
||||
+ // infinitely recursive resize call. This causes non-resizable Shells/Dialogs to
|
||||
+ // crash. Fix: only call resizeBounds() on resizable Shells.
|
||||
+ if ((!resized || oldWidth != width || oldHeight != height)
|
||||
+ && (OS.GTK3 && !OS.isX11() ? ((style & SWT.RESIZE) != 0) : true)) { //Wayland
|
||||
oldWidth = width;
|
||||
oldHeight = height;
|
||||
- resizeBounds (width, height, true);
|
||||
+ resizeBounds (width, height, true); //this is called to resize child widgets when the shell is resized.
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
From 3dc220718412431322c00e1f820c9ce0168892f5 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Williams
|
||||
Date: Mon, 23 Nov 2015 10:37:11 -0500
|
||||
Subject: Bug 481122: [GTK3.18+] some set/get Background/Foreground color
|
||||
methods have no effect
|
||||
|
||||
With changes in GTK3.18 and onward, gtk_style_context_get_color()
|
||||
behaves differently. In order to correctly fetch the color we must first
|
||||
save the GtkStyleContext, set its state, fetch the color, and then
|
||||
restore the GtkStyleContext. Failure to do this on GTK3.18+ leads to
|
||||
failures in the getForegroundColor() method.
|
||||
|
||||
The convenience method styleContextGetColor() in Display takes care of
|
||||
the process.
|
||||
|
||||
Tested on GTK 3.18, 3.16, 3.14, 3.8, and 2.24. All foreground color
|
||||
related tests on GTK3 now pass. GTK2 behaviour remains unchanged.
|
||||
|
||||
Change-Id: I6423edab5038dc0ef54afc6dd826f19fc936f987
|
||||
Signed-off-by: Eric Williams <ericwill@redhat.com>
|
||||
---
|
||||
.../gtk/org/eclipse/swt/widgets/Control.java | 2 +-
|
||||
.../gtk/org/eclipse/swt/widgets/Display.java | 36 ++++++++++++++--------
|
||||
.../gtk/org/eclipse/swt/widgets/Text.java | 2 +-
|
||||
3 files changed, 26 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
index ffd9d11..7061084 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
@@ -2626,7 +2626,7 @@ GdkColor getContextColor () {
|
||||
long /*int*/ fontHandle = fontHandle ();
|
||||
long /*int*/ context = OS.gtk_widget_get_style_context (fontHandle);
|
||||
GdkRGBA rgba = new GdkRGBA ();
|
||||
- OS.gtk_style_context_get_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
+ rgba = display.styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
GdkColor color = new GdkColor ();
|
||||
color.red = (short)(rgba.red * 0xFFFF);
|
||||
color.green = (short)(rgba.green * 0xFFFF);
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
|
||||
index 0119882..d7e670c 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
|
||||
@@ -2373,8 +2373,7 @@ void initializeSystemColors () {
|
||||
OS.gtk_style_context_add_class (context, OS.GTK_STYLE_CLASS_TOOLTIP);
|
||||
OS.gtk_style_context_invalidate(context);
|
||||
GdkRGBA rgba = new GdkRGBA();
|
||||
- OS.gtk_style_context_get_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
- COLOR_INFO_FOREGROUND = toGdkColor (rgba);
|
||||
+ COLOR_INFO_FOREGROUND = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL, rgba));
|
||||
getBackgroundColor (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
COLOR_INFO_BACKGROUND = toGdkColor (rgba);
|
||||
OS.gtk_widget_destroy (tooltipShellHandle);
|
||||
@@ -2387,8 +2386,7 @@ void initializeSystemColors () {
|
||||
COLOR_WIDGET_NORMAL_SHADOW = toGdkColor (rgba, 0.7);
|
||||
COLOR_WIDGET_HIGHLIGHT_SHADOW = toGdkColor (rgba, 1.3);
|
||||
|
||||
- OS.gtk_style_context_get_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
- COLOR_WIDGET_FOREGROUND = toGdkColor (rgba);
|
||||
+ COLOR_WIDGET_FOREGROUND = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL, rgba));
|
||||
OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
COLOR_WIDGET_BACKGROUND = toGdkColor (rgba);
|
||||
|
||||
@@ -2396,17 +2394,14 @@ void initializeSystemColors () {
|
||||
OS.gtk_style_context_add_class(context, OS.GTK_STYLE_CLASS_VIEW);
|
||||
OS.gtk_style_context_add_class(context, OS.GTK_STYLE_CLASS_CELL);
|
||||
OS.gtk_style_context_invalidate(context);
|
||||
- OS.gtk_style_context_get_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
- COLOR_LIST_FOREGROUND = toGdkColor (rgba);
|
||||
+ COLOR_LIST_FOREGROUND = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL, rgba));
|
||||
OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
|
||||
COLOR_LIST_BACKGROUND = toGdkColor (rgba);
|
||||
OS.gtk_style_context_restore (context);
|
||||
- OS.gtk_style_context_get_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
|
||||
- COLOR_LIST_SELECTION_TEXT = toGdkColor (rgba);
|
||||
+ COLOR_LIST_SELECTION_TEXT = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_SELECTED, rgba));
|
||||
OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
|
||||
COLOR_LIST_SELECTION = toGdkColor (rgba);
|
||||
- OS.gtk_style_context_get_color (context, OS.GTK_STATE_FLAG_ACTIVE, rgba);
|
||||
- COLOR_LIST_SELECTION_TEXT_INACTIVE = toGdkColor (rgba);
|
||||
+ COLOR_LIST_SELECTION_TEXT_INACTIVE = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_ACTIVE, rgba));
|
||||
OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_ACTIVE, rgba);
|
||||
COLOR_LIST_SELECTION_INACTIVE = toGdkColor (rgba);
|
||||
|
||||
@@ -2415,8 +2410,7 @@ void initializeSystemColors () {
|
||||
OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
|
||||
COLOR_TITLE_BACKGROUND_GRADIENT = toGdkColor (rgba, 1.3);
|
||||
|
||||
- OS.gtk_style_context_get_color (context, OS.GTK_STATE_FLAG_INSENSITIVE, rgba);
|
||||
- COLOR_TITLE_INACTIVE_FOREGROUND = toGdkColor (rgba);
|
||||
+ COLOR_TITLE_INACTIVE_FOREGROUND = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_INSENSITIVE, rgba));
|
||||
OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_INSENSITIVE, rgba);
|
||||
COLOR_TITLE_INACTIVE_BACKGROUND = toGdkColor (rgba);
|
||||
COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT = toGdkColor (rgba, 1.3);
|
||||
@@ -2497,6 +2491,24 @@ void initializeSystemColors () {
|
||||
COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT = gdkColor;
|
||||
}
|
||||
|
||||
+GdkRGBA styleContextGetColor(long /*int*/ context, int flag, GdkRGBA rgba) {
|
||||
+ /*
|
||||
+ * Feature in GTK: we need to handle calls to gtk_style_context_get_color()
|
||||
+ * differently due to changes in GTK3.18+. This solves failing test cases
|
||||
+ * which started failing after GTK3.16. See Bug 481122 for more info.
|
||||
+ * Reference: https://blogs.gnome.org/mclasen/2015/11/20/a-gtk-update/
|
||||
+ */
|
||||
+ if (OS.GTK_VERSION >= OS.VERSION(3, 18, 0)) {
|
||||
+ OS.gtk_style_context_save(context);
|
||||
+ OS.gtk_style_context_set_state(context, flag);
|
||||
+ OS.gtk_style_context_get_color (context, flag, rgba);
|
||||
+ OS.gtk_style_context_restore(context);
|
||||
+ } else {
|
||||
+ OS.gtk_style_context_get_color (context, flag, rgba);
|
||||
+ }
|
||||
+ return rgba;
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* Returns the single instance of the system taskBar or null
|
||||
* when there is no system taskBar available for the platform.
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
index 2865cd5..6b68b6a 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
|
||||
@@ -1664,7 +1664,7 @@ void drawMessage (long /*int*/ cr) {
|
||||
if (OS.GTK3) {
|
||||
long /*int*/ styleContext = OS.gtk_widget_get_style_context (handle);
|
||||
GdkRGBA rgba = new GdkRGBA ();
|
||||
- OS.gtk_style_context_get_color (styleContext, OS.GTK_STATE_FLAG_INSENSITIVE, rgba);
|
||||
+ rgba = display.styleContextGetColor (styleContext, OS.GTK_STATE_FLAG_INSENSITIVE, rgba);
|
||||
textColor.red = (short)(rgba.red * 0xFFFF);
|
||||
textColor.green = (short)(rgba.green * 0xFFFF);
|
||||
textColor.blue = (short)(rgba.blue * 0xFFFF);
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
From 428cc3497ee844b9262d1bdc7cb09a8332eee87c Mon Sep 17 00:00:00 2001
|
||||
From: Eric Williams <ericwill@redhat.com>
|
||||
Date: Wed, 23 Dec 2015 09:55:43 -0500
|
||||
Subject: [PATCH] Bug 484696: [GTK] Empty repositories view links have white
|
||||
backgrounds
|
||||
|
||||
After bug 479998, an empty EGit repositories view still has mismatched
|
||||
label colors. It turns out in this case the background color of the
|
||||
parent composite was incorrect -- it should have been white (like on
|
||||
GTK3.14 and earlier) instead of gray.
|
||||
|
||||
In this case the parent composite's background color is set to be that
|
||||
of the TreeViewer which will display the future repository branches,
|
||||
information, etc. The default color for Trees/Tables is white. The fixes
|
||||
for bug 479998 and bug 479998 introduced a small regression which set
|
||||
the default color of Table/Trees to be gray. The issue in this case does
|
||||
not lie with the labels but with the color of the parent composite. With
|
||||
Table/Trees returning their proper default background color (white, or
|
||||
COLOR_LIST_BACKGROUND), the EGit label issue is fixed.
|
||||
|
||||
Tested on GTK3.18.6, 3.16, 3.14, and 2.24. AllNonBrowser JUnit tests
|
||||
pass on GTK3 and GTK2.
|
||||
|
||||
Change-Id: I47fe95c1ad5fc87411c0f27ff344f6369c9aa0c6
|
||||
Signed-off-by: Eric Williams <ericwill@redhat.com>
|
||||
---
|
||||
.../Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java | 16 +++++++++++++---
|
||||
.../Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java | 16 +++++++++++++---
|
||||
2 files changed, 26 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
index 89bd414..2510efa 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
@@ -3138,7 +3148,7 @@ void setBackgroundColor (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba
|
||||
selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF;
|
||||
selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF;
|
||||
if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
|
||||
- String css = "GtkTreeView {background-color: " + gtk_rgba_to_css_string(rgba) + ";}\n"
|
||||
+ String css = "GtkTreeView {background-color: " + gtk_rgba_to_css_string(background) + ";}\n"
|
||||
+ "GtkTreeView:selected {background-color: " + gtk_rgba_to_css_string(selectedBackground) + ";}";
|
||||
gtk_css_provider_load_from_css(context, css);
|
||||
} else {
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
index f8aaa6a..23cf3dc 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
@@ -3123,7 +3133,7 @@ void setBackgroundColor (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba
|
||||
selectedBackground.green = (defaultColor.green & 0xFFFF) / (float)0xFFFF;
|
||||
selectedBackground.blue = (defaultColor.blue & 0xFFFF) / (float)0xFFFF;
|
||||
if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
|
||||
- String css = "GtkTreeView {background-color: " + gtk_rgba_to_css_string(rgba) + ";}\n"
|
||||
+ String css = "GtkTreeView {background-color: " + gtk_rgba_to_css_string(background) + ";}\n"
|
||||
+ "GtkTreeView:selected {background-color: " + gtk_rgba_to_css_string(selectedBackground) + ";}";
|
||||
gtk_css_provider_load_from_css(context, css);
|
||||
} else {
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From 3b20eb8505d7eba958b07ebdccab29881c7016b5 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Williams
|
||||
Date: Tue, 9 Feb 2016 13:46:03 -0500
|
||||
Subject: Bug 486368: [GTK3] Preferences dialog background color garbled
|
||||
|
||||
Restore call to gtk_style_context_set_background() in order to prevent
|
||||
dialog background color issues on earlier versions of GTK.
|
||||
|
||||
Tested on GTK3.18, 3.16, 3.14, and 2.24. AllNonBrowser JUnit tests pass
|
||||
on GTK2 and GTK3.
|
||||
|
||||
Change-Id: I1885f7e0a3d9312c4f7fe033c9a80abf31f20182
|
||||
Signed-off-by: Eric Williams <ericwill@redhat.com>
|
||||
---
|
||||
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
|
||||
index 8f5d022..032ce43 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
|
||||
@@ -512,7 +512,9 @@ static void swt_fixed_realize (GtkWidget *widget) {
|
||||
window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
|
||||
gtk_widget_set_window (widget, window);
|
||||
gdk_window_set_user_data (window, widget);
|
||||
- gtk_style_context_set_background (gtk_widget_get_style_context (widget), window);
|
||||
+ if (NULL != gtk_check_version (3, 18, 0)) {
|
||||
+ gtk_style_context_set_background (gtk_widget_get_style_context (widget), window);
|
||||
+ }
|
||||
}
|
||||
|
||||
static void swt_fixed_map (GtkWidget *widget) {
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
From d0a9c478604ba6a32016a631c6d0b05ac839dffe Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kurtakov
|
||||
Date: Fri, 12 Feb 2016 11:57:13 +0200
|
||||
Subject: Bug 487712 - Snippet128 crashes on Fedora
|
||||
|
||||
Bug in ProgressBar due to calling gdk_window_process_updates which sends
|
||||
expose events for redrawing purposes. But this event is implementation
|
||||
detail in GTK3 and shouldn't be used from outside and playing with it
|
||||
leads to race conditions with webkitgtk.
|
||||
Also GtkProgressBar redraws properly now so trying to force redraw is
|
||||
useless on GTK 3.
|
||||
|
||||
Change-Id: I22373b9e33c83759e0ff9dc2d0600fe39cacb91e
|
||||
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
|
||||
---
|
||||
.../gtk/org/eclipse/swt/widgets/ProgressBar.java | 24 ++++++++++++----------
|
||||
1 file changed, 13 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
|
||||
index d6749ef..cbdd8c7 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
|
||||
@@ -1,5 +1,5 @@
|
||||
/*******************************************************************************
|
||||
- * Copyright (c) 2000, 2013 IBM Corporation and others.
|
||||
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
@@ -301,16 +301,18 @@ void updateBar (int selection, int minimum, int maximum) {
|
||||
|
||||
double fraction = minimum == maximum ? 1 : (double)(selection - minimum) / (maximum - minimum);
|
||||
OS.gtk_progress_bar_set_fraction (handle, fraction);
|
||||
- /*
|
||||
- * Feature in GTK. The progress bar does
|
||||
- * not redraw right away when a value is
|
||||
- * changed. This is not strictly incorrect
|
||||
- * but unexpected. The fix is to force all
|
||||
- * outstanding redraws to be delivered.
|
||||
- */
|
||||
- long /*int*/ window = paintWindow ();
|
||||
- OS.gdk_window_process_updates (window, false);
|
||||
- OS.gdk_flush ();
|
||||
+ if (!OS.GTK3) {
|
||||
+ /*
|
||||
+ * Feature in GTK. The progress bar does
|
||||
+ * not redraw right away when a value is
|
||||
+ * changed. This is not strictly incorrect
|
||||
+ * but unexpected. The fix is to force all
|
||||
+ * outstanding redraws to be delivered.
|
||||
+ */
|
||||
+ long /*int*/ window = paintWindow ();
|
||||
+ OS.gdk_window_process_updates (window, false);
|
||||
+ OS.gdk_flush ();
|
||||
+ }
|
||||
}
|
||||
|
||||
void gtk_orientable_set_orientation (long /*int*/ pbar, int orientation) {
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,318 @@
|
|||
From 46e387352f469e26ecedddc10ffec2cd16f11d82 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Williams
|
||||
Date: Fri, 19 Feb 2016 15:59:12 -0500
|
||||
Subject: Bug 488226: [GTK3] Content Assist using Table/Tree has wrong
|
||||
selection background colors
|
||||
|
||||
On GTK3.14 and above, SWT.COLOR_LIST_SELECTION was returning gray
|
||||
instead of the default (and correct) blue. This causes bugs in
|
||||
Table/Tree, making highlighted TableItems/TreeItems difficult to read.
|
||||
COLOR_LIST_BACKGROUND is unaffected.
|
||||
|
||||
System background colors like SWT.COLOR_* are fetched using
|
||||
gtk_style_context_get_background_color() when SWT loads. This approach
|
||||
is no longer valid as 1) it is deprecated on the GTK side and 2) it is
|
||||
unreliable/not guaranteed to work. This patch only changes this behavior
|
||||
for SWT.COLOR_LIST_SELECTION, but in the future other system colors will
|
||||
need to be changed as well.
|
||||
|
||||
The fix in this case is to fetch the GTK theme colors of the currently
|
||||
running system theme from GTK. This can be done using GtkCssProvider.
|
||||
Once the currently running theme is fetched, the correct selection
|
||||
background color can be extracted. If there is no selection background
|
||||
color specified in the theme, then the fall-back is to load the color
|
||||
via SWT's COLOR_LIST_SELECTION. This ensures that the correct color is
|
||||
chosen according to GTK, should a theme specify one.
|
||||
|
||||
Tested on GTK3.8, 3.14, 3.16, and 3.18. AllNonBrowser JUnit tests pass
|
||||
on GTK3 and GTK2.
|
||||
|
||||
Change-Id: Ic9aeb4d35efef961be1f724a2ad7dcc852c06453
|
||||
Signed-off-by: Eric Williams <ericwill@redhat.com>
|
||||
---
|
||||
.../Eclipse SWT PI/gtk/library/os.c | 27 ++++++
|
||||
.../Eclipse SWT PI/gtk/library/os_custom.h | 1 +
|
||||
.../Eclipse SWT PI/gtk/library/os_stats.c | 1 +
|
||||
.../Eclipse SWT PI/gtk/library/os_stats.h | 1 +
|
||||
.../gtk/org/eclipse/swt/internal/gtk/OS.java | 14 +++
|
||||
.../gtk/org/eclipse/swt/widgets/Control.java | 17 +---
|
||||
.../gtk/org/eclipse/swt/widgets/Display.java | 108 ++++++++++++++++++++-
|
||||
7 files changed, 153 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
index 64e39f3..02dbadd 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
|
||||
@@ -10056,6 +10056,33 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1set_1border_1width)
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifndef NO__1gtk_1css_1provider_1get_1named
|
||||
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1css_1provider_1get_1named)
|
||||
+ (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
|
||||
+{
|
||||
+ jbyte *lparg0=NULL;
|
||||
+ jbyte *lparg1=NULL;
|
||||
+ jintLong rc = 0;
|
||||
+ OS_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1get_1named_FUNC);
|
||||
+ if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
|
||||
+ if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
|
||||
+/*
|
||||
+ rc = (jintLong)gtk_css_provider_get_named((const gchar *)lparg0, (const gchar *)lparg1);
|
||||
+*/
|
||||
+ {
|
||||
+ OS_LOAD_FUNCTION(fp, gtk_css_provider_get_named)
|
||||
+ if (fp) {
|
||||
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, const gchar *))fp)((const gchar *)lparg0, (const gchar *)lparg1);
|
||||
+ }
|
||||
+ }
|
||||
+fail:
|
||||
+ if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
|
||||
+ if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
|
||||
+ OS_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1get_1named_FUNC);
|
||||
+ return rc;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#ifndef NO__1gtk_1css_1provider_1load_1from_1data
|
||||
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1css_1provider_1load_1from_1data)
|
||||
(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLongArray arg3)
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
|
||||
index 7a27475..8e5844b 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
|
||||
@@ -530,6 +530,7 @@
|
||||
#define gtk_css_provider_load_from_data_LIB LIB_GTK
|
||||
#define gtk_css_provider_new_LIB LIB_GTK
|
||||
#define gtk_css_provider_to_string_LIB LIB_GTK
|
||||
+#define gtk_css_provider_get_named_LIB LIB_GTK
|
||||
#define gtk_icon_set_render_icon_pixbuf_LIB LIB_GTK
|
||||
#define gtk_drag_set_icon_surface_LIB LIB_GTK
|
||||
#define gtk_accel_label_set_accel_LIB LIB_GTK
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
|
||||
index 5d77479..670adf8 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
|
||||
@@ -729,6 +729,7 @@ char * OS_nativeFunctionNames[] = {
|
||||
"_1gtk_1container_1remove",
|
||||
"_1gtk_1container_1resize_1children",
|
||||
"_1gtk_1container_1set_1border_1width",
|
||||
+ "_1gtk_1css_1provider_1get_1named",
|
||||
"_1gtk_1css_1provider_1load_1from_1data",
|
||||
"_1gtk_1css_1provider_1new",
|
||||
"_1gtk_1css_1provider_1to_1string",
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
|
||||
index a0a30b7..11fdfe4 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
|
||||
@@ -739,6 +739,7 @@ typedef enum {
|
||||
_1gtk_1container_1remove_FUNC,
|
||||
_1gtk_1container_1resize_1children_FUNC,
|
||||
_1gtk_1container_1set_1border_1width_FUNC,
|
||||
+ _1gtk_1css_1provider_1get_1named_FUNC,
|
||||
_1gtk_1css_1provider_1load_1from_1data_FUNC,
|
||||
_1gtk_1css_1provider_1new_FUNC,
|
||||
_1gtk_1css_1provider_1to_1string_FUNC,
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
index d3e52c3..353d4b7 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
@@ -650,6 +650,7 @@ public class OS extends C {
|
||||
public static final byte[] gtk_show_input_method_menu = ascii("gtk-show-input-method-menu");
|
||||
public static final byte[] gtk_menu_bar_accel = ascii("gtk-menu-bar-accel");
|
||||
public static final byte[] gtk_menu_images = ascii("gtk-menu-images");
|
||||
+ public static final byte[] gtk_theme_name = ascii("gtk-theme-name");
|
||||
public static final byte[] inner_border = ascii("inner-border");
|
||||
public static final byte[] has_backward_stepper = ascii("has-backward-stepper");
|
||||
public static final byte[] has_secondary_backward_stepper = ascii("has-secondary-backward-stepper");
|
||||
@@ -9299,6 +9300,19 @@ public static final long /*int*/gtk_css_provider_to_string(long /*int*/ provider
|
||||
lock.unlock();
|
||||
}
|
||||
}
|
||||
+/** @method flags=dynamic
|
||||
+ * @param name cast=(const gchar *)
|
||||
+ * @param variant cast=(const gchar *)
|
||||
+ */
|
||||
+public static final native long /*int*/ _gtk_css_provider_get_named (byte[] name, byte[] variant);
|
||||
+public static final long /*int*/gtk_css_provider_get_named(byte[] name, byte[] variant) {
|
||||
+ lock.lock();
|
||||
+ try {
|
||||
+ return _gtk_css_provider_get_named(name, variant);
|
||||
+ } finally {
|
||||
+ lock.unlock();
|
||||
+ }
|
||||
+}
|
||||
/**
|
||||
* @method flags=dynamic
|
||||
* @param screen cast=(GdkScreen *)
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
index d296192..741a4e2 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
|
||||
@@ -4178,7 +4178,7 @@ GdkColor gtk_css_parse_background (long /*int*/ provider) {
|
||||
shortOutput = cssOutput.substring (startIndex + 18);
|
||||
// Double check to make sure with have a valid rgb/rgba property
|
||||
if (shortOutput.contains ("rgba") || shortOutput.contains ("rgb")) {
|
||||
- rgba = gtk_css_property_to_rgba (shortOutput);
|
||||
+ rgba = display.gtk_css_property_to_rgba (shortOutput);
|
||||
} else {
|
||||
return display.COLOR_WIDGET_BACKGROUND;
|
||||
}
|
||||
@@ -4187,7 +4187,7 @@ GdkColor gtk_css_parse_background (long /*int*/ provider) {
|
||||
shortOutput = cssOutput.substring (startIndex + 13);
|
||||
// Double check to make sure with have a valid rgb/rgba property
|
||||
if (shortOutput.contains ("rgba") || shortOutput.contains ("rgb")) {
|
||||
- rgba = gtk_css_property_to_rgba (shortOutput);
|
||||
+ rgba = display.gtk_css_property_to_rgba (shortOutput);
|
||||
} else {
|
||||
return display.COLOR_WIDGET_BACKGROUND;
|
||||
}
|
||||
@@ -4195,18 +4195,6 @@ GdkColor gtk_css_parse_background (long /*int*/ provider) {
|
||||
return color;
|
||||
}
|
||||
|
||||
-GdkRGBA gtk_css_property_to_rgba(String property) {
|
||||
- /* Here we convert rgb(...) or rgba(...) properties
|
||||
- * into GdkRGBA objects using gdk_rgba_parse(). Note
|
||||
- * that we still need to remove the ";" character from the
|
||||
- * input string.
|
||||
- */
|
||||
- GdkRGBA rgba = new GdkRGBA ();
|
||||
- String [] propertyParsed = new String [1];
|
||||
- propertyParsed = property.split (";");
|
||||
- OS.gdk_rgba_parse (rgba, Converter.wcsToMbcs (null, propertyParsed[0], true));
|
||||
- return rgba;
|
||||
-}
|
||||
|
||||
void gtk_css_provider_load_from_css (long /*int*/ context, String css) {
|
||||
/* Utility function. */
|
||||
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
|
||||
index 49c0e0d..7dee6d7 100644
|
||||
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
|
||||
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
|
||||
@@ -1693,6 +1693,99 @@ long /*int*/ gtk_cell_renderer_toggle_get_type () {
|
||||
return toggle_renderer_type;
|
||||
}
|
||||
|
||||
+String gtk_css_default_theme_values (int swt) {
|
||||
+ /*
|
||||
+ * This method fetches GTK theme values/properties. This is accomplished
|
||||
+ * by determining the name of the current system theme loaded, giving that
|
||||
+ * name to GTK, and then parsing values from the returned theme contents.
|
||||
+ *
|
||||
+ * The idea here is that SWT variables that have corresponding GTK theme
|
||||
+ * elements can be fetched easily by supplying the SWT variable as an
|
||||
+ * parameter to this method.
|
||||
+ */
|
||||
+
|
||||
+ // Find CSS theme name
|
||||
+ byte [] buffer;
|
||||
+ int length;
|
||||
+ long /*int*/ settings = OS.gtk_settings_get_default ();
|
||||
+ long /*int*/ [] ptr = new long /*int*/ [1];
|
||||
+ long /*int*/ str;
|
||||
+ OS.g_object_get (settings, OS.gtk_theme_name, ptr, 0);
|
||||
+ if (ptr [0] == 0) {
|
||||
+ return "";
|
||||
+ }
|
||||
+ length = OS.strlen (ptr [0]);
|
||||
+ if (length == 0) {
|
||||
+ return "";
|
||||
+ }
|
||||
+ buffer = new byte [length];
|
||||
+ OS.memmove (buffer, ptr [0], length);
|
||||
+ OS.g_free (ptr [0]);
|
||||
+
|
||||
+ // Fetch the actual theme in char/string format
|
||||
+ long /*int*/ themeProvider = OS.gtk_css_provider_get_named(buffer, null);
|
||||
+ str = OS.gtk_css_provider_to_string (themeProvider);
|
||||
+ length = OS.strlen (str);
|
||||
+ if (length == 0) {
|
||||
+ return "";
|
||||
+ }
|
||||
+ buffer = new byte [length];
|
||||
+ OS.memmove (buffer, str, length);
|
||||
+ String cssOutput = new String (Converter.mbcsToWcs (null, buffer));
|
||||
+
|
||||
+ // Parse the theme values based on the corresponding SWT value
|
||||
+ // i.e. theme_selected_bg_color in GTK is SWT.COLOR_LIST_SELECTION in SWT
|
||||
+ String color;
|
||||
+ switch (swt) {
|
||||
+ case SWT.COLOR_LIST_SELECTION:
|
||||
+ /*
|
||||
+ * These strings are the GTK named colors we are looking for.
|
||||
+ *
|
||||
+ * NOTE: we need to be careful of cases where one is being assigned
|
||||
+ * to the other. For example we do NOT want to parse:
|
||||
+ * @define-color theme_selected_bg_color selected_bg_color
|
||||
+ * Instead we want the actual value for selected_bg_color, i.e.
|
||||
+ * @define-color selected_bg_color rgb(255, 255, 255)
|
||||
+ *
|
||||
+ * We also want to filter out any color formats other than #xxyyzz,
|
||||
+ * rgb(xxx,yyy,zzz) and rgba(www,xxx,yyy,zzz) since gdk_rgba_parse()
|
||||
+ * can only handle strings in this format.
|
||||
+ */
|
||||
+ int tSelected = cssOutput.indexOf ("@define-color theme_selected_bg_color");
|
||||
+ int selected = cssOutput.indexOf ("@define-color selected_bg_color");
|
||||
+ if (tSelected != -1) {
|
||||
+ color = cssOutput.substring(tSelected + 38);
|
||||
+ if (color.startsWith("#") || color.startsWith("rgb")) {
|
||||
+ return color;
|
||||
+ }
|
||||
+ }
|
||||
+ if (selected != -1) {
|
||||
+ color = cssOutput.substring(selected + 32);
|
||||
+ if (color.startsWith("#") || color.startsWith("rgb")) {
|
||||
+ return color;
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ return "";
|
||||
+ }
|
||||
+ default:
|
||||
+ return "";
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+GdkRGBA gtk_css_property_to_rgba(String property) {
|
||||
+ /* Here we convert rgb(...) or rgba(...) properties
|
||||
+ * into GdkRGBA objects using gdk_rgba_parse(). Note
|
||||
+ * that we still need to remove the ";" character from the
|
||||
+ * input string.
|
||||
+ */
|
||||
+ GdkRGBA rgba = new GdkRGBA ();
|
||||
+ String [] propertyParsed = new String [1];
|
||||
+ propertyParsed = property.split (";");
|
||||
+ OS.gdk_rgba_parse (rgba, Converter.wcsToMbcs (null, propertyParsed[0], true));
|
||||
+ return rgba;
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* Returns the default display. One is created (making the
|
||||
* thread that invokes this method its user-interface thread)
|
||||
@@ -2409,7 +2502,20 @@ void initializeSystemColors () {
|
||||
COLOR_LIST_BACKGROUND = toGdkColor (rgba);
|
||||
OS.gtk_style_context_restore (context);
|
||||
COLOR_LIST_SELECTION_TEXT = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_SELECTED, rgba));
|
||||
- OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
|
||||
+
|
||||
+ // SWT.COLOR_LIST_SELECTION will be fetched using GTK CSS for GTK3.14+.
|
||||
+ // TODO: convert other system colors to this method and re-factor.
|
||||
+ if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
|
||||
+ String colorListSelection = gtk_css_default_theme_values(SWT.COLOR_LIST_SELECTION);
|
||||
+ if (!colorListSelection.isEmpty()) {
|
||||
+ rgba = gtk_css_property_to_rgba (colorListSelection);
|
||||
+ } else {
|
||||
+ OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
|
||||
+ }
|
||||
+ } else {
|
||||
+ OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
|
||||
+ }
|
||||
+
|
||||
COLOR_LIST_SELECTION = toGdkColor (rgba);
|
||||
COLOR_LIST_SELECTION_TEXT_INACTIVE = toGdkColor (styleContextGetColor (context, OS.GTK_STATE_FLAG_ACTIVE, rgba));
|
||||
OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_ACTIVE, rgba);
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2014-04-08 15:47:19.927087084 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2014-04-08 15:48:00.045367311 +0100
|
||||
@@ -59,7 +59,7 @@
|
||||
id="org.eclipse.help.source"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <requires>
|
||||
+ <!--requires>
|
||||
<import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
|
||||
<import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
|
||||
<import feature="org.eclipse.ecf.core.source.feature" version="1.1.0" match="compatible"/>
|
||||
@@ -68,7 +68,7 @@
|
||||
<import feature="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="3.8.0" match="compatible"/>
|
||||
<import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="1.0.0" match="compatible"/>
|
||||
<import feature="org.eclipse.ecf.filetransfer.ssl.source.feature" version="1.0.0" match="compatible"/>
|
||||
- </requires>
|
||||
+ </requires-->
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.sdk"
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2015-03-31 10:28:54.530277349 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2015-03-31 10:29:46.232519773 +0100
|
||||
@@ -4,18 +4,12 @@
|
||||
id="org.eclipse.sdk.tests"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
- id="org.eclipse.equinox.p2.sdk"
|
||||
- version="0.0.0" />
|
||||
- <feature
|
||||
id="org.eclipse.equinox.p2.discovery.feature"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
id="org.eclipse.core.runtime.feature"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
- id="org.eclipse.equinox.sdk"
|
||||
- version="0.0.0" />
|
||||
- <feature
|
||||
id="org.eclipse.sdk.examples.source"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
@@ -25,9 +19,6 @@
|
||||
id="org.eclipse.swt.tools.feature"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
- id="org.eclipse.rcp.configuration"
|
||||
- version="0.0.0" />
|
||||
- <feature
|
||||
id="org.eclipse.equinox.executable"
|
||||
version="0.0.0" />
|
||||
<feature
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml.orig 2015-05-05 11:43:27.284457130 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml 2015-05-05 11:47:54.058051862 +0100
|
||||
@@ -118,30 +118,10 @@
|
||||
<!-- source repositories to mirror from -->
|
||||
|
||||
<repository>
|
||||
- <url>${project.baseUri}/../rcp/target/repository</url>
|
||||
- <layout>p2</layout>
|
||||
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
|
||||
- </repository>
|
||||
- <repository>
|
||||
- <url>${project.baseUri}/../rcp.sdk/target/repository</url>
|
||||
- <layout>p2</layout>
|
||||
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
|
||||
- </repository>
|
||||
- <repository>
|
||||
<url>${project.baseUri}/../platform/target/repository</url>
|
||||
<layout>p2</layout>
|
||||
<!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
|
||||
</repository>
|
||||
- <repository>
|
||||
- <url>${project.baseUri}/../platform.sdk/target/repository</url>
|
||||
- <layout>p2</layout>
|
||||
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
|
||||
- </repository>
|
||||
- <repository>
|
||||
- <url>${project.baseUri}/../sdk/target/repository</url>
|
||||
- <layout>p2</layout>
|
||||
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
|
||||
- </repository>
|
||||
<repository>
|
||||
<url>${project.baseUri}/../eclipse-junit-tests/target/repository</url>
|
||||
<layout>p2</layout>
|
||||
|
|
@ -1,23 +1,35 @@
|
|||
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2018-08-19 12:37:52.764590467 +0100
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2018-08-19 12:38:15.032503913 +0100
|
||||
@@ -72,7 +72,8 @@
|
||||
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig 2014-03-12 10:43:26.000000000 +0000
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 2014-03-12 14:36:44.130938292 +0000
|
||||
@@ -115,7 +115,7 @@
|
||||
WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
|
||||
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
|
||||
|
||||
MAKE_TYPE=make
|
||||
-CFLAGS = -O -Wall \
|
||||
+CFLAGS = -g -O -Wall \
|
||||
-DSWT_VERSION=$(SWT_VERSION) \
|
||||
$(NATIVE_STATS) \
|
||||
-DLINUX -DGTK \
|
||||
@@ -125,12 +125,6 @@
|
||||
${SWT_PTR_CFLAGS}
|
||||
LFLAGS = -shared -fPIC ${SWT_LFLAGS}
|
||||
|
||||
-export CFLAGS='-O -Wall -fPIC'
|
||||
+export CFLAGS='-O -g -Wall -fPIC'
|
||||
+export NO_STRIP=1
|
||||
-ifndef NO_STRIP
|
||||
- AWT_LFLAGS := $(AWT_LFLAGS) -s
|
||||
- MOZILLALFLAGS := $(MOZILLALFLAGS) -s
|
||||
- LFLAGS := $(LFLAGS) -s
|
||||
-endif
|
||||
-
|
||||
all: make_swt make_atk make_glx make_webkit
|
||||
|
||||
# Determine which OS we are on
|
||||
if [ "${OS}" = "" ]; then
|
||||
#
|
||||
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2014-03-12 14:47:37.513191381 +0000
|
||||
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 2014-03-12 14:47:45.672200015 +0000
|
||||
@@ -91,7 +91,7 @@
|
||||
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
|
||||
-DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
|
||||
@@ -48,7 +48,7 @@
|
||||
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
|
||||
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
|
||||
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
|
||||
-CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
|
||||
+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
|
||||
-CFLAGS = ${M_ARCH} -g -s -Wall\
|
||||
+CFLAGS = ${M_ARCH} -g -Wall\
|
||||
-fpic \
|
||||
-DLINUX \
|
||||
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
|
||||
-DMOZILLA_FIX \
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
From edd5a395dd96699f91c463c0e0409a7488814775 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Tue, 16 Aug 2016 17:51:46 -0400
|
||||
Subject: [PATCH] Skip loading droplets in the configuration during
|
||||
reconciliation.
|
||||
|
||||
The reconciler attempts to load droplets as extended locations, which
|
||||
seems to be an expensive operation. Avoid doing this for the sake of
|
||||
efficiency.
|
||||
|
||||
Change-Id: Iaf07aacb2d7eaabf3730654e757e69d22f0bc4ab
|
||||
---
|
||||
.../internal/p2/reconciler/dropins/PlatformXmlListener.java | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
|
||||
index 802ee1b..74023fe 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
|
||||
@@ -168,11 +168,24 @@ public class PlatformXmlListener extends DirectoryChangeListener {
|
||||
* Ensure that we have a repository for each site in the given configuration.
|
||||
*/
|
||||
protected void synchronizeConfiguration(Configuration config) {
|
||||
+ String fragments = System.getProperty("p2.fragments");
|
||||
List<Site> sites = config.getSites();
|
||||
Set<IMetadataRepository> newRepos = new LinkedHashSet<>();
|
||||
Set<Site> toBeRemoved = new HashSet<>();
|
||||
for (Site site : sites) {
|
||||
String siteURL = site.getUrl();
|
||||
+ if (fragments != null) {
|
||||
+ String[] rootPaths = fragments.split(",");
|
||||
+ boolean skip = false;
|
||||
+ for (String path : rootPaths) {
|
||||
+ if (siteURL.startsWith("file:" + path)) {
|
||||
+ skip = true;
|
||||
+ }
|
||||
+ }
|
||||
+ if (skip) {
|
||||
+ continue;
|
||||
+ }
|
||||
+ }
|
||||
IMetadataRepository match = getMatchingRepo(Activator.getRepositories(), siteURL);
|
||||
if (match == null) {
|
||||
try {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From 889543269853e12925ef00a6e76c3dd85ce5b915 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Tue, 25 Oct 2016 16:48:28 -0400
|
||||
Subject: [PATCH] Disable uses by default (osgi.resolver.usesMode=ignore).
|
||||
set.
|
||||
|
||||
---
|
||||
.../felix/src/org/apache/felix/resolver/ResolverImpl.java | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
|
||||
index ded683f..7216865 100755
|
||||
--- rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
|
||||
@@ -1230,7 +1230,9 @@ public class ResolverImpl implements Resolver
|
||||
{
|
||||
public void run()
|
||||
{
|
||||
- computeUses(session, allWireCandidates, allPackages, resource);
|
||||
+ if (! "ignore".equals(System.getProperty("osgi.resolver.usesMode"))) {
|
||||
+ computeUses(session, allWireCandidates, allPackages, resource);
|
||||
+ }
|
||||
}
|
||||
});
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
From 7db3fba25fe89240fa80661d81a5dffa2f31ff14 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kurtakov
|
||||
Date: Mon, 12 Oct 2015 19:08:43 +0300
|
||||
Subject: Bug 479580 - Widgets with V_SCROLL not scrollable
|
||||
|
||||
Hiding scrollbar for widget created with style V_SCROLL shouldn't stop
|
||||
other means of scrolling e.g. mouse wheel.
|
||||
The fix is to use new GTK_POLICY_EXTERNAL (added in GTK 3.16) which
|
||||
allows scrolling when scrollbars invisible which was not the possible
|
||||
before that.
|
||||
|
||||
Change-Id: Icffb3c7792458369a7a7ee07dc317d83bf0757b2
|
||||
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
|
||||
---
|
||||
.../Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 1 +
|
||||
.../Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java | 3 +++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
index fe8283d..cf8cda6 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
|
||||
@@ -363,6 +363,7 @@ public class OS extends C {
|
||||
public static final int GTK_POLICY_ALWAYS = 0x0;
|
||||
public static final int GTK_POLICY_AUTOMATIC = 0x1;
|
||||
public static final int GTK_POLICY_NEVER = 0x2;
|
||||
+ public static final int GTK_POLICY_EXTERNAL = 0x3;
|
||||
public static final int GTK_POS_TOP = 0x2;
|
||||
public static final int GTK_POS_BOTTOM = 0x3;
|
||||
public static final int GTK_PRINT_CAPABILITY_PAGE_SET = 1 << 0;
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
|
||||
index 2d38a95..7295a27 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
|
||||
@@ -389,6 +389,9 @@ boolean setScrollBarVisible (ScrollBar bar, boolean visible) {
|
||||
int [] hsp = new int [1], vsp = new int [1];
|
||||
OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
|
||||
int policy = visible ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
|
||||
+ if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0) && !visible) {
|
||||
+ policy = OS.GTK_POLICY_EXTERNAL;
|
||||
+ }
|
||||
if ((bar.style & SWT.HORIZONTAL) != 0) {
|
||||
if (hsp [0] == policy) return false;
|
||||
hsp [0] = policy;
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
|
|
@ -1,36 +1,11 @@
|
|||
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig 2018-08-17 01:24:16.000000000 +0100
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2018-08-19 12:50:33.575708475 +0100
|
||||
@@ -19,6 +19,23 @@
|
||||
%license
|
||||
</license>
|
||||
diff --git eclipse.jdt/org.eclipse.jdt-feature/feature.xml eclipse.jdt/org.eclipse.jdt-feature/feature.xml
|
||||
index 0743586..1cbf404 100644
|
||||
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml
|
||||
@@ -154,19 +154,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
+ <requires>
|
||||
+ <import plugin="org.junit" />
|
||||
+ <import plugin="org.hamcrest.core" />
|
||||
+ <import plugin="org.junit.jupiter.api" />
|
||||
+ <import plugin="org.junit.jupiter.engine" />
|
||||
+ <import plugin="org.junit.jupiter.migrationsupport" />
|
||||
+ <import plugin="org.junit.jupiter.params" />
|
||||
+ <import plugin="org.junit.platform.commons" />
|
||||
+ <import plugin="org.junit.platform.engine" />
|
||||
+ <import plugin="org.junit.platform.launcher" />
|
||||
+ <import plugin="org.junit.platform.runner" />
|
||||
+ <import plugin="org.junit.platform.suite.api" />
|
||||
+ <import plugin="org.junit.vintage.engine" />
|
||||
+ <import plugin="org.opentest4j" />
|
||||
+ <import plugin="org.apiguardian" />
|
||||
+ </requires>
|
||||
+
|
||||
<plugin
|
||||
id="org.eclipse.jdt"
|
||||
download-size="0"
|
||||
@@ -158,103 +175,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
|
|
@ -44,108 +19,27 @@
|
|||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.jupiter.api"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.jupiter.engine"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.jupiter.migrationsupport"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.jupiter.params"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.platform.commons"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.platform.engine"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.platform.launcher"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.platform.runner"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.platform.suite.api"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit.vintage.engine"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.opentest4j"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apiguardian"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
id="org.eclipse.jdt.doc.user"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -196,4 +183,9 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
+ <requires>
|
||||
+ <import plugin="org.junit" />
|
||||
+ <import plugin="org.hamcrest.core" />
|
||||
+ </requires>
|
||||
+
|
||||
</feature>
|
||||
diff --git eclipse.pde/org.eclipse.pde-feature/feature.xml eclipse.pde/org.eclipse.pde-feature/feature.xml
|
||||
index 88a8daa..382c5ee 100644
|
||||
--- eclipse.pde/org.eclipse.pde-feature/feature.xml
|
||||
+++ eclipse.pde/org.eclipse.pde-feature/feature.xml
|
||||
@@ -82,20 +82,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
--- eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml.orig 2018-08-17 01:24:16.000000000 +0100
|
||||
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml 2018-08-19 12:53:08.128130452 +0100
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
<requires>
|
||||
<import feature="org.eclipse.jdt" version="3.15.0" match="compatible"/>
|
||||
+ <import plugin="org.objectweb.asm" />
|
||||
+ <import plugin="org.objectweb.asm.tree" />
|
||||
</requires>
|
||||
|
||||
<plugin
|
||||
@@ -83,20 +85,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.objectweb.asm"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
|
|
@ -157,12 +51,27 @@
|
|||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.pde.api.tools"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -158,4 +144,9 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig 2017-01-04 10:57:15.000000000 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2017-01-13 11:29:16.371473551 +0000
|
||||
@@ -23,69 +23,6 @@
|
||||
+ <requires>
|
||||
+ <import plugin="org.objectweb.asm" />
|
||||
+ <import plugin="org.objectweb.asm.tree" />
|
||||
+ </requires>
|
||||
+
|
||||
</feature>
|
||||
diff --git eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
|
||||
index c6d5da0..e76f33f 100644
|
||||
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
|
||||
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
|
||||
@@ -21,62 +21,6 @@
|
||||
</license>
|
||||
|
||||
<plugin
|
||||
|
|
@ -208,7 +117,7 @@
|
|||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.lucene.analyzers-common"
|
||||
- id="org.apache.lucene.analysis"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
|
|
@ -221,18 +130,11 @@
|
|||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.lucene.analyzers-smartcn"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.equinox.http.jetty"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -142,55 +79,6 @@
|
||||
@@ -77,55 +77,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
|
|
@ -288,20 +190,17 @@
|
|||
id="org.eclipse.core.net"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -204,4 +92,22 @@
|
||||
@@ -139,4 +90,21 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
+ <requires>
|
||||
+ <import plugin="javax.el-api" />
|
||||
+ <import plugin="javax.servlet-api" />
|
||||
+ <requires>
|
||||
+ <import plugin="javax.el" />
|
||||
+ <import plugin="javax.servlet" />
|
||||
+ <import plugin="javax.servlet.jsp" />
|
||||
+ <import plugin="com.sun.el.javax.el" />
|
||||
+ <import plugin="org.apache.commons.logging" />
|
||||
+ <import plugin="org.glassfish.web.javax.servlet.jsp" />
|
||||
+ <import plugin="org.apache.lucene.analyzers-common" />
|
||||
+ <import plugin="org.apache.lucene.core" />
|
||||
+ <import plugin="org.apache.lucene.analyzers-smartcn" />
|
||||
+ <import plugin="org.eclipse.jetty.continuation" />
|
||||
+ <import plugin="org.eclipse.jetty.http" />
|
||||
+ <import plugin="org.eclipse.jetty.io" />
|
||||
|
|
@ -309,34 +208,15 @@
|
|||
+ <import plugin="org.eclipse.jetty.server" />
|
||||
+ <import plugin="org.eclipse.jetty.servlet" />
|
||||
+ <import plugin="org.eclipse.jetty.util" />
|
||||
+ </requires>
|
||||
+ <import plugin="org.glassfish.web.javax.servlet.jsp" />
|
||||
+ </requires>
|
||||
+
|
||||
</feature>
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2018-08-19 13:57:13.249904259 +0100
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2018-08-19 14:03:19.527742984 +0100
|
||||
@@ -22,6 +22,22 @@
|
||||
<requires>
|
||||
<import feature="org.eclipse.emf.common" version="2.7.0" match="compatible"/>
|
||||
<import feature="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>
|
||||
+ <import plugin="org.apache.batik.constants" />
|
||||
+ <import plugin="org.apache.batik.css" />
|
||||
+ <import plugin="org.apache.batik.i18n" />
|
||||
+ <import plugin="org.apache.batik.util" />
|
||||
+ <import plugin="org.apache.xmlgraphics" />
|
||||
+ <import plugin="org.w3c.css.sac" />
|
||||
+ <import plugin="org.w3c.dom.svg" />
|
||||
+ <import plugin="javax.inject" />
|
||||
+ <import plugin="org.apache.felix.scr" />
|
||||
+ <import plugin="com.ibm.icu" />
|
||||
+ <import plugin="org.apache.felix.gogo.command" />
|
||||
+ <import plugin="org.apache.felix.gogo.runtime" />
|
||||
+ <import plugin="org.apache.felix.gogo.shell" />
|
||||
+ <import plugin="org.apache.commons.io" />
|
||||
+ <import plugin="org.apache.commons.jxpath" />
|
||||
+ <import plugin="org.apache.commons.logging" />
|
||||
</requires>
|
||||
|
||||
<plugin
|
||||
@@ -95,62 +111,6 @@
|
||||
diff --git eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
index 8176831..c97bab0 100644
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
@@ -95,62 +95,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
|
|
@ -399,32 +279,18 @@
|
|||
id="org.eclipse.e4.core.di"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -172,34 +132,6 @@
|
||||
@@ -165,20 +109,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.apache.batik.constants"
|
||||
- id="org.apache.batik.util.gui"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.xmlgraphics"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.commons.io"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.commons.logging"
|
||||
- id="javax.xml"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
|
|
@ -434,21 +300,7 @@
|
|||
id="org.eclipse.e4.core.di.extensions"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -245,13 +177,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.apache.felix.scr"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.equinox.ds"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -343,13 +268,6 @@
|
||||
@@ -315,13 +245,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
|
|
@ -462,7 +314,7 @@
|
|||
id="org.eclipse.equinox.preferences"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -624,27 +542,6 @@
|
||||
@@ -715,27 +638,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
|
|
@ -490,74 +342,72 @@
|
|||
id="org.eclipse.equinox.console"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -670,13 +567,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.commons.jxpath"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
@@ -756,4 +658,20 @@
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig 2017-01-04 10:54:36.000000000 +0000
|
||||
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2017-01-13 11:28:25.827041896 +0000
|
||||
@@ -60,12 +60,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>javax.annotation</id>
|
||||
- <versionRange>0.0.0</versionRange>
|
||||
- </requirement>
|
||||
- <requirement>
|
||||
- <type>eclipse-plugin</type>
|
||||
- <id>javax.el</id>
|
||||
+ <id>javax.el-api</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
@@ -75,7 +70,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>javax.servlet</id>
|
||||
+ <id>javax.servlet-api</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
@@ -95,7 +90,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>org.apache.jasper.glassfish</id>
|
||||
+ <id>org.glassfish.web.javax.servlet.jsp</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF.orig 2017-02-15 10:01:24.202436806 +0000
|
||||
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF 2017-02-15 10:01:35.454301845 +0000
|
||||
@@ -39,8 +39,7 @@
|
||||
org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
|
||||
org.eclipse.e4.emf.xpath
|
||||
Bundle-ActivationPolicy: lazy
|
||||
-Import-Package: javax.annotation,
|
||||
- javax.inject;version="1.0.0",
|
||||
+Import-Package: javax.inject;version="1.0.0",
|
||||
org.osgi.framework;version="1.5.0",
|
||||
org.osgi.service.event;version="1.3.1"
|
||||
Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
|
||||
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF.orig 2017-02-15 10:00:56.352770853 +0000
|
||||
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF 2017-02-15 10:01:06.757646050 +0000
|
||||
@@ -14,7 +14,6 @@
|
||||
org.eclipse.e4.core.di;bundle-version="0.9.0"
|
||||
Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
|
||||
Bundle-ActivationPolicy: lazy
|
||||
-Import-Package: javax.annotation,
|
||||
- javax.inject;version="1.0.0"
|
||||
+Import-Package: javax.inject;version="1.0.0"
|
||||
Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
|
||||
Automatic-Module-Name: org.eclipse.e4.tools.services
|
||||
+ <requires>
|
||||
+ <import plugin="com.ibm.icu" />
|
||||
+ <import plugin="org.apache.batik.css" />
|
||||
+ <import plugin="org.apache.batik.util" />
|
||||
+ <import plugin="org.apache.batik.util.gui" />
|
||||
+ <import plugin="org.apache.felix.gogo.command" />
|
||||
+ <import plugin="org.apache.felix.gogo.runtime" />
|
||||
+ <import plugin="org.apache.felix.gogo.shell" />
|
||||
+ <import plugin="javax.annotation-api" />
|
||||
+ <import plugin="org.w3c.dom.svg" />
|
||||
+ <import plugin="org.w3c.css.sac" />
|
||||
+ <import plugin="javax.inject" />
|
||||
+ <import plugin="javax.xml" />
|
||||
+ </requires>
|
||||
+
|
||||
+
|
||||
</feature>
|
||||
diff --git eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
|
||||
index 6f6526b..c05d703 100644
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
|
||||
@@ -36,4 +36,43 @@
|
||||
<bundle
|
||||
id="org.eclipse.jdt.core.compiler.batch"
|
||||
version="0.0.0" />
|
||||
+
|
||||
+ <!-- org.eclipse.jdt -->
|
||||
+ <bundle id="org.junit" />
|
||||
+ <bundle id="org.hamcrest.core" />
|
||||
+
|
||||
+ <!-- org.eclipse.pde -->
|
||||
+ <bundle id="org.objectweb.asm" />
|
||||
+ <bundle id="org.objectweb.asm.tree" />
|
||||
+
|
||||
+ <!-- org.eclipse.help -->
|
||||
+ <bundle id="com.sun.el.javax.el" />
|
||||
+ <bundle id="javax.servlet-api" />
|
||||
+ <bundle id="javax.servlet.jsp" />
|
||||
+ <bundle id="org.apache.commons.logging" />
|
||||
+ <bundle id="org.apache.lucene.analyzers-common" />
|
||||
+ <bundle id="org.apache.lucene.core" />
|
||||
+ <bundle id="org.eclipse.jetty.continuation" />
|
||||
+ <bundle id="org.eclipse.jetty.http" />
|
||||
+ <bundle id="org.eclipse.jetty.io" />
|
||||
+ <bundle id="org.eclipse.jetty.security" />
|
||||
+ <bundle id="org.eclipse.jetty.server" />
|
||||
+ <bundle id="org.eclipse.jetty.servlet" />
|
||||
+ <bundle id="org.eclipse.jetty.util" />
|
||||
+ <bundle id="org.glassfish.web.javax.servlet.jsp" />
|
||||
+
|
||||
+ <!-- org.eclipse.e4.rcp -->
|
||||
+ <bundle id="com.ibm.icu" />
|
||||
+ <bundle id="org.apache.batik.css" />
|
||||
+ <bundle id="org.apache.batik.util" />
|
||||
+ <bundle id="org.apache.batik.util.gui" />
|
||||
+ <bundle id="org.apache.felix.gogo.command" />
|
||||
+ <bundle id="org.apache.felix.gogo.runtime" />
|
||||
+ <bundle id="org.apache.felix.gogo.shell" />
|
||||
+ <bundle id="javax.annotation-api" />
|
||||
+ <bundle id="org.w3c.dom.svg" />
|
||||
+ <bundle id="org.w3c.css.sac" />
|
||||
+ <bundle id="javax.inject" />
|
||||
+ <bundle id="javax.xml" />
|
||||
+
|
||||
</site>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.orig 2013-01-28 12:14:02.000000000 +0100
|
||||
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2013-01-29 11:02:15.865494675 +0100
|
||||
@@ -28,4 +28,35 @@
|
||||
</resource>
|
||||
</resources>
|
||||
</build>
|
||||
+ <profiles>
|
||||
+ <profile>
|
||||
+ <activation>
|
||||
+ <file>
|
||||
+ <missing>classes/org/eclipse/core/runtime/IPluginDescriptor.class</missing>
|
||||
+ </file>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <version>1.7</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <copy todir="classes/org/eclipse/core/runtime" file="../org.eclipse.core.runtime/target/classes/org/eclipse/core/runtime/IPluginDescriptor.class"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ </profiles>
|
||||
</project>
|
||||
|
|
@ -75,11 +75,11 @@
|
|||
}
|
||||
return engine.perform(plan, phaseSet, monitor);
|
||||
}
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2018-04-25 20:31:57.931223008 +0100
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2018-04-25 20:32:11.069144336 +0100
|
||||
@@ -148,7 +148,7 @@
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-10 09:33:20.000000000 +0200
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2013-06-11 15:44:28.654682088 +0200
|
||||
@@ -145,7 +145,7 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean performCancel() {
|
||||
- String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, IDialogConstants.NO_LABEL};
|
||||
+ String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
--- rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF.bak 2013-03-14 11:36:30.000000000 +0100
|
||||
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF 2013-04-23 19:28:14.777666704 +0200
|
||||
@@ -35,3 +35,4 @@
|
||||
Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
|
||||
Eclipse-LazyStart: true
|
||||
Bundle-ActivationPolicy: lazy
|
||||
+Require-Capability: osgi.identity; filter:="(osgi.identity=org.eclipse.core.runtime)"; resolution:=optional
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java.orig 2016-04-19 20:07:36.947017206 +0100
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java 2016-04-19 20:09:59.166077383 +0100
|
||||
@@ -77,7 +77,7 @@
|
||||
diff --git eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
|
||||
index 945bafa..21dbc62 100644
|
||||
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
|
||||
@@ -73,7 +73,7 @@ public class TargetDefinitionPersistenceTests extends TestCase {
|
||||
*/
|
||||
protected IPath getJdtFeatureLocation() {
|
||||
IPath path = new Path(TargetPlatform.getDefaultLocation());
|
||||
- path = path.append("features");
|
||||
+ path = path.append("droplets").append("eclipse-jdt").append("eclipse").append("features");
|
||||
+ path = path.append("dropins").append("jdt").append("features");
|
||||
File dir = path.toFile();
|
||||
assertTrue("Missing features directory", dir.exists() && !dir.isFile());
|
||||
String[] files = dir.list();
|
||||
@@ -613,4 +613,4 @@
|
||||
@@ -668,4 +668,4 @@ public class TargetDefinitionPersistenceTests extends TestCase {
|
||||
assertTrue(iubc.getIncludeSource());
|
||||
}
|
||||
|
||||
|
|
@ -20,15 +22,45 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/eq
|
|||
index f1f38f0..f9111e6 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
|
||||
@@ -214,7 +214,7 @@
|
||||
if (parent != null) {
|
||||
File[] children = parent.listFiles((FileFilter) pathname -> {
|
||||
String name = pathname.getName();
|
||||
- return name.startsWith("eclipse-platform-");
|
||||
+ return name.startsWith("eclipse-SDK-");
|
||||
@@ -217,7 +217,7 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest {
|
||||
File[] children = parent.listFiles(new FileFilter() {
|
||||
public boolean accept(File pathname) {
|
||||
String name = pathname.getName();
|
||||
- return name.startsWith("eclipse-platform-");
|
||||
+ return name.startsWith("eclipse-SDK-");
|
||||
}
|
||||
});
|
||||
if (children != null && children.length == 1)
|
||||
file = children[0];
|
||||
diff --git eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
|
||||
index 0245d89..e95ff8f 100644
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
|
||||
@@ -4416,6 +4416,10 @@ public void test434297() {
|
||||
public void test436542() throws Exception {
|
||||
String jreDirectory = Util.getJREDirectory();
|
||||
String jfxJar = Util.toNativePath(jreDirectory + "/lib/ext/jfxrt.jar");
|
||||
+ File file = new File(jfxJar);
|
||||
+ if (!file.exists()) {
|
||||
+ return;
|
||||
+ }
|
||||
this.runConformTest(
|
||||
new String[] {
|
||||
"Utility.java",
|
||||
diff --git eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
|
||||
index 1a0cbcc..ddad62f 100644
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
|
||||
@@ -6781,6 +6781,10 @@ public void testBug434582a() {
|
||||
public void test443467() throws Exception {
|
||||
String jreDirectory = Util.getJREDirectory();
|
||||
String jfxJar = Util.toNativePath(jreDirectory + "/lib/ext/jfxrt.jar");
|
||||
+ File file = new File(jfxJar);
|
||||
+ if (!file.exists()) {
|
||||
+ return;
|
||||
+ }
|
||||
this.runNegativeTestWithExtraLibs(
|
||||
new String[] {
|
||||
"BuildIdeMain.java",
|
||||
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
||||
index 376daa6..1742a8d 100644
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
||||
|
|
@ -59,218 +91,25 @@ diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
|||
index bc8963d..fbe4da3 100644
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
|
||||
@@ -25,3 +25,6 @@
|
||||
@@ -10,11 +10,6 @@
|
||||
# Red Hat Inc. (mistria) - Avoid nested jars
|
||||
###############################################################################
|
||||
source.. = src/
|
||||
-output.. = bin/
|
||||
-# Don't rebuild apttestprocessors everytime to avoid dirty working tree
|
||||
-# lib/apttestprocessors.jar considered as a resource set a dev-timeY
|
||||
-#source.lib/apttestprocessors.jar = processors/
|
||||
-#jars.compile.order = lib/apttestprocessors.jar,.
|
||||
bin.includes = about.html,\
|
||||
plugin.properties,\
|
||||
test.xml,\
|
||||
@@ -24,3 +19,9 @@ bin.includes = about.html,\
|
||||
.
|
||||
src.includes = about.html
|
||||
compilerArg=-proc:none
|
||||
jars.extra.classpath = java10/java10api.jar
|
||||
+source.lib/apttestprocessors.jar = processors/
|
||||
+source.lib/apttestprocessors8.jar = processors/,\
|
||||
+ processors8/
|
||||
+jars.compile.order = lib/apttestprocessors.jar,\
|
||||
+ lib/apttestprocessors8.jar,\
|
||||
+ .
|
||||
--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig 2016-03-24 14:25:47.076289150 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties 2016-03-24 14:26:39.528660802 +0000
|
||||
@@ -25,6 +25,8 @@
|
||||
Ant Tests/
|
||||
|
||||
source.lib/antUITestsSupport.jar = test support/
|
||||
-jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar
|
||||
+source.testbuildfiles/antUITestsSupport.jar = test support/
|
||||
+jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar,testbuildfiles/antUITestsSupport.jar
|
||||
output.lib/antUITestsSupport.jar = test_support_bin/
|
||||
+output.testbuildfiles/antUITestsSupport.jar = test_support_bin/
|
||||
output.anttestsui.jar = bin/
|
||||
--- eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig 2016-03-25 15:09:40.557786910 +0000
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties 2016-03-25 15:12:08.476059326 +0000
|
||||
@@ -22,3 +22,5 @@
|
||||
leaks/,\
|
||||
performance/
|
||||
javacWarnings..=-raw,-unchecked
|
||||
+source.testresources/nls.jar = nls/
|
||||
+jars.compile.order = .,testresources/nls.jar
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Client.java 2004-11-12 14:37:36.000000000 +0000
|
||||
@@ -0,0 +1,25 @@
|
||||
+/*******************************************************************************
|
||||
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
|
||||
+ * All rights reserved. This program and the accompanying materials
|
||||
+ * are made available under the terms of the Common Public License v1.0
|
||||
+ * which accompanies this distribution, and is available at
|
||||
+ * http://www.eclipse.org/legal/cpl-v10.html
|
||||
+ *
|
||||
+ * Contributors:
|
||||
+ * IBM Corporation - initial API and implementation
|
||||
+ *******************************************************************************/
|
||||
+package pkg;
|
||||
+
|
||||
+public class Client {
|
||||
+
|
||||
+ public String s;
|
||||
+
|
||||
+ {
|
||||
+ s= Messages.getString("test");
|
||||
+ s= Messages.getString("test_undefined");
|
||||
+ s= Messages.getString("duplicate");
|
||||
+ s= Messages.getString("test.long.key");
|
||||
+ s= Messages.getString("SearchResultView.removed_resource");
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.java 2004-11-12 14:37:28.000000000 +0000
|
||||
@@ -0,0 +1,58 @@
|
||||
+/*******************************************************************************
|
||||
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
|
||||
+ * All rights reserved. This program and the accompanying materials
|
||||
+ * are made available under the terms of the Common Public License v1.0
|
||||
+ * which accompanies this distribution, and is available at
|
||||
+ * http://www.eclipse.org/legal/cpl-v10.html
|
||||
+ *
|
||||
+ * Contributors:
|
||||
+ * IBM Corporation - initial API and implementation
|
||||
+ *******************************************************************************/
|
||||
+package pkg;
|
||||
+
|
||||
+import java.text.MessageFormat;
|
||||
+import java.util.MissingResourceException;
|
||||
+import java.util.ResourceBundle;
|
||||
+
|
||||
+public class Messages extends Object {
|
||||
+ private static final String RESOURCE_BUNDLE = Messages.class.getName();
|
||||
+ private static ResourceBundle fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
|
||||
+
|
||||
+ private Messages() {}
|
||||
+
|
||||
+ /**
|
||||
+ * Gets a string from the resource bundle and formats it with the argument
|
||||
+ *
|
||||
+ * @param key the string used to get the bundle value, must not be null
|
||||
+ */
|
||||
+ public static String getFormattedString(String key, Object arg) {
|
||||
+ String format = null;
|
||||
+
|
||||
+ try {
|
||||
+ format = fgResourceBundle.getString(key);
|
||||
+ } catch (MissingResourceException e) {
|
||||
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
|
||||
+ }
|
||||
+
|
||||
+ if (arg == null) {
|
||||
+ arg = ""; //$NON-NLS-1$
|
||||
+ }
|
||||
+
|
||||
+ return MessageFormat.format(format, new Object[] { arg });
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Gets a string from the resource bundle and formats it with arguments
|
||||
+ */
|
||||
+ public static String getFormattedString(String key, String[] args) {
|
||||
+ return MessageFormat.format(fgResourceBundle.getString(key), args);
|
||||
+ }
|
||||
+
|
||||
+ public static String getString(String key) {
|
||||
+ try {
|
||||
+ return fgResourceBundle.getString(key);
|
||||
+ } catch (MissingResourceException e) {
|
||||
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.properties 2004-11-12 14:38:06.000000000 +0000
|
||||
@@ -0,0 +1,15 @@
|
||||
+###############################################################################
|
||||
+# Copyright (c) 2000, 2004 IBM Corporation and others.
|
||||
+# All rights reserved. This program and the accompanying materials
|
||||
+# are made available under the terms of the Common Public License v1.0
|
||||
+# which accompanies this distribution, and is available at
|
||||
+# http://www.eclipse.org/legal/cpl-v10.html
|
||||
+#
|
||||
+# Contributors:
|
||||
+# IBM Corporation - initial API and implementation
|
||||
+###############################################################################
|
||||
+test= Hello World
|
||||
+duplicate= Duplicate 1
|
||||
+test.long.key= Hello World Long
|
||||
+duplicate= Duplicate 2
|
||||
+SearchResultView.removed_resource= <removed resource>
|
||||
--- eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig 2017-03-03 14:20:53.868573338 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties 2017-03-06 14:26:42.382365639 +0000
|
||||
@@ -23,6 +23,8 @@
|
||||
source.anttestscore.jar = test plugin/,\
|
||||
tests/
|
||||
source.lib/antTestsSupport.jar = test support/
|
||||
-jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar
|
||||
+source.testlib/classpathOrdering1.jar = testlib_src/classpathOrdering1/
|
||||
+source.testlib/classpathOrdering2.jar = testlib_src/classpathOrdering2/
|
||||
+jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar,testlib/classpathOrdering1.jar,testlib/classpathOrdering2.jar
|
||||
output.lib/antTestsSupport.jar = test_support_bin/
|
||||
output.anttestscore.jar = bin/
|
||||
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering1/ClasspathOrdering.java 2017-03-06 14:28:57.742879825 +0000
|
||||
@@ -0,0 +1,10 @@
|
||||
+import java.io.PrintStream;
|
||||
+
|
||||
+public class ClasspathOrdering
|
||||
+{
|
||||
+ public static void main(String[] args)
|
||||
+ {
|
||||
+ System.out.println("classpathOrdering1");
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering2/ClasspathOrdering.java 2017-03-06 14:29:45.759352762 +0000
|
||||
@@ -0,0 +1,10 @@
|
||||
+import java.io.PrintStream;
|
||||
+
|
||||
+public class ClasspathOrdering
|
||||
+{
|
||||
+ public static void main(String[] args)
|
||||
+ {
|
||||
+ System.out.println("classpathOrdering2");
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2017-04-07 10:44:33.764607961 +0100
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2017-04-07 11:26:44.511961798 +0100
|
||||
@@ -26,4 +26,24 @@
|
||||
<testClass>org.eclipse.jdt.core.tests.builder.BuilderTests</testClass>
|
||||
<testSuite>${project.artifactId}</testSuite>
|
||||
</properties>
|
||||
+
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <groupId>org.eclipse.tycho</groupId>
|
||||
+ <artifactId>target-platform-configuration</artifactId>
|
||||
+ <configuration>
|
||||
+ <dependency-resolution>
|
||||
+ <extraRequirements>
|
||||
+ <requirement>
|
||||
+ <type>eclipse-plugin</type>
|
||||
+ <id>org.eclipse.jdt.annotation</id>
|
||||
+ <versionRange>0.0.0</versionRange>
|
||||
+ </requirement>
|
||||
+ </extraRequirements>
|
||||
+ </dependency-resolution>
|
||||
+ </configuration>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
</project>
|
||||
--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100
|
||||
+++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100
|
||||
@@ -156,13 +156,6 @@
|
||||
id="org.eclipse.jdt.source.feature.group"
|
||||
version="" />
|
||||
<iu
|
||||
- id="org.eclipse.rcp.configuration.feature.group"
|
||||
- version="" />
|
||||
-
|
||||
- <iu
|
||||
- id="org.eclipse.equinox.executable"
|
||||
- version="" />
|
||||
- <iu
|
||||
id="org.eclipse.e4.rcp.feature.group"
|
||||
version="" />
|
||||
<iu
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf
|
||||
Author: Mat Booth <mat.booth@redhat.com>
|
||||
Date: Thu May 3 15:58:49 2018 +0100
|
||||
|
||||
Bug 534326 - Awkward p2 UI when many droplets are installed
|
||||
|
||||
Filter out software site locations where we know that they are p2
|
||||
droplets in places we show the list to the user.
|
||||
|
||||
Change-Id: I12364223850862783cb7cffd32fb7428fbf6b270
|
||||
Signed-off-by: Mat Booth <mat.booth@redhat.com>
|
||||
|
||||
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
index e6eef8c39..fe5970e79 100644
|
||||
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
@@ -300,6 +300,19 @@ public class RepositorySelectionGroup {
|
||||
void fillRepoCombo(final String selection) {
|
||||
RepositoryTracker tracker = ui.getRepositoryTracker();
|
||||
URI[] sites = tracker.getKnownRepositories(ui.getSession());
|
||||
+ // Filter out sites that are actually installed p2 droplets
|
||||
+ String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
|
||||
+ ArrayList<URI> filteredSites = new ArrayList<>(Arrays.asList(sites));
|
||||
+ if (fragments != null) {
|
||||
+ for (String root : fragments.split(",")) { //$NON-NLS-1$
|
||||
+ for (URI uri : sites) {
|
||||
+ if (uri.getPath() != null && uri.getPath().startsWith(root)) {
|
||||
+ filteredSites.remove(uri);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ sites = filteredSites.toArray(new URI[0]);
|
||||
boolean hasLocalSites = getLocalSites().length > 0;
|
||||
final String[] items;
|
||||
if (hasLocalSites) {
|
||||
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
index d796aefd0..c03924f90 100644
|
||||
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
@@ -130,9 +130,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
|
||||
if (cachedElements == null) {
|
||||
Object[] children = super.fetchChildren(o, monitor);
|
||||
cachedElements = new Hashtable<>(children.length);
|
||||
+ String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
|
||||
for (int i = 0; i < children.length; i++) {
|
||||
if (children[i] instanceof MetadataRepositoryElement) {
|
||||
- put((MetadataRepositoryElement) children[i]);
|
||||
+ // Filter out locations that are actually installed p2 droplets
|
||||
+ if (fragments != null) {
|
||||
+ boolean isDroplet = false;
|
||||
+ for (String root : fragments.split(",")) { //$NON-NLS-1$
|
||||
+ URI childLoc = ((MetadataRepositoryElement) children[i]).getLocation();
|
||||
+ if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) {
|
||||
+ isDroplet = true;
|
||||
+ }
|
||||
+ }
|
||||
+ if (!isDroplet) {
|
||||
+ put((MetadataRepositoryElement) children[i]);
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF
|
||||
index b0d5c82..6ace64c 100644
|
||||
--- a/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF
|
||||
+++ b/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF
|
||||
@@ -8,5 +8,6 @@
|
||||
Bundle-Localization: fragment-gtk
|
||||
Bundle-Vendor: %providerName
|
||||
Eclipse-PlatformFilter: (osgi.ws=gtk)
|
||||
-Import-Package: org.eclipse.e4.core.services.events,
|
||||
+Import-Package: javax.annotation;version="1.1.0",
|
||||
+ org.eclipse.e4.core.services.events,
|
||||
org.osgi.service.event;version="1.3.1"
|
||||
|
|
@ -0,0 +1,522 @@
|
|||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
|
||||
index ee34c8e..fdef3e6 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
|
||||
@@ -43,8 +43,8 @@ Require-Bundle: org.eclipse.ant.core;bundle-version="3.2.200";resolution:=option
|
||||
org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
|
||||
org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
|
||||
org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
|
||||
- org.apache.lucene.analysis;bundle-version="[3.5.0,4.0.0)",
|
||||
- org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)",
|
||||
+ org.apache.lucene.analysis;bundle-version="[4.7.0,5.0.0)",
|
||||
+ org.apache.lucene.core;bundle-version="[4.7.0,5.0.0)",
|
||||
org.eclipse.core.net;bundle-version="1.2.200"
|
||||
Import-Package: com.ibm.icu.text,
|
||||
org.eclipse.equinox.http.jetty;resolution:=optional
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
|
||||
index a066aa4..6c41103 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
|
||||
@@ -11,10 +11,15 @@
|
||||
*******************************************************************************/
|
||||
package org.eclipse.help.internal.search;
|
||||
import java.io.*;
|
||||
-import java.util.HashSet;
|
||||
-import java.util.Set;
|
||||
+import java.util.ArrayList;
|
||||
+import java.util.List;
|
||||
|
||||
-import org.apache.lucene.analysis.*;
|
||||
+import org.apache.lucene.analysis.Analyzer;
|
||||
+import org.apache.lucene.analysis.TokenStream;
|
||||
+import org.apache.lucene.analysis.Tokenizer;
|
||||
+import org.apache.lucene.analysis.core.StopFilter;
|
||||
+import org.apache.lucene.analysis.en.PorterStemFilter;
|
||||
+import org.apache.lucene.analysis.util.CharArraySet;
|
||||
import org.apache.lucene.util.Version;
|
||||
/**
|
||||
* Lucene Analyzer for English. LowerCaseTokenizer->StopFilter->PorterStemFilter
|
||||
@@ -27,18 +32,22 @@ public final class Analyzer_en extends Analyzer {
|
||||
super();
|
||||
}
|
||||
/**
|
||||
- * Creates a TokenStream which tokenizes all the text in the provided
|
||||
+ * Creates a TokenStreamComponents which tokenizes all the text in the provided
|
||||
* Reader.
|
||||
*/
|
||||
- public final TokenStream tokenStream(String fieldName, Reader reader) {
|
||||
- return new PorterStemFilter(new StopFilter(Version.LUCENE_30, new LowerCaseAndDigitsTokenizer(reader), getStopWords(), false));
|
||||
+ @Override
|
||||
+ public final TokenStreamComponents createComponents(String fieldName, Reader reader) {
|
||||
+ CharArraySet stopWordsSet = StopFilter.makeStopSet(Version.LUCENE_47, getStopWords(), true);
|
||||
+ Tokenizer source = new LowerCaseAndDigitsTokenizer(reader);
|
||||
+ TokenStream filter = new PorterStemFilter(new StopFilter(Version.LUCENE_47, source, stopWordsSet));
|
||||
+ return new TokenStreamComponents(source, filter);
|
||||
}
|
||||
|
||||
- private Set<String> stopWords;
|
||||
+ private List<String> stopWords;
|
||||
|
||||
- private Set<String> getStopWords() {
|
||||
+ private List<String> getStopWords() {
|
||||
if ( stopWords == null ) {
|
||||
- stopWords = new HashSet<String>();
|
||||
+ stopWords = new ArrayList<String>();
|
||||
for (int i = 0; i < STOP_WORDS.length; i++) {
|
||||
stopWords.add(STOP_WORDS[i]);
|
||||
}
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
|
||||
index 4109474..2718307 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
|
||||
@@ -17,8 +17,8 @@ import java.util.StringTokenizer;
|
||||
import com.ibm.icu.text.BreakIterator;
|
||||
|
||||
import org.apache.lucene.analysis.Analyzer;
|
||||
-import org.apache.lucene.analysis.LowerCaseFilter;
|
||||
-import org.apache.lucene.analysis.TokenStream;
|
||||
+import org.apache.lucene.analysis.Tokenizer;
|
||||
+import org.apache.lucene.analysis.core.LowerCaseFilter;
|
||||
import org.apache.lucene.util.Version;
|
||||
import org.eclipse.help.internal.base.HelpBasePlugin;
|
||||
|
||||
@@ -84,11 +84,14 @@ public final class DefaultAnalyzer extends Analyzer {
|
||||
}
|
||||
|
||||
/**
|
||||
- * Creates a TokenStream which tokenizes all the text in the provided
|
||||
+ * Creates a TokenStreamComponents which tokenizes all the text in the provided
|
||||
* Reader.
|
||||
*/
|
||||
- public final TokenStream tokenStream(String fieldName, Reader reader) {
|
||||
- return new LowerCaseFilter(Version.LUCENE_30, new WordTokenStream(fieldName, reader, locale));
|
||||
+ @Override
|
||||
+ public final TokenStreamComponents createComponents(String fieldName, Reader reader) {
|
||||
+ Tokenizer source = new WordTokenStream(fieldName, reader, locale);
|
||||
+ LowerCaseFilter filter = new LowerCaseFilter(Version.LUCENE_47, source);
|
||||
+ return new TokenStreamComponents(source, filter);
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
|
||||
index a475688..91e3cb4 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
|
||||
@@ -13,7 +13,7 @@ package org.eclipse.help.internal.search;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
-import org.apache.lucene.analysis.*;
|
||||
+import org.apache.lucene.analysis.util.CharTokenizer;
|
||||
import org.apache.lucene.util.Version;
|
||||
|
||||
/**
|
||||
@@ -22,13 +22,14 @@ import org.apache.lucene.util.Version;
|
||||
public class LowerCaseAndDigitsTokenizer extends CharTokenizer {
|
||||
|
||||
public LowerCaseAndDigitsTokenizer(Reader input) {
|
||||
- super(Version.LUCENE_30, input);
|
||||
+ super(Version.LUCENE_47, input);
|
||||
}
|
||||
protected char normalize(char c) {
|
||||
return Character.toLowerCase(c);
|
||||
}
|
||||
|
||||
- protected boolean isTokenChar(char c) {
|
||||
+ @Override
|
||||
+ public boolean isTokenChar(int c) {
|
||||
return Character.isLetterOrDigit(c);
|
||||
}
|
||||
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
|
||||
index 9cc690e..6449adb 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
|
||||
@@ -243,16 +243,25 @@ public class QueryBuilder {
|
||||
private List<String> analyzeText(Analyzer analyzer, String fieldName, String text) {
|
||||
List<String> words = new ArrayList<String>(1);
|
||||
Reader reader = new StringReader(text);
|
||||
- TokenStream tStream = analyzer.tokenStream(fieldName, reader);
|
||||
|
||||
- CharTermAttribute termAttribute = tStream.getAttribute(CharTermAttribute.class);
|
||||
+ TokenStream tStream = null;
|
||||
try {
|
||||
+ tStream = analyzer.tokenStream(fieldName, reader);
|
||||
+ tStream.reset();
|
||||
+ CharTermAttribute termAttribute = (CharTermAttribute) tStream
|
||||
+ .getAttribute(CharTermAttribute.class);
|
||||
while (tStream.incrementToken()) {
|
||||
String term = termAttribute.toString();
|
||||
words.add(term);
|
||||
}
|
||||
- reader.close();
|
||||
} catch (IOException ioe) {
|
||||
+ } finally {
|
||||
+ if (tStream != null) {
|
||||
+ try {
|
||||
+ tStream.close();
|
||||
+ } catch (IOException e) {
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
return words;
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
|
||||
index 33c9476..5a46fe5 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
|
||||
@@ -33,17 +33,20 @@ import java.util.Set;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
-import org.apache.lucene.analysis.LimitTokenCountAnalyzer;
|
||||
+import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
|
||||
import org.apache.lucene.document.Document;
|
||||
import org.apache.lucene.document.Field;
|
||||
+import org.apache.lucene.index.AtomicReader;
|
||||
+import org.apache.lucene.index.DirectoryReader;
|
||||
+import org.apache.lucene.index.DocsEnum;
|
||||
import org.apache.lucene.index.IndexReader;
|
||||
import org.apache.lucene.index.IndexWriter;
|
||||
-import org.apache.lucene.index.Term;
|
||||
-import org.apache.lucene.index.TermDocs;
|
||||
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
|
||||
import org.apache.lucene.index.IndexWriterConfig;
|
||||
import org.apache.lucene.index.LogByteSizeMergePolicy;
|
||||
import org.apache.lucene.index.LogMergePolicy;
|
||||
+import org.apache.lucene.index.SlowCompositeReaderWrapper;
|
||||
+import org.apache.lucene.index.Term;
|
||||
import org.apache.lucene.search.BooleanQuery;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.Query;
|
||||
@@ -283,7 +286,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
indexedDocs.restore();
|
||||
setInconsistent(true);
|
||||
LimitTokenCountAnalyzer analyzer = new LimitTokenCountAnalyzer(analyzerDescriptor.getAnalyzer(), 1000000);
|
||||
- IndexWriterConfig writerConfig = new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_31, analyzer);
|
||||
+ IndexWriterConfig writerConfig = new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_47, analyzer);
|
||||
writerConfig.setOpenMode(create ? OpenMode.CREATE : OpenMode.APPEND);
|
||||
LogMergePolicy mergePolicy = new LogByteSizeMergePolicy();
|
||||
mergePolicy.setMergeFactor(20);
|
||||
@@ -307,7 +310,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
indexedDocs = new HelpProperties(INDEXED_DOCS_FILE, indexDir);
|
||||
indexedDocs.restore();
|
||||
setInconsistent(true);
|
||||
- ir = IndexReader.open(luceneDirectory, false);
|
||||
+ ir = DirectoryReader.open(luceneDirectory);
|
||||
return true;
|
||||
} catch (IOException e) {
|
||||
HelpBasePlugin.logError("Exception occurred in search indexing at beginDeleteBatch.", e); //$NON-NLS-1$
|
||||
@@ -323,7 +326,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
if (ir != null) {
|
||||
ir.close();
|
||||
}
|
||||
- ir = IndexReader.open(luceneDirectory, false);
|
||||
+ ir = DirectoryReader.open(luceneDirectory);
|
||||
return true;
|
||||
} catch (IOException e) {
|
||||
HelpBasePlugin.logError("Exception occurred in search indexing at beginDeleteBatch.", e); //$NON-NLS-1$
|
||||
@@ -341,7 +344,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
public IStatus removeDocument(String name) {
|
||||
Term term = new Term(FIELD_NAME, name);
|
||||
try {
|
||||
- ir.deleteDocuments(term);
|
||||
+ iw.deleteDocuments(term);
|
||||
indexedDocs.remove(name);
|
||||
} catch (IOException e) {
|
||||
return new Status(IStatus.ERROR, HelpBasePlugin.PLUGIN_ID, IStatus.ERROR,
|
||||
@@ -379,7 +382,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
* know about this change. Close it so that it gets reloaded next search.
|
||||
*/
|
||||
if (searcher != null) {
|
||||
- searcher.close();
|
||||
+ searcher.getIndexReader().close();
|
||||
searcher = null;
|
||||
}
|
||||
return true;
|
||||
@@ -411,7 +414,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
* know about this change. Close it so that it gets reloaded next search.
|
||||
*/
|
||||
if (searcher != null) {
|
||||
- searcher.close();
|
||||
+ searcher.getIndexReader().close();
|
||||
searcher = null;
|
||||
}
|
||||
return true;
|
||||
@@ -525,18 +528,19 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
}
|
||||
|
||||
public IStatus removeDuplicates(String name, String[] index_paths) {
|
||||
- TermDocs hrefDocs = null;
|
||||
- TermDocs indexDocs = null;
|
||||
- Term hrefTerm = new Term(FIELD_NAME, name);
|
||||
try {
|
||||
+ AtomicReader ar = SlowCompositeReaderWrapper.wrap(ir);
|
||||
+ DocsEnum hrefDocs = null;
|
||||
+ DocsEnum indexDocs = null;
|
||||
+ Term hrefTerm = new Term(FIELD_NAME, name);
|
||||
for (int i = 0; i < index_paths.length; i++) {
|
||||
Term indexTerm = new Term(FIELD_INDEX_ID, index_paths[i]);
|
||||
if (i == 0) {
|
||||
- hrefDocs = ir.termDocs(hrefTerm);
|
||||
- indexDocs = ir.termDocs(indexTerm);
|
||||
+ hrefDocs = ar.termDocsEnum(hrefTerm);
|
||||
+ indexDocs = ar.termDocsEnum(indexTerm);
|
||||
} else {
|
||||
- hrefDocs.seek(hrefTerm);
|
||||
- indexDocs.seek(indexTerm);
|
||||
+ hrefDocs = ar.termDocsEnum(hrefTerm);
|
||||
+ indexDocs = ar.termDocsEnum(indexTerm);
|
||||
}
|
||||
removeDocuments(hrefDocs, indexDocs);
|
||||
}
|
||||
@@ -545,19 +549,6 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
"IO exception occurred while removing duplicates of document " + name //$NON-NLS-1$
|
||||
+ " from index " + indexDir.getAbsolutePath() + ".", //$NON-NLS-1$ //$NON-NLS-2$
|
||||
ioe);
|
||||
- } finally {
|
||||
- if (hrefDocs != null) {
|
||||
- try {
|
||||
- hrefDocs.close();
|
||||
- } catch (IOException e) {
|
||||
- }
|
||||
- }
|
||||
- if (indexDocs != null) {
|
||||
- try {
|
||||
- indexDocs.close();
|
||||
- } catch (IOException e) {
|
||||
- }
|
||||
- }
|
||||
}
|
||||
return Status.OK_STATUS;
|
||||
}
|
||||
@@ -569,33 +560,33 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
* @param docs2
|
||||
* @throws IOException
|
||||
*/
|
||||
- private void removeDocuments(TermDocs doc1, TermDocs docs2) throws IOException {
|
||||
- if (!doc1.next()) {
|
||||
+ private void removeDocuments(DocsEnum doc1, DocsEnum docs2) throws IOException {
|
||||
+ if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
|
||||
return;
|
||||
}
|
||||
- if (!docs2.next()) {
|
||||
+ if (docs2.nextDoc() == DocsEnum.NO_MORE_DOCS) {
|
||||
return;
|
||||
}
|
||||
while (true) {
|
||||
- if (doc1.doc() < docs2.doc()) {
|
||||
- if (!doc1.skipTo(docs2.doc())) {
|
||||
- if (!doc1.next()) {
|
||||
+ if (doc1.docID() < docs2.docID()) {
|
||||
+ if (doc1.advance(docs2.docID()) == DocsEnum.NO_MORE_DOCS) {
|
||||
+ if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
- } else if (doc1.doc() > docs2.doc()) {
|
||||
- if (!docs2.skipTo(doc1.doc())) {
|
||||
- if (!doc1.next()) {
|
||||
+ } else if (doc1.docID() > docs2.docID()) {
|
||||
+ if (docs2.advance(doc1.docID()) == DocsEnum.NO_MORE_DOCS) {
|
||||
+ if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
- if (doc1.doc() == docs2.doc()) {
|
||||
- ir.deleteDocument(doc1.doc());
|
||||
- if (!doc1.next()) {
|
||||
+ if (doc1.docID() == docs2.docID()) {
|
||||
+ iw.tryDeleteDocument(ir, doc1.docID());
|
||||
+ if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
|
||||
return;
|
||||
}
|
||||
- if (!docs2.next()) {
|
||||
+ if (docs2.nextDoc() == DocsEnum.NO_MORE_DOCS) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -802,7 +793,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
public void openSearcher() throws IOException {
|
||||
synchronized (searcherCreateLock) {
|
||||
if (searcher == null) {
|
||||
- searcher = new IndexSearcher(IndexReader.open(luceneDirectory, false));
|
||||
+ searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -820,7 +811,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
if (searches.isEmpty()) {
|
||||
if (searcher != null) {
|
||||
try {
|
||||
- searcher.close();
|
||||
+ searcher.getIndexReader().close();
|
||||
} catch (IOException ioe) {
|
||||
}
|
||||
}
|
||||
@@ -903,7 +894,7 @@ public class SearchIndex implements IHelpSearchIndex {
|
||||
IndexWriter cleaner = null;
|
||||
LimitTokenCountAnalyzer analyzer = new LimitTokenCountAnalyzer(analyzerDescriptor.getAnalyzer(), 10000);
|
||||
try {
|
||||
- cleaner = new IndexWriter(luceneDirectory, new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_31, analyzer).setOpenMode(
|
||||
+ cleaner = new IndexWriter(luceneDirectory, new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_47, analyzer).setOpenMode(
|
||||
OpenMode.CREATE));
|
||||
} catch (IOException ioe) {
|
||||
} finally {
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
|
||||
index d0a7bb7..1b20d3b 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
|
||||
@@ -10,15 +10,13 @@
|
||||
*******************************************************************************/
|
||||
package org.eclipse.help.internal.search;
|
||||
|
||||
-import java.io.*;
|
||||
-
|
||||
import org.apache.lucene.analysis.*;
|
||||
|
||||
/**
|
||||
* Smart Analyzer. Chooses underlying implementation based on the field which
|
||||
* text is analyzed.
|
||||
*/
|
||||
-public final class SmartAnalyzer extends Analyzer {
|
||||
+public final class SmartAnalyzer extends AnalyzerWrapper {
|
||||
Analyzer pluggedInAnalyzer;
|
||||
Analyzer exactAnalyzer;
|
||||
|
||||
@@ -31,14 +29,14 @@ public final class SmartAnalyzer extends Analyzer {
|
||||
this.exactAnalyzer = new DefaultAnalyzer(locale);
|
||||
}
|
||||
/**
|
||||
- * Creates a TokenStream which tokenizes all the text in the provided
|
||||
- * Reader. Delegates to DefaultAnalyzer when field used to search for exact
|
||||
+ * Delegates to DefaultAnalyzer when field used to search for exact
|
||||
* match, and to plugged-in analyzer for other fields.
|
||||
*/
|
||||
- public final TokenStream tokenStream(String fieldName, Reader reader) {
|
||||
+ @Override
|
||||
+ public final Analyzer getWrappedAnalyzer(String fieldName) {
|
||||
if (fieldName != null && fieldName.startsWith("exact_")) { //$NON-NLS-1$
|
||||
- return exactAnalyzer.tokenStream(fieldName, reader);
|
||||
+ return exactAnalyzer;
|
||||
}
|
||||
- return pluggedInAnalyzer.tokenStream(fieldName, reader);
|
||||
+ return pluggedInAnalyzer;
|
||||
}
|
||||
}
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
|
||||
index 0b70cf7..106775a 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
|
||||
@@ -35,6 +35,7 @@ public final class WordTokenStream extends Tokenizer {
|
||||
* Constructor
|
||||
*/
|
||||
public WordTokenStream(String fieldName, Reader reader, Locale locale) {
|
||||
+ super(reader);
|
||||
this.reader = reader;
|
||||
boundary = BreakIterator.getWordInstance(locale);
|
||||
|
||||
@@ -105,6 +106,7 @@ public final class WordTokenStream extends Tokenizer {
|
||||
}
|
||||
|
||||
public void close() throws IOException {
|
||||
+ super.close();
|
||||
/// Unlikely to be called as this is a reused
|
||||
if (this.reader != null) {
|
||||
this.reader.close();
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
|
||||
index a8177c3..cd99e8a 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
|
||||
+++ b/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
|
||||
@@ -18,15 +18,14 @@
|
||||
org.eclipse.ui.intro.universal,
|
||||
org.eclipse.ui.forms,
|
||||
org.eclipse.ui.browser;bundle-version="3.2.300",
|
||||
+ org.apache.lucene.analysis;bundle-version="[4.7.0,5.0.0)",
|
||||
+ org.apache.lucene.core;bundle-version="[4.7.0,5.0.0)",
|
||||
org.eclipse.equinox.jsp.jasper;bundle-version="1.0.200",
|
||||
org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Vendor: Eclipse.org
|
||||
Import-Package: javax.servlet;version="3.1.0",
|
||||
- javax.servlet.http;version="3.1.0",
|
||||
- org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)",
|
||||
- org.apache.lucene.search;core=split;version="[3.5.0,4.0.0)",
|
||||
- org.apache.lucene.store;core=split;version="[3.5.0,4.0.0)"
|
||||
+ javax.servlet.http;version="3.1.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||
Export-Package: org.eclipse.ua.tests,
|
||||
org.eclipse.ua.tests.browser,
|
||||
diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java b/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
|
||||
index 640d4c9..8924fa7 100644
|
||||
--- a/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
|
||||
+++ b/eclipse.platform.ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/PrebuiltIndexCompatibility.java
|
||||
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
|
||||
import org.osgi.framework.Bundle;
|
||||
|
||||
import org.apache.lucene.index.CorruptIndexException;
|
||||
-import org.apache.lucene.index.IndexReader;
|
||||
+import org.apache.lucene.index.DirectoryReader;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.search.TopDocs;
|
||||
@@ -157,7 +157,7 @@ public class PrebuiltIndexCompatibility extends TestCase {
|
||||
IndexSearcher searcher = null;
|
||||
try {
|
||||
luceneDirectory = new NIOFSDirectory(new File(filePath));
|
||||
- searcher = new IndexSearcher(IndexReader.open(luceneDirectory, true));
|
||||
+ searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
|
||||
TopDocs hits = searcher.search(luceneQuery, 500);
|
||||
assertEquals(hits.totalHits, 1);
|
||||
} finally {
|
||||
@@ -167,7 +167,7 @@ public class PrebuiltIndexCompatibility extends TestCase {
|
||||
} catch (IOException x) {
|
||||
}
|
||||
if (searcher != null)
|
||||
- searcher.close();
|
||||
+ searcher.getIndexReader().close();
|
||||
}
|
||||
} else {
|
||||
fail("Cannot resolve to file protocol");
|
||||
diff --git a/dependencies/replace_platform_plugins_with_symlinks.sh b/dependencies/replace_platform_plugins_with_symlinks.sh
|
||||
index b818924..f1a67b3 100755
|
||||
--- a/dependencies/replace_platform_plugins_with_symlinks.sh
|
||||
+++ b/dependencies/replace_platform_plugins_with_symlinks.sh
|
||||
@@ -45,13 +45,7 @@ pushd $1
|
||||
_symlink org.apache.felix.gogo.shell_ felix-gogo-shell/org.apache.felix.gogo.shell.jar
|
||||
_symlink javax.annotation-api_ glassfish-annotation-api.jar
|
||||
_symlink org.apache.lucene.core_ lucene/lucene-core.jar
|
||||
- _symlink org.apache.lucene.analyzers-common_ lucene/lucene-analyzers-common.jar
|
||||
- _symlink org.apache.lucene.analyzers-smartcn_ lucene/lucene-analyzers-smartcn.jar
|
||||
- _symlink org.apache.lucene.queries lucene/lucene-queries.jar
|
||||
- _symlink org.apache.lucene.queryparser lucene/lucene-queryparser.jar
|
||||
- _symlink org.apache.lucene.sandbox_ lucene/lucene-sandbox.jar
|
||||
- _symlink org.apache.lucene.spatial3d_ lucene/lucene-spatial3d.jar
|
||||
- _symlink org.apache.lucene.spatial_ lucene/lucene-spatial.jar
|
||||
+ _symlink org.apache.lucene.analysis_ lucene/lucene-analyzers-common.jar
|
||||
_symlink com.spatial4j_ spatial4j.jar
|
||||
_symlink org.apache.xalan xalan-j2.jar
|
||||
_symlink org.apache.xerces xerces-j2.jar
|
||||
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
|
||||
+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
|
||||
@@ -95,7 +95,7 @@
|
||||
<import plugin="javax.servlet" />
|
||||
<import plugin="javax.servlet.jsp" />
|
||||
<import plugin="org.apache.commons.logging" />
|
||||
- <import plugin="org.apache.lucene.analyzers-common" />
|
||||
+ <import plugin="org.apache.lucene.analysis" />
|
||||
<import plugin="org.apache.lucene.core" />
|
||||
<import plugin="org.eclipse.jetty.continuation" />
|
||||
<import plugin="org.eclipse.jetty.http" />
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
|
||||
@@ -50,7 +50,7 @@
|
||||
<bundle id="javax.servlet-api" />
|
||||
<bundle id="javax.servlet.jsp" />
|
||||
<bundle id="org.apache.commons.logging" />
|
||||
- <bundle id="org.apache.lucene.analyzers-common" />
|
||||
+ <bundle id="org.apache.lucene.analysis" />
|
||||
<bundle id="org.apache.lucene.core" />
|
||||
<bundle id="org.eclipse.jetty.continuation" />
|
||||
<bundle id="org.eclipse.jetty.http" />
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,47 +0,0 @@
|
|||
From decc6ec5f3c5ce87fa50c2cfe932d66e89496810 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Wed, 3 Aug 2016 14:57:10 -0400
|
||||
Subject: [PATCH] p2 Droplets should be recognized as runnable repositories.
|
||||
|
||||
Normally, a runnable repository is identified by the 'p2.runnable'
|
||||
property contained within the artifact repository (artifact.xml).
|
||||
However, in Fedora we ship p2 Droplets without this file so we need a
|
||||
way to let methods like getRunnableRepositories in
|
||||
o.e.equinox.internal.p2.touchpoint.eclipse.Util know that p2 Droplets
|
||||
are runnable repositories.
|
||||
|
||||
Change-Id: I0ad0a7557f998b4d032466f89e6cc76036d1fb38
|
||||
---
|
||||
.../ExtensionLocationArtifactRepository.java | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
||||
index 342e33e..425a166 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
||||
@@ -260,6 +260,22 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository<IArt
|
||||
return artifactRepository.getProperties();
|
||||
}
|
||||
|
||||
+ public String getProperty(String key) {
|
||||
+ if (IArtifactRepository.PROP_RUNNABLE.equals(key)) {
|
||||
+ String candidate = getLocation().getPath();
|
||||
+ String fragments = System.getProperty("p2.fragments");
|
||||
+ if (fragments != null) {
|
||||
+ String[] rootPaths = fragments.split(",");
|
||||
+ for (String root : rootPaths) {
|
||||
+ if (candidate.startsWith(root)) {
|
||||
+ return Boolean.TRUE.toString();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return super.getProperty(key);
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
public String setProperty(String key, String value, IProgressMonitor monitor) {
|
||||
try {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -22,9 +22,9 @@
|
|||
- org.mockito;bundle-version="1.8.4",
|
||||
+ org.hamcrest.core,
|
||||
+ org.mockito.mockito-core,
|
||||
org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
|
||||
org.eclipse.test.performance;bundle-version="3.13.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
org.eclipse.e4.ui.css.core;bundle-version="0.10.100"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Bundle-ActivationPolicy: lazy
|
||||
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig 2014-04-22 14:31:35.155774270 +0100
|
||||
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF 2014-04-22 14:33:47.599498477 +0100
|
||||
@@ -10,8 +10,8 @@
|
||||
|
|
@ -35,12 +35,26 @@
|
|||
- org.mockito;bundle-version="1.8.4",
|
||||
+ org.hamcrest.core,
|
||||
+ org.mockito.mockito-core,
|
||||
org.eclipse.equinox.preferences;bundle-version="3.5.200",
|
||||
org.eclipse.ui.forms,
|
||||
org.eclipse.ui.views.properties.tabbed
|
||||
--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig 2017-04-04 17:30:21.859313175 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml 2017-04-04 17:30:47.748038958 +0100
|
||||
@@ -75,7 +75,7 @@
|
||||
org.eclipse.equinox.preferences;bundle-version="3.5.200"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2014-03-26 11:39:33.756282231 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2014-03-26 13:03:00.971974954 +0000
|
||||
@@ -469,13 +469,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.hamcrest"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.hamcrest.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -504,7 +497,7 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
|
|
@ -49,22 +63,3 @@
|
|||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
--- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig 2018-08-20 12:54:25.245305107 +0100
|
||||
+++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF 2018-08-20 12:54:37.952261537 +0100
|
||||
@@ -33,6 +33,7 @@
|
||||
org.eclipse.ui.workbench.texteditor;resolution:=optional,
|
||||
org.eclipse.ui.editors;resolution:=optional,
|
||||
org.junit,
|
||||
+ org.hamcrest.core,
|
||||
org.eclipse.core.resources,
|
||||
org.eclipse.core.variables,
|
||||
org.eclipse.ui,
|
||||
--- ./eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF.orig 2018-08-20 13:22:04.987695821 +0100
|
||||
+++ ./eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF 2018-08-20 13:22:28.507613518 +0100
|
||||
@@ -7,4 +7,5 @@
|
||||
Fragment-Host: org.eclipse.urischeme;bundle-version="1.0.0"
|
||||
Automatic-Module-Name: org.eclipse.urischeme.tests
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
-Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)"
|
||||
+Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
|
||||
+ org.hamcrest.core;bundle-version="1.3.0"
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
--- eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
|
||||
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
|
||||
@@ -38,6 +38,8 @@
|
||||
--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
|
||||
+++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
|
||||
@@ -37,6 +37,8 @@
|
||||
<configuration>
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.pde"/>
|
||||
|
|
@ -59,43 +59,144 @@
|
|||
</configuration>
|
||||
--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
|
||||
@@ -57,6 +57,8 @@
|
||||
@@ -57,6 +57,10 @@
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.jdt"/>
|
||||
<plugin id="org.eclipse.jdt.doc.user"/>
|
||||
+ <plugin id="org.eclipse.jdt.launching.macosx" />
|
||||
+ <plugin id="org.eclipse.jdt.launching.ui.macosx" />
|
||||
+ <plugin id="org.junit" />
|
||||
+ <plugin id="org.hamcrest.core" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.bak 2013-03-14 11:18:11.000000000 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2013-03-14 12:45:12.956174290 +0100
|
||||
@@ -15,10 +15,7 @@
|
||||
license.html
|
||||
|
||||
|
||||
-generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source,plugin@com.ibm.icu.source;version=50.1.0.qualifier;unpack="false",\
|
||||
-plugin@org.apache.felix.gogo.command.source;version=0.10.0.qualifier;unpack="false",\
|
||||
-plugin@org.apache.felix.gogo.runtime.source;version=0.10.0.qualifier;unpack="false",\
|
||||
-plugin@org.apache.felix.gogo.shell.source;version=0.10.0.qualifier;unpack="false"
|
||||
+generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source
|
||||
|
||||
generate.feature@org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
|
||||
feature@org.eclipse.equinox.p2.core.feature.source,\
|
||||
@@ -31,16 +28,6 @@
|
||||
plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
|
||||
plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
|
||||
plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.source;version=1.0.200.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false",\
|
||||
- plugin@org.apache.commons.codec.source;version=1.4.0.qualifier;unpack="false,\
|
||||
- plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
|
||||
+ plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false"
|
||||
|
||||
-generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp,\
|
||||
- plugin@javax.annotation.source;version=1.1.0.qualifier;unpack="false",\
|
||||
- plugin@javax.inject.source;version=1.0.0.qualifier;unpack="false",\
|
||||
- plugin@org.apache.batik.css.source;version=1.6.0.qualifier;unpack="false",\
|
||||
- plugin@org.apache.batik.util.gui.source;version=1.6.0.qualifier;unpack="false",\
|
||||
- plugin@org.apache.batik.util.source;version=1.6.0.qualifier;unpack="false",\
|
||||
- plugin@org.w3c.dom.smil.source;version=1.0.0.qualifier;unpack="false",\
|
||||
- plugin@org.w3c.dom.svg.source;version=1.1.0.qualifier;unpack="false",\
|
||||
- plugin@org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
|
||||
+generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
|
||||
\ No newline at end of file
|
||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
|
||||
@@ -68,6 +68,8 @@
|
||||
@@ -74,6 +74,13 @@
|
||||
<plugin id="org.eclipse.core.net.linux.x86_64"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86"/>
|
||||
<plugin id="org.eclipse.core.net.win32.x86_64"/>
|
||||
+ <plugin id="org.eclipse.equinox.security.macosx"/>
|
||||
+ <plugin id="org.eclipse.equinox.security.win32.x86"/>
|
||||
+ <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
|
||||
+ <plugin id="org.eclipse.compare.win32"/>
|
||||
+ <plugin id="org.eclipse.ui.win32"/>
|
||||
+ <plugin id="com.jcraft.jsch"/>
|
||||
+ <plugin id="org.apache.ant"/>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml.orig 2014-04-23 15:44:51.755422154 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml 2014-04-23 15:45:22.730893380 +0100
|
||||
@@ -39,11 +39,9 @@
|
||||
<features>
|
||||
<feature id="org.eclipse.sdk.examples"/>
|
||||
</features>
|
||||
- <!--
|
||||
<excludes>
|
||||
- <plugin id="org.eclipse.sdk.examples"/>
|
||||
+ <plugin id="org.eclipse.swt.examples.ole.win32"/>
|
||||
</excludes>
|
||||
- -->
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
--- eclipse.platform.releng/features/org.eclipse.rcp/pom.xml.orig 2014-04-28 16:08:27.781454042 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.rcp/pom.xml 2014-04-28 16:08:55.067988282 +0100
|
||||
@@ -37,6 +37,7 @@
|
||||
<configuration>
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.rcp"/>
|
||||
+ <plugin id="org.eclipse.ui.cocoa"/>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2015-03-18 09:32:34.661736950 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2015-03-18 09:33:37.948838036 +0000
|
||||
@@ -11,31 +11,12 @@
|
||||
bin.includes=feature.xml,feature.properties
|
||||
|
||||
generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\
|
||||
- plugin@org.apache.ant.source;version=1.8.4.qualifier;unpack="false",\
|
||||
- plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\
|
||||
exclude@org.eclipse.platform.doc.user
|
||||
|
||||
generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\
|
||||
-plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\
|
||||
-plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
|
||||
exclude@org.eclipse.jdt.doc.user
|
||||
-generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",exclude@org.eclipse.pde.doc.user
|
||||
+generate.feature@org.eclipse.pde.source=org.eclipse.pde,exclude@org.eclipse.pde.doc.user
|
||||
generate.feature@org.eclipse.cvs.source=org.eclipse.cvs
|
||||
-generate.feature@org.eclipse.help.source=org.eclipse.help,\
|
||||
- plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
|
||||
- plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
|
||||
- plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
|
||||
- plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
|
||||
- plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
|
||||
- plugin@org.apache.lucene.analysis.source;version=3.5.0.qualifier;unpack="false",\
|
||||
- plugin@org.apache.lucene.core.source;version=3.5.0.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.jetty.continuation.source;version=8.1.9.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.jetty.http.source;version=8.1.9.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.jetty.io.source;version=8.1.9.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.jetty.security.source;version=8.1.9.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.jetty.server.source;version=8.1.9.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.jetty.servlet.source;version=8.1.9.qualifier;unpack="false",\
|
||||
- plugin@org.eclipse.jetty.util.source;version=8.1.9.qualifier;unpack="false",\
|
||||
- plugin@javax.el.source;version=2.2.0.qualifier;unpack="false"
|
||||
+generate.feature@org.eclipse.help.source=org.eclipse.help
|
||||
|
||||
generatedVersionLength=45
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
|
||||
@@ -44,6 +44,22 @@
|
||||
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
|
||||
@@ -54,6 +54,21 @@
|
||||
<plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
|
||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
|
||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
|
||||
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
|
||||
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
|
||||
+ <plugin id="org.apache.commons.jxpath" />
|
||||
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
|
||||
+ <plugin id="org.apache.felix.gogo.command" />
|
||||
+ <plugin id="org.apache.batik.css" />
|
||||
+ <plugin id="org.apache.batik.i18n" />
|
||||
+ <plugin id="org.w3c.css.sac" />
|
||||
+ <plugin id="org.apache.batik.util" />
|
||||
+ <plugin id="org.apache.xmlgraphics" />
|
||||
+ <plugin id="org.apache.batik.util.gui" />
|
||||
+ <plugin id="org.w3c.dom.svg" />
|
||||
+ <plugin id="javax.inject" />
|
||||
+ <plugin id="com.ibm.icu"/>
|
||||
|
|
@ -104,22 +205,3 @@
|
|||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2016-04-27 09:18:50.421221722 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2016-04-27 09:19:08.454957280 +0100
|
||||
@@ -51,16 +51,6 @@
|
||||
id="org.eclipse.help.source"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <requires>
|
||||
- <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.feature.source" version="1.4.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- </requires>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.sdk"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2018-04-25 15:35:44.914031196 +0100
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2018-04-25 15:36:17.546856697 +0100
|
||||
@@ -880,7 +880,7 @@
|
||||
//First check to see if there is already an IU around for this
|
||||
IInstallableUnit bundleIU = queryForIU(result, bd.getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
|
||||
IArtifactKey bundleArtKey = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
|
||||
- if (bundleIU == null) {
|
||||
+ if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) {
|
||||
createAdviceFileAdvice(bd, info);
|
||||
// Create the bundle IU according to any shape advice we have
|
||||
bundleIU = doCreateBundleIU(bd, bundleArtKey, info);
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2012-05-05 15:24:03.000000000 +0200
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2012-05-17 16:14:48.607827015 +0200
|
||||
@@ -752,7 +752,7 @@
|
||||
//First check to see if there is already an IU around for this
|
||||
IInstallableUnit bundleIU = queryForIU(result, bundleDescriptions[i].getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
|
||||
IArtifactKey key = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
|
||||
- if (bundleIU == null) {
|
||||
+ if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) {
|
||||
createAdviceFileAdvice(bundleDescriptions[i], info);
|
||||
// Create the bundle IU according to any shape advice we have
|
||||
bundleIU = doCreateBundleIU(bd, key, info);
|
||||
|
|
|
|||
|
|
@ -1,114 +0,0 @@
|
|||
From 72e58be8c9c5fbc6f6527318b4381a58cebfc120 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Thu, 7 Apr 2016 10:23:49 -0400
|
||||
Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled
|
||||
installations.
|
||||
|
||||
- Additionally support reading source bundles from p2 Droplets location
|
||||
---
|
||||
ui/org.eclipse.pde.core/META-INF/MANIFEST.MF | 3 +-
|
||||
.../src/org/eclipse/pde/internal/core/P2Utils.java | 48 +++++++++++++++++++---
|
||||
2 files changed, 45 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
|
||||
index 7c20994..ab702e3 100644
|
||||
--- eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
|
||||
@@ -102,6 +102,7 @@ Require-Bundle:
|
||||
org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)"
|
||||
Eclipse-LazyStart: true
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
-Import-Package: com.ibm.icu.util
|
||||
+Import-Package: com.ibm.icu.util,
|
||||
+ org.eclipse.equinox.internal.simpleconfigurator.utils
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Automatic-Module-Name: org.eclipse.pde.core
|
||||
diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
index fbd4b81..55cd40e 100644
|
||||
--- eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
@@ -12,11 +12,12 @@
|
||||
package org.eclipse.pde.internal.core;
|
||||
|
||||
import java.io.*;
|
||||
-import java.net.MalformedURLException;
|
||||
-import java.net.URL;
|
||||
+import java.net.*;
|
||||
+import java.nio.file.Paths;
|
||||
import java.util.*;
|
||||
import org.eclipse.core.runtime.*;
|
||||
import org.eclipse.equinox.frameworkadmin.BundleInfo;
|
||||
+import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorUtils;
|
||||
import org.eclipse.equinox.p2.core.IProvisioningAgent;
|
||||
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
|
||||
import org.eclipse.equinox.p2.engine.*;
|
||||
@@ -29,6 +30,7 @@ import org.eclipse.osgi.service.resolver.*;
|
||||
import org.eclipse.pde.core.plugin.*;
|
||||
import org.eclipse.pde.internal.build.BundleHelper;
|
||||
import org.eclipse.pde.internal.core.plugin.PluginBase;
|
||||
+import org.eclipse.pde.internal.core.util.ManifestUtils;
|
||||
import org.osgi.framework.Constants;
|
||||
|
||||
/**
|
||||
@@ -108,7 +110,16 @@ public class P2Utils {
|
||||
try {
|
||||
URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath());
|
||||
File home = basePath.toFile();
|
||||
- BundleInfo bundles[] = getBundlesFromFile(bundlesTxt, home);
|
||||
+ List<org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo> ibundleList = SimpleConfiguratorUtils.readConfiguration(bundlesTxt, home.toURI());
|
||||
+ List<BundleInfo> bundleList = new ArrayList<>();
|
||||
+ for (org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo b : ibundleList) {
|
||||
+ URI location = b.getLocation();
|
||||
+ if (!location.isAbsolute() && b.getBaseLocation() != null)
|
||||
+ location = URIUtil.makeAbsolute(location, b.getBaseLocation());
|
||||
+ BundleInfo binfo = new BundleInfo(b.getSymbolicName(), b.getVersion(), location, b.getStartLevel(), b.isMarkedAsStarted());
|
||||
+ bundleList.add(binfo);
|
||||
+ }
|
||||
+ BundleInfo[] bundles = bundleList.toArray(new BundleInfo[0]);
|
||||
if (bundles == null || bundles.length == 0) {
|
||||
return null;
|
||||
}
|
||||
@@ -140,11 +151,38 @@ public class P2Utils {
|
||||
try {
|
||||
File home = basePath.toFile();
|
||||
URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH));
|
||||
+ final List<BundleInfo> allSrcBundles = new ArrayList<>();
|
||||
+ try {
|
||||
+ for (File infoFile : SimpleConfiguratorUtils.getInfoFiles()) {
|
||||
+ File pluginsDir = Paths.get(infoFile.getParent(), "plugins").toFile(); //$NON-NLS-1$
|
||||
+ File[] sourceJars = pluginsDir.listFiles((dir, name) -> {
|
||||
+ return name.matches(".*\\.source_.*\\.jar$"); //$NON-NLS-1$
|
||||
+ });
|
||||
+ for (File sourceJar : sourceJars) {
|
||||
+ Map<String, String> manifest;
|
||||
+ try {
|
||||
+ manifest = ManifestUtils.loadManifest(sourceJar);
|
||||
+ final String bsn = manifest.get(Constants.BUNDLE_SYMBOLICNAME);
|
||||
+ final String version = manifest.get(Constants.BUNDLE_VERSION);
|
||||
+ BundleInfo info = new BundleInfo(bsn, version, sourceJar.toURI(), -1, false);
|
||||
+ allSrcBundles.add(info);
|
||||
+ } catch (CoreException e) {
|
||||
+ // continue
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ } catch (URISyntaxException e) {
|
||||
+ // continue
|
||||
+ }
|
||||
+
|
||||
BundleInfo srcBundles[] = getBundlesFromFile(srcBundlesTxt, home);
|
||||
- if (srcBundles == null || srcBundles.length == 0) {
|
||||
+ if (srcBundles != null && srcBundles.length > 0) {
|
||||
+ allSrcBundles.addAll(Arrays.asList(srcBundles));
|
||||
+ }
|
||||
+ if (allSrcBundles.size() == 0) {
|
||||
return null;
|
||||
}
|
||||
- return srcBundles;
|
||||
+ return allSrcBundles.toArray(new BundleInfo[0]);
|
||||
} catch (MalformedURLException e) {
|
||||
PDECore.log(e);
|
||||
return null;
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -0,0 +1,300 @@
|
|||
### Eclipse Workspace Patch 1.0
|
||||
#P org.eclipse.pde.build
|
||||
--- /dev/null
|
||||
+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/prepare-build-dir.sh
|
||||
@@ -0,0 +1,105 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
+if [ $# -lt 2 ]; then
|
||||
+ echo "usage: $0 <path to source dir> <path to build dir>"
|
||||
+ exit 1
|
||||
+fi
|
||||
+
|
||||
+if [ ! -d $1 ]; then
|
||||
+ echo "usage: $0 <path to source dir> <path to build dir>"
|
||||
+ exit 1
|
||||
+fi
|
||||
+
|
||||
+SOURCEDIR=$1
|
||||
+BUILDDIR=$2
|
||||
+TESTING=$3
|
||||
+
|
||||
+echo "preparing files in $1 for buildfile generation ..."
|
||||
+mkdir -p $BUILDDIR
|
||||
+
|
||||
+# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml
|
||||
+mkdir -p $BUILDDIR/tmp
|
||||
+BUILDFILE=$BUILDDIR/tmp/build.xml
|
||||
+
|
||||
+echo "<project default=\"main\">
|
||||
+ <target name=\"main\">
|
||||
+ <xmlproperty file=\"@type@.xml\" collapseAttributes=\"true\"/>
|
||||
+ <fail unless=\"@type@.id\" message=\"feature.id not set\"/>
|
||||
+ <echo message=\"\${@type@.id}\" />
|
||||
+ </target>
|
||||
+</project>" > $BUILDFILE
|
||||
+
|
||||
+for type in feature plugin fragment; do
|
||||
+ CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml
|
||||
+ cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE
|
||||
+done
|
||||
+
|
||||
+# make the directories eclipse is expecting
|
||||
+echo " making the 'features' and 'plugins' directories"
|
||||
+mkdir -p $BUILDDIR/features $BUILDDIR/plugins
|
||||
+
|
||||
+# make symlinks for the features
|
||||
+FEATURES=$(find $SOURCEDIR -name feature.xml)
|
||||
+find $SOURCEDIR -name feature.xml | while read f; do
|
||||
+ PROJECTDIR=$(dirname "$f")
|
||||
+ inSDK=1
|
||||
+ inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
|
||||
+ if [ $inSDK = 0 ]; then
|
||||
+ PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
|
||||
+ ERROR=""
|
||||
+ if [ -z "$PROJECTNAME" ]; then
|
||||
+ echo "ERROR: could not determine the feature id for $PROJECTDIR"
|
||||
+ if [ $TESTING != true ]; then
|
||||
+ exit 1
|
||||
+ else
|
||||
+ ERROR="yes"
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ if [ "x$ERROR" != "xyes" ]; then
|
||||
+ if [ $TESTING != true ] || `echo "$PROJECTNAME" | grep "org.eclipse"`; then
|
||||
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
|
||||
+ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
|
||||
+ fi
|
||||
+ fi
|
||||
+ fi
|
||||
+done
|
||||
+
|
||||
+# make symlinks for plugins and fragments
|
||||
+PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq)
|
||||
+find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq | while read dir; do
|
||||
+ PROJECTNAME=""
|
||||
+ ERROR=""
|
||||
+ inSDK=1
|
||||
+ inSDK=$(echo $dir | grep -c $BUILDDIR)
|
||||
+ if [ $inSDK = 0 ]; then
|
||||
+ if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
|
||||
+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
|
||||
+ elif [ -e "$dir/plugin.xml" ]; then
|
||||
+ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
|
||||
+ elif [ -e "$dir/fragment.xml" ]; then
|
||||
+ PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
|
||||
+ fi
|
||||
+
|
||||
+ if [ -z "$PROJECTNAME" ]; then
|
||||
+ echo "ERROR: could not determine the plugin or fragment id for $dir"
|
||||
+ if [ $TESTING != true ]; then
|
||||
+ exit 1
|
||||
+ else
|
||||
+ ERROR="yes"
|
||||
+ fi
|
||||
+ fi
|
||||
+
|
||||
+ if [ "x$ERROR" != "xyes" ]; then
|
||||
+ if [ $TESTING != true ] || `echo "$PROJECTNAME" | grep "org.eclipse"`; then
|
||||
+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
|
||||
+ ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
|
||||
+ fi
|
||||
+ fi;
|
||||
+
|
||||
+ fi
|
||||
+
|
||||
+done
|
||||
+
|
||||
+rm -rf $BUILDDIR/tmp
|
||||
+echo done
|
||||
--- /dev/null
|
||||
+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/customTargets-assemble-target.xml
|
||||
@@ -0,0 +1,15 @@
|
||||
+<project>
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Targets to assemble the built elements for particular configurations -->
|
||||
+ <!-- These generally call the generated assemble scripts (named in -->
|
||||
+ <!-- ${assembleScriptName}) but may also add pre and post processing -->
|
||||
+ <!-- Add one target for each root element and each configuration -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+
|
||||
+ <target name="assemble.@id@">
|
||||
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
|
||||
+ </target>
|
||||
+ <target name="assemble.@id@.@configs@">
|
||||
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
|
||||
+ </target>
|
||||
+</project>
|
||||
--- /dev/null
|
||||
+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/customTargets.xml
|
||||
@@ -0,0 +1,154 @@
|
||||
+<project name="Build specific targets and properties" default="noDefault">
|
||||
+
|
||||
+ <fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />
|
||||
+ <fail unless="id" message="Please set the ${id} property to the feature, plugin or fragment id of the plugin you are building." />
|
||||
+ <fail unless="sourceDirectory" message="Please set the ${sourceDirectory} property to the directory that has the source plugins." />
|
||||
+
|
||||
+ <!-- we need to do this because you can't expand variables in target names -->
|
||||
+ <copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
|
||||
+ <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" />
|
||||
+ <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@configs@" value="${configs}" />
|
||||
+ <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="," value="." />
|
||||
+ <import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Run a given ${target} on all elements being built -->
|
||||
+ <!-- Add on <ant> task for each top level element being built. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="allElements">
|
||||
+ <ant antfile="${genericTargets}" target="${target}">
|
||||
+ <property name="type" value="${type}" />
|
||||
+ <property name="id" value="${id}" />
|
||||
+ </ant>
|
||||
+ </target>
|
||||
+
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Check out map files from correct repository -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="getMapFiles">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+
|
||||
+ <target name="clean" unless="noclean">
|
||||
+ <antcall target="allElements">
|
||||
+ <param name="target" value="cleanElement" />
|
||||
+ </antcall>
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do before setup -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="preSetup">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do after setup but before starting the build proper -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="postSetup">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do before fetching the build elements -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="preFetch">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do after fetching the build elements -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="postFetch">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do before generating the build scripts. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="preGenerate">
|
||||
+ <!-- Eclipse expects the feature projects to be in the 'features' directory and
|
||||
+ plugin projects to be in the 'plugins' directory. The build infrastructure
|
||||
+ normally arranges the projects during the fetch stage. Since we aren't doing
|
||||
+ the fetch stage, we have to manually arrange the files -->
|
||||
+ <exec dir="${builder}" executable="/bin/bash" failOnError="true">
|
||||
+ <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} ${testing}" />
|
||||
+ </exec>
|
||||
+ <antcall target="symlinkDeps" />
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="symlinkDeps" if="orbitDepsDir">
|
||||
+ <apply executable="ln" parallel="false" dir="${buildDirectory}/plugins" verbose="true">
|
||||
+ <arg line="-s" />
|
||||
+ <srcfile />
|
||||
+ <fileset dir="${orbitDepsDir}" includes="*.jar" />
|
||||
+ </apply>
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do after generating the build scripts. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="postGenerate">
|
||||
+ <antcall target="clean" />
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do before running the build.xmls for the elements being built. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="preProcess">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do after running the build.xmls for the elements being built. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="postProcess">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do before running assemble. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="preAssemble">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do after running assemble. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="postAssemble">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do before running package. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="prePackage">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do after running package. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="postPackage">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do after the build is done. -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="postBuild">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do to test the build results -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="test">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Steps to do to publish the build results -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="publish">
|
||||
+ </target>
|
||||
+
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <!-- Default target -->
|
||||
+ <!-- ===================================================================== -->
|
||||
+ <target name="noDefault">
|
||||
+ <echo message="You must specify a target when invoking this file" />
|
||||
+ </target>
|
||||
+
|
||||
+</project>
|
||||
--- /dev/null
|
||||
+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/build.properties
|
||||
@@ -0,0 +1,12 @@
|
||||
+buildDirectory=${sourceDirectory}/build
|
||||
+buildLabel=rpmBuild
|
||||
+archivePrefix=eclipse
|
||||
+skipFetch=true
|
||||
+javacFailOnError=true
|
||||
+collectingFolder=eclipse
|
||||
+archivesFormat=*,*,*-zip
|
||||
+zipargs=-y
|
||||
+javacDebugInfo=true
|
||||
+archiveName=${id}.zip
|
||||
+runPackager=false
|
||||
+baseLocation=@DATADIR@/eclipse
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
--- eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java.orig 2014-03-27 10:48:13.547706443 +0000
|
||||
+++ eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java 2014-03-27 10:52:42.615751600 +0000
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
return oldStart0 - oldStart1;
|
||||
}
|
||||
- return Policy.getComparator().compare(arg0, arg1);
|
||||
+ return Policy.getComparator().compare((String)arg0, (String)arg1);
|
||||
}
|
||||
};
|
||||
}
|
||||
--- eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java.orig 2014-03-27 11:27:35.233213660 +0000
|
||||
+++ eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java 2014-03-27 12:19:30.696748271 +0000
|
||||
@@ -14,6 +14,7 @@
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
+import java.util.Comparator;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
@@ -228,7 +229,7 @@
|
||||
// show Help button in JFace dialogs
|
||||
TrayDialog.setDialogHelpAvailable(true);
|
||||
|
||||
- Policy.setComparator(Collator.getInstance());
|
||||
+ Policy.setComparator((Comparator)Collator.getInstance());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- eclipse-platform-parent/pom.xml.orig 2014-11-28 14:54:50.000000000 +0000
|
||||
+++ eclipse-platform-parent/pom.xml 2014-11-28 15:32:51.700154985 +0000
|
||||
@@ -483,7 +483,7 @@
|
||||
@@ -360,7 +360,7 @@
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<dependencies>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
@@ -492,19 +492,19 @@
|
||||
@@ -369,19 +369,19 @@
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-sourceref-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
|
|
@ -18,13 +18,13 @@
|
|||
</dependencies>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>${qualifier.format}</format>
|
||||
<format>'v'yyyyMMdd-HHmm</format>
|
||||
- <timestampProvider>jgit</timestampProvider>
|
||||
+ <!--timestampProvider>jgit</timestampProvider-->
|
||||
<jgit.ignore>
|
||||
pom.xml
|
||||
</jgit.ignore>
|
||||
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
|
||||
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
|
||||
- <sourceReferences>
|
||||
+ <!--sourceReferences>
|
||||
<generate>true</generate>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig 2013-02-20 16:43:17.000000000 +0100
|
||||
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2013-02-21 09:51:19.981788507 +0100
|
||||
@@ -61,7 +61,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>javax.annotation</id>
|
||||
+ <id>javax.annotation-api</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
@@ -96,7 +96,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>org.apache.jasper.glassfish</id>
|
||||
+ <id>org.glassfish.web.javax.servlet.jsp</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2014-03-26 11:39:33.756282231 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2014-03-26 13:19:39.009594727 +0000
|
||||
@@ -349,12 +349,6 @@
|
||||
version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.releng.tests"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.team.tests.cvs.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -391,18 +385,6 @@
|
||||
install-size="0"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <plugin
|
||||
- id="org.aspectj.runtime"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.region.tests"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
<plugin
|
||||
id="org.eclipse.equinox.security.tests"
|
||||
download-size="0"
|
||||
@@ -423,12 +402,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.p2.tests.discovery"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.p2.tests.ui"
|
||||
|
|
@ -1,8 +1,34 @@
|
|||
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
|
||||
index 7dd0536..66d79ee 100644
|
||||
--- a/eclipse.platform.swt.binaries/pom.xml
|
||||
+++ b/eclipse.platform.swt.binaries/pom.xml
|
||||
@@ -63,6 +63,8 @@
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.s390</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
|
||||
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
|
||||
index b46cdc6..0fb36a5 100644
|
||||
--- a/rt.equinox.framework/pom.xml
|
||||
+++ b/rt.equinox.framework/pom.xml
|
||||
@@ -64,6 +64,8 @@
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
|
||||
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
|
||||
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
index 7e1f520..734dd10 100644
|
||||
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
@@ -418,6 +418,36 @@
|
||||
@@ -419,6 +419,26 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
|
|
@ -25,38 +51,15 @@ index 7e1f520..734dd10 100644
|
|||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.s390x"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="s390x"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
||||
@@ -496,6 +526,39 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -583,6 +613,28 @@
|
||||
version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.s390x"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="s390x"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.arm"
|
||||
+ os="linux"
|
||||
|
|
@ -76,122 +79,259 @@ index 7e1f520..734dd10 100644
|
|||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.swt.gtk.linux.ppc"
|
||||
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
|
||||
index 29d3871..45526c8 100644
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
|
||||
@@ -119,6 +125,16 @@
|
||||
defaultJava=DEFAULT_JAVA_EXEC
|
||||
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
;;
|
||||
+ arm*)
|
||||
+ defaultOSArch="arm"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
+ "aarch64")
|
||||
+ defaultOSArch="aarch64"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
*)
|
||||
echo "*** Unknown MODEL <${MODEL}>"
|
||||
;;
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
|
||||
@@ -123,7 +123,11 @@
|
||||
<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
|
||||
<fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
|
||||
<include name="cocoa/macosx/x86_64/**/*"/>
|
||||
+ <include name="gtk/linux/arm/**/*"/>
|
||||
+ <include name="gtk/linux/aarch64/**/*"/>
|
||||
+ <include name="gtk/linux/ppc64/**/*"/>
|
||||
<include name="gtk/linux/ppc64le/**/*"/>
|
||||
+ <include name="gtk/linux/s390x/**/*"/>
|
||||
<include name="gtk/linux/x86/**/*"/>
|
||||
<include name="gtk/linux/x86_64/**/*"/>
|
||||
<include name="win32/win32/x86/**/*"/>
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
|
||||
@@ -34,3 +34,15 @@
|
||||
|
||||
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
|
||||
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
|
||||
+
|
||||
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
|
||||
+root.linux.gtk.arm.permissions.755=launcher
|
||||
+
|
||||
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
|
||||
+root.linux.gtk.aarch64.permissions.755=launcher
|
||||
+
|
||||
+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
|
||||
+root.linux.gtk.ppc64.permissions.755=launcher
|
||||
+
|
||||
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
|
||||
+root.linux.gtk.s390x.permissions.755=launcher
|
||||
--- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722 +0100
|
||||
+++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342 +0100
|
||||
@@ -54,7 +54,11 @@
|
||||
|
||||
<modules>
|
||||
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
|
||||
+ <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
|
||||
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
|
||||
<module>bundles/org.eclipse.swt.win32.win32.x86</module>
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
|
||||
@@ -34,3 +34,23 @@
|
||||
requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
|
||||
requires.7.range = [$version$,$version$]
|
||||
requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.8.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
|
||||
+requires.8.range = [$version$,$version$]
|
||||
+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.9.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.9.name = org.eclipse.swt.gtk.linux.arm
|
||||
+requires.9.range = [$version$,$version$]
|
||||
+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.10.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
|
||||
+requires.10.range = [$version$,$version$]
|
||||
+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.11.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.11.name = org.eclipse.swt.gtk.linux.s390x
|
||||
+requires.11.range = [$version$,$version$]
|
||||
+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
|
||||
@@ -106,7 +106,7 @@
|
||||
"s390x")
|
||||
defaultOSArch="s390x"
|
||||
defaultJava=DEFAULT_JAVA_EXEC
|
||||
- OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
;;
|
||||
arm*)
|
||||
defaultOSArch="arm"
|
||||
--- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100
|
||||
+++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100
|
||||
@@ -73,6 +73,30 @@
|
||||
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
|
||||
</modules>
|
||||
@@ -219,6 +219,189 @@
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
+
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc64</value>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc64</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <modules>
|
||||
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
|
||||
+ </modules>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.arm</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.arm</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.aarch64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.aarch64</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390x</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390x</value>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390x</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <modules>
|
||||
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
|
||||
+ </modules>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
</profiles>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <artifactId>maven-antrun-plugin</artifactId>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <id>compile-executable-natives</id>
|
||||
+ <phase>generate-resources</phase>
|
||||
+ <configuration>
|
||||
+ <target>
|
||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
|
||||
+ </target>
|
||||
+ </configuration>
|
||||
+ <goals>
|
||||
+ <goal>run</goal>
|
||||
+ </goals>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
+ </profile>
|
||||
+
|
||||
<profile>
|
||||
<id>build-native-launchers-win32.win32.x86_64</id>
|
||||
<activation>
|
||||
@@ -347,8 +530,8 @@
|
||||
<include name="gtk/solaris/x86/**/*"/>
|
||||
<include name="win32/win32/x86/**/*"/>
|
||||
<include name="win32/win32/x86_64/**/*"/>
|
||||
- </fileset>
|
||||
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
|
||||
+ <include name="gtk/linux/arm/**/*"/>
|
||||
+ <include name="gtk/linux/aarch64/**/*"/>
|
||||
<include name="gtk/linux/s390/**/*"/>
|
||||
<include name="gtk/linux/s390x/**/*"/>
|
||||
</fileset>
|
||||
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
|
||||
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
|
||||
@@ -59,4 +59,8 @@
|
||||
root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
|
||||
root.linux.gtk.s390.permissions.755=launcher
|
||||
|
||||
<modules>
|
||||
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
|
||||
+root.linux.gtk.aarch64.permissions.755=launcher
|
||||
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
|
||||
+root.linux.gtk.arm.permissions.755=launcher
|
||||
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2015-06-11 13:16:13.638692229 +0100
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2015-06-11 13:17:38.715576669 +0100
|
||||
@@ -85,3 +85,13 @@
|
||||
requires.17.name = org.eclipse.swt.gtk.hpux.ia64
|
||||
requires.17.range = [$version$,$version$]
|
||||
requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.18.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.18.name = org.eclipse.swt.gtk.linux.arm
|
||||
+requires.18.range = [$version$,$version$]
|
||||
+requires.18.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
|
||||
+
|
||||
+requires.19.namespace = org.eclipse.equinox.p2.iu
|
||||
+requires.19.name = org.eclipse.swt.gtk.linux.aarch64
|
||||
+requires.19.range = [$version$,$version$]
|
||||
+requires.19.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
|
||||
|
|
|
|||
|
|
@ -29,9 +29,11 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/
|
|||
index ab69b88..d6bf121 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
@@ -15,8 +15,12 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
|
||||
@@ -13,9 +13,14 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.nio.file.Files;
|
||||
+import java.nio.file.*;
|
||||
import java.util.*;
|
||||
+import java.util.jar.JarFile;
|
||||
+import java.util.zip.ZipEntry;
|
||||
|
|
@ -43,13 +45,13 @@ index ab69b88..d6bf121 100644
|
|||
|
||||
public class SimpleConfiguratorUtils {
|
||||
|
||||
@@ -277,6 +281,16 @@ public class SimpleConfiguratorUtils {
|
||||
@@ -283,6 +288,16 @@ public class SimpleConfiguratorUtils {
|
||||
String symbolicName = tok.nextToken().trim();
|
||||
String version = tok.nextToken().trim();
|
||||
URI location = parseLocation(tok.nextToken().trim());
|
||||
+ if (base != null) {
|
||||
+ URI absLoc = URIUtil.append(base, location.toString());
|
||||
+ java.nio.file.Path absPath = java.nio.file.Paths.get(absLoc);
|
||||
+ Path absPath = Paths.get(absLoc);
|
||||
+ // Symbolic links may change outside Eclipse so regenerate proper bundle version.
|
||||
+ if (Files.isSymbolicLink(absPath) && absPath.toFile().isFile()) {
|
||||
+ // We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils
|
||||
|
|
@ -58,9 +60,9 @@ index ab69b88..d6bf121 100644
|
|||
+ }
|
||||
+ }
|
||||
int startLevel = Integer.parseInt(tok.nextToken().trim());
|
||||
boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken());
|
||||
boolean markedAsStarted = Boolean.valueOf(tok.nextToken()).booleanValue();
|
||||
BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted);
|
||||
@@ -400,4 +414,93 @@ public class SimpleConfiguratorUtils {
|
||||
@@ -421,4 +436,93 @@ public class SimpleConfiguratorUtils {
|
||||
}
|
||||
return regularTimestamp;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig
|
||||
+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
|
||||
@@ -898,15 +898,19 @@
|
||||
</not>
|
||||
</condition>
|
||||
<antcall target="init_build"/>
|
||||
+ <antcall target="build_gtk2"/>
|
||||
+ <antcall target="build_gtk3"/>
|
||||
+ <delete dir="${build_dir}" quiet="true"/>
|
||||
+ <antcall target="refresh_fragment"/>
|
||||
+ </target>
|
||||
+
|
||||
+ <target name="build_gtk2" depends="get_version" if="machine_gtk2">
|
||||
<antcall target="${build_task}">
|
||||
<param name="build_targets" value="${targets}"/>
|
||||
<param name="build_machine" value="${machine}"/>
|
||||
<param name="port" value="${port}"/>
|
||||
<param name="keyfile" value="${keyfile}"/>
|
||||
</antcall>
|
||||
- <antcall target="build_gtk3"/>
|
||||
- <delete dir="${build_dir}" quiet="true"/>
|
||||
- <antcall target="refresh_fragment"/>
|
||||
</target>
|
||||
|
||||
<target name="build_gtk3" depends="get_version" if="machine_gtk3">
|
||||
|
|
@ -1,183 +1,144 @@
|
|||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2017-04-19 12:47:51.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2017-04-19 20:15:38.781348810 +0100
|
||||
@@ -39,21 +39,6 @@
|
||||
arg1="${testPlugin}"
|
||||
arg2="org.eclipse.equinox.p2.tests.discovery" />
|
||||
</condition>
|
||||
- <condition
|
||||
- property="extraIU"
|
||||
- value="org.eclipse.osgi.compatibility.plugins.feature.feature.group">
|
||||
- <or>
|
||||
- <equals
|
||||
- arg1="${testPlugin}"
|
||||
- arg2="org.eclipse.osgi.tests" />
|
||||
- <equals
|
||||
- arg1="${testPlugin}"
|
||||
- arg2="org.eclipse.pde.ui.tests" />
|
||||
- <equals
|
||||
- arg1="${testPlugin}"
|
||||
- arg2="org.eclipse.pde.api.tools.tests" />
|
||||
- </or>
|
||||
- </condition>
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2014-11-28 14:54:50.000000000 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2014-11-28 15:44:49.542304044 +0000
|
||||
@@ -24,13 +24,6 @@
|
||||
has to move to "top of file" ... outer scope?
|
||||
<property file="${eclipseBuilderDir}/eclipse/buildConfigs/sdk.tests/testConfigs/${testPlatform}/testing.properties" />
|
||||
-->
|
||||
- <property
|
||||
- name="testingPropertiesfile"
|
||||
- value="testing.properties" />
|
||||
- <loadproperties>
|
||||
- <file file="${testingPropertiesfile}" />
|
||||
- </loadproperties>
|
||||
-
|
||||
|
||||
<!--default directory where test-eclipse will be installed-->
|
||||
<property
|
||||
@@ -207,79 +207,8 @@
|
||||
|
||||
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
|
||||
<target name="setupPlatform">
|
||||
- <echo message="os.arch ${os.arch}" />
|
||||
<loadproperties srcfile="equinoxp2tests.properties" />
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
|
||||
- <and>
|
||||
- <os family="unix" />
|
||||
- <not>
|
||||
- <or>
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- <os family="mac" />
|
||||
- </or>
|
||||
- </not>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
|
||||
- <and>
|
||||
- <os family="mac" />
|
||||
- <os family="unix" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <!--
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
|
||||
- <and>
|
||||
- <os family="mac" />
|
||||
- <os family="unix" />
|
||||
- <!- - should not need, as long as x86_64 rules (above) comes first
|
||||
- <os arch="i386" />
|
||||
- - ->
|
||||
- </and>
|
||||
- </condition>
|
||||
- -->
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
|
||||
- <and>
|
||||
- <os family="windows" />
|
||||
- <os arch="x86" />
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
|
||||
- <and>
|
||||
- <os family="windows" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
|
||||
- <and>
|
||||
- <os family="unix" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
+ <property name="platformArchive" value="${runtimeArchive}" />
|
||||
|
||||
<antcall target="setupRepo" />
|
||||
<antcall target="${setupTarget}" />
|
||||
@@ -61,7 +46,7 @@
|
||||
<antcall target="installPreferences">
|
||||
<param
|
||||
name="eclipse-home"
|
||||
- value="${eclipse-home}/eclipse" />
|
||||
+ value="${eclipse-home}" />
|
||||
</antcall>
|
||||
<antcall target="installExtraPlugins" />
|
||||
<antcall target="installTestPlugins" />
|
||||
@@ -96,19 +81,6 @@
|
||||
name="setupRepo"
|
||||
depends="init"
|
||||
unless="testRepoCreated">
|
||||
- <mkdir dir="${repoLocation}" />
|
||||
- <exec
|
||||
- dir="${basedir}"
|
||||
- executable="unzip"
|
||||
- failonerror="false"
|
||||
- resultproperty="unzipResultCode">
|
||||
- <arg value="-o" />
|
||||
- <arg value="-qq" />
|
||||
- <arg value="${repoZip}" />
|
||||
- <arg value="-d" />
|
||||
- <arg value="${repoLocation}" />
|
||||
- </exec>
|
||||
- <echo message="unzip resultcode: ${unzipResultCode}" />
|
||||
<!-- TODO: can do more checking here, if successful, before we set to value -->
|
||||
<property
|
||||
name="testRepoCreated"
|
||||
@@ -128,8 +100,9 @@
|
||||
message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />
|
||||
<echo message="Deleting existing ${eclipse-home}, if any." />
|
||||
<delete
|
||||
- dir="${eclipse-home}"
|
||||
- verbose="false" />
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${eclipse-home}" followsymlinks="false" />
|
||||
+ </delete>
|
||||
<echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />
|
||||
<exec
|
||||
dir="${install}"
|
||||
@@ -155,9 +128,9 @@
|
||||
message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />
|
||||
<echo message="Deleting existing ${eclipse-home}, if any." />
|
||||
<delete
|
||||
- dir="${eclipse-home}"
|
||||
- verbose="false" />
|
||||
-
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${eclipse-home}" followsymlinks="false" />
|
||||
+ </delete>
|
||||
<echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />
|
||||
<exec
|
||||
dir="${install}"
|
||||
@@ -309,8 +282,9 @@
|
||||
message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />
|
||||
<!-- remove eclipse home directory, to be sure completely fresh -->
|
||||
<delete
|
||||
- verbose="false"
|
||||
- dir="${platformLocation}/eclipse" />
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />
|
||||
+ </delete>
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
executable="unzip">
|
||||
@@ -333,11 +307,10 @@
|
||||
<fail
|
||||
unless="platformArchiveExists"
|
||||
message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />
|
||||
-
|
||||
-
|
||||
<delete
|
||||
- verbose="false"
|
||||
- dir="${platformLocation}/eclipse" />
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />
|
||||
+ </delete>
|
||||
unless="platformArchive"
|
||||
@@ -329,7 +258,7 @@
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
executable="tar">
|
||||
@@ -561,7 +534,7 @@
|
||||
unless="currentUpdateSite">
|
||||
<property
|
||||
name="currentUpdateSite"
|
||||
- value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" />
|
||||
+ value="file:${repoLocation}" />
|
||||
</target>
|
||||
<target
|
||||
name="initStreamSpecificProperties"
|
||||
@@ -808,7 +781,7 @@
|
||||
|
||||
<target
|
||||
name="init"
|
||||
- depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive"
|
||||
+ depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initBasicDirectories, initCurrentUpdateSite, initOSes, initPlatformArhiveName, setRuntimeArchive"
|
||||
unless="testingIsInitialized">
|
||||
|
||||
<property environment="env" />
|
||||
@@ -823,7 +796,7 @@
|
||||
|
||||
<property
|
||||
name="current.build.repo"
|
||||
- value="http://${DOWNLOAD_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}" />
|
||||
+ value="file:${repoLocation}" />
|
||||
<echo message="current.build.repo: ${current.build.repo}" />
|
||||
|
||||
|
||||
@@ -1887,6 +1860,7 @@
|
||||
-->
|
||||
<antcall target="quickTests" />
|
||||
<antcall target="longRunningTests" />
|
||||
+ <antcall target="mergeAllTestResults" />
|
||||
|
||||
- <arg line="-xzf ${platformArchive}" />
|
||||
+ <arg line="-xzf ../${platformArchive}" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
@@ -1948,6 +1922,8 @@
|
||||
<antcall target="jdttext" />
|
||||
<antcall target="jdtuirefactoring" />
|
||||
@@ -886,6 +815,17 @@
|
||||
arg2="" />
|
||||
</not>
|
||||
</condition>
|
||||
+
|
||||
+ <!-- swt needs this property to run tests -->
|
||||
+ <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
|
||||
+ <include name="${testPlugin}_*" />
|
||||
+ </dirset>
|
||||
+ <property name="testPluginFolder" refid="test.plugin.folder" />
|
||||
+ <echo>trying to find ${testPluginFolder}</echo>
|
||||
+ <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
|
||||
+ <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
|
||||
+ </condition>
|
||||
+
|
||||
<antcall target="runSuite" />
|
||||
<antcall target="genResults" />
|
||||
</target>
|
||||
+ <target name="distroCustomTests" depends="init">
|
||||
+ </target>
|
||||
<target
|
||||
name="quickTests"
|
||||
depends="init">
|
||||
@@ -2057,6 +2033,20 @@
|
||||
@@ -1431,6 +1371,15 @@
|
||||
value="end longRunningTests" />
|
||||
</antcall>
|
||||
|
||||
</target>
|
||||
|
||||
+ <target
|
||||
+ name="mergeAllTestResults"
|
||||
+ depends="init">
|
||||
+ <!-- Split XML into individual test suites for generating an aggregate report -->
|
||||
+ <mkdir dir="${results}/split-xml" />
|
||||
+ <xslt style="${executionDir}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/split-xml"/>
|
||||
+ <!-- Copy over the XML to generate a top-level report for all of the tests -->
|
||||
+ <mkdir dir="${results}/origXml" />
|
||||
+ <xslt style="${repoLocation}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/origXml"/>
|
||||
+ <!-- Aggregate XML report files -->
|
||||
+ <junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">
|
||||
+ <fileset dir="${results}/split-xml" includes="*.xml" />
|
||||
+ <fileset dir="${results}/origXml" includes="*.xml" />
|
||||
+ </junitreport>
|
||||
+ <!-- Generate top-level HTML report -->
|
||||
+ <xslt style="${executionDir}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
|
||||
+ </target>
|
||||
+
|
||||
<!--
|
||||
admittedly, not quite all of 'platform', but for
|
||||
now serves dual purpose of a "short set" of tests, that area
|
||||
@@ -2065,8 +2055,6 @@
|
||||
<target
|
||||
name="platform"
|
||||
depends="init">
|
||||
- <!-- was removed, temporarily, see bug 400385 -->
|
||||
- <antcall target="relEng" />
|
||||
+ <xslt style="${repoLocation}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
|
||||
</target>
|
||||
|
||||
<antcall target="ant" />
|
||||
<antcall target="antui" />
|
||||
@@ -2099,7 +2087,6 @@
|
||||
<!--
|
||||
@@ -1472,7 +1421,6 @@
|
||||
<antcall target="e4CssSwt" />
|
||||
<antcall target="e4UI" />
|
||||
<antcall target="equinoxds" />
|
||||
|
|
@ -185,7 +146,7 @@
|
|||
<antcall target="bidi" />
|
||||
<antcall target="ltkuirefactoringtests" />
|
||||
<antcall target="ltkcorerefactoringtests" />
|
||||
@@ -2115,7 +2102,6 @@
|
||||
@@ -1486,7 +1434,6 @@
|
||||
<antcall target="osgi" />
|
||||
<antcall target="coreresources" />
|
||||
<antcall target="equinoxp2" />
|
||||
|
|
@ -193,30 +154,40 @@
|
|||
<antcall target="jface" />
|
||||
<antcall target="ui" />
|
||||
<antcall target="uiperformance" />
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig 2017-03-03 12:36:38.576140783 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2017-03-03 12:40:39.324608342 +0000
|
||||
@@ -6,6 +6,45 @@
|
||||
# version.
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=437069
|
||||
@@ -1569,7 +1516,7 @@
|
||||
<property
|
||||
name="message"
|
||||
value="no message given by caller" />
|
||||
- <markTime msg="${message}" />
|
||||
+ <!--markTime msg="${message}" /-->
|
||||
</target>
|
||||
|
||||
<!--
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig 2014-05-26 17:04:22.000000000 +0300
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2014-05-26 19:17:46.622004452 +0300
|
||||
@@ -1,5 +1,72 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
+function findXvncAndSetDisplay() {
|
||||
+ # Try to find Xvnc
|
||||
+ xvnc=
|
||||
+ if [ -a /usr/bin/Xvnc ]
|
||||
+ then
|
||||
+ xvnc=/usr/bin/Xvnc
|
||||
+ setupXvnc
|
||||
+ else
|
||||
+ if [ -a /usr/X11/bin/Xvnc ]
|
||||
+# if [ ${headless} == 1 ]; then
|
||||
+ # Try to find Xvnc
|
||||
+ xvnc=
|
||||
+ if [ -a /usr/bin/Xvnc ]
|
||||
+ then
|
||||
+ xvnc=/usr/X11/bin/Xvnc
|
||||
+ xvnc=/usr/bin/Xvnc
|
||||
+ setupXvnc
|
||||
+ else
|
||||
+ echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0"
|
||||
+ DISPLAY=$($HOST):0.0
|
||||
+ if [ -a /usr/X11/bin/Xvnc ]
|
||||
+ then
|
||||
+ xvnc=/usr/X11/bin/Xvnc
|
||||
+ setupXvnc
|
||||
+ else
|
||||
+ echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0"
|
||||
+ DISPLAY=`$HOST`:0.0
|
||||
+ fi
|
||||
+ fi
|
||||
+ fi
|
||||
+ export DISPLAY
|
||||
+ export DISPLAY
|
||||
+# fi
|
||||
+}
|
||||
+
|
||||
+function setupXvnc() {
|
||||
|
|
@ -226,7 +197,33 @@
|
|||
+ echo "Setting up Xvnc on port ${port} with password VNCpassword1"
|
||||
+ $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
|
||||
+ Xvncpid=$!
|
||||
+ DISPLAY=$($HOST):$port
|
||||
+ DISPLAY=`$HOST`:$port
|
||||
+}
|
||||
+
|
||||
+function setArch() {
|
||||
+ if [ "x$buildArch" = "x" ]
|
||||
+ then
|
||||
+ if uname -m > /dev/null 2>&1; then
|
||||
+ arch=`uname -m`
|
||||
+ else
|
||||
+ arch=`uname -p`
|
||||
+ fi
|
||||
+ # Massage arch for Eclipse-uname differences
|
||||
+ case $arch in
|
||||
+ i[0-9]*86)
|
||||
+ arch=x86 ;;
|
||||
+ ia64)
|
||||
+ arch=ia64 ;;
|
||||
+ ppc)
|
||||
+ arch=ppc ;;
|
||||
+ x86_64)
|
||||
+ arch=x86_64 ;;
|
||||
+ *)
|
||||
+ echo "Unrecognized architecture: $arch" 1>&2
|
||||
+ exit 1 ;;
|
||||
+ esac
|
||||
+ echo >&2 "Architecture not specified. Assuming host architecture: $arch"
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
+function cleanupXvnc() {
|
||||
|
|
@ -238,83 +235,133 @@
|
|||
+ fi
|
||||
+}
|
||||
+
|
||||
echo "command line as passed into $(basename ${0}): ${*}"
|
||||
echo "command line (quoted) as passed into $(basename ${0}): ${@}"
|
||||
# This file should never exist or be needed for production machine,
|
||||
# but allows an easy way for a "local user" to provide this file
|
||||
# somewhere on the search path ($HOME/bin is common),
|
||||
@@ -92,59 +159,31 @@ fi
|
||||
#necessary when invoking this script through rsh
|
||||
cd $dir
|
||||
|
||||
@@ -166,6 +205,8 @@
|
||||
if [[ "true" == "${START_WINDOW_MGT}" ]]
|
||||
then
|
||||
./startWindowManager.sh
|
||||
+else
|
||||
+ findXvncAndSetDisplay
|
||||
fi
|
||||
|
||||
# During production tests, we define 'testedPlatform' as a combination of
|
||||
@@ -199,6 +240,7 @@
|
||||
echo "platformString: ${platformString}"
|
||||
echo "testedPlatform: ${testedPlatform}"
|
||||
|
||||
+ANT_OPTS="${ANT_OPTS} -DtestedPlatform=${testedPlatform}"
|
||||
# -Dtimeout=300000 "${ANT_OPTS}"
|
||||
if [[ -n "${extdirproperty}" ]]
|
||||
then
|
||||
@@ -209,4 +251,4 @@
|
||||
$jvm ${ANT_OPTS} ${platformArgString} -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} ${platformParmString} -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests 2>&1 | tee $consolelogs
|
||||
fi
|
||||
|
||||
-
|
||||
+cleanupXvnc
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml.orig 2017-04-19 19:39:39.382960089 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml 2017-04-19 20:04:36.088575077 +0100
|
||||
@@ -137,6 +137,15 @@
|
||||
<property
|
||||
name="formatter"
|
||||
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
|
||||
+ <!-- default product/application to launch -->
|
||||
+ <condition property="testproduct.if.available" value="-product ${testProduct}">
|
||||
+ <isset property="testProduct" />
|
||||
+ </condition>
|
||||
+ <property name="testproduct.if.available" value="" />
|
||||
+ <condition property="testapplication.if.available" value="-testApplication ${testApplication}">
|
||||
+ <isset property="testApplication" />
|
||||
+ </condition>
|
||||
+ <property name="testapplication.if.available" value="" />
|
||||
|
||||
<tstamp prefix="NOW" />
|
||||
<property
|
||||
@@ -196,6 +205,17 @@
|
||||
</target>
|
||||
|
||||
<target
|
||||
+ name="swtbot-test"
|
||||
+ description="Eclipse application used to launch SWTBOT plugin tests."
|
||||
+ depends="init">
|
||||
+ <antcall target="${launchTarget}">
|
||||
+ <param
|
||||
+ name="application"
|
||||
+ value="org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication" />
|
||||
+ </antcall>
|
||||
+ </target>
|
||||
+ mkdir -p /tmp/eclipse-tests-directory
|
||||
+ pushd /tmp/eclipse-tests-directory
|
||||
+ rm -rf *
|
||||
+ cp ${testslocation}/*.properties .
|
||||
+ cp ${testslocation}/library.xml .
|
||||
+
|
||||
+ <target
|
||||
name="java-test"
|
||||
depends="init">
|
||||
<echo
|
||||
@@ -258,7 +278,7 @@
|
||||
<include name="org.eclipse.equinox.launcher_*.jar" />
|
||||
</fileset>
|
||||
</classpath>
|
||||
- <arg line="-application ${application}" />
|
||||
+ <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
|
||||
<arg line="-data ${data-dir}" />
|
||||
<arg line="formatter=${formatter},${test-output}" />
|
||||
<arg line="-testPluginName ${plugin-name}" />
|
||||
@@ -329,7 +349,7 @@
|
||||
output="${junit-report-output}/${classname}.txt">
|
||||
<arg line="-data ${data-dir}" />
|
||||
<arg line="${test-vm}" />
|
||||
- <arg line="-application ${application}" />
|
||||
+ <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
|
||||
<arg line="formatter=${formatter},${test-output}" />
|
||||
<arg line="-testPluginName ${plugin-name}" />
|
||||
<arg line="-className ${classname}" />
|
||||
if [ ! -r eclipse ]
|
||||
then
|
||||
- tar -xzf eclipse-SDK-*.tar.gz
|
||||
- # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos.
|
||||
- unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/
|
||||
+ pushd @libdir@
|
||||
+ tar czf /tmp/eclipse-tests-directory/eclipse-SDK-temp-linux-gtk-x86_64.tar.gz eclipse
|
||||
+ popd
|
||||
+ cp -rf @libdir@/eclipse eclipse
|
||||
fi
|
||||
|
||||
# run tests
|
||||
launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
|
||||
+findXvncAndSetDisplay
|
||||
+setArch
|
||||
+export ANT_HOME=@USR@/share/ant
|
||||
+@USR@/bin/./ant \
|
||||
+-file "${testslocation}/test.xml" $tests \
|
||||
+-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
|
||||
+-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
|
||||
+-DruntimeArchive="eclipse-SDK-temp-linux-gtk-x86_64.tar.gz" \
|
||||
+-DrepoLocation="${testslocation}" \
|
||||
+-Dorg.eclipse.test="3.3.100" \
|
||||
+-D$installmode=true $properties
|
||||
|
||||
-echo " = = = Start list environment variables in effect = = = ="
|
||||
-env
|
||||
-echo " = = = End list environment variables in effect = = = ="
|
||||
-
|
||||
-# make sure there is a window manager running. See bug 379026
|
||||
-# we should not have to, but may be a quirk/bug of hudson setup
|
||||
-# assuming metacity attaches to "current" display by default (which should have
|
||||
-# already been set by Hudson). We echo its value here just for extra reference/cross-checks.
|
||||
-
|
||||
-echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm):"
|
||||
-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
|
||||
-echo "Window Manager processes: $wmpss"
|
||||
-echo
|
||||
-
|
||||
-if [[ -z $wmpss ]]
|
||||
-then
|
||||
- echo "No window managers processes found running, so will start metacity"
|
||||
- metacity --replace --sm-disable &
|
||||
- METACITYPID=$!
|
||||
- echo $METACITYPID > epmetacity.pid
|
||||
-else
|
||||
- echo "Existing window manager found running, so did not force start of metacity"
|
||||
-fi
|
||||
-
|
||||
-echo
|
||||
-
|
||||
-# list out metacity processes so overtime we can see if they accumulate, or if killed automatically
|
||||
-# when our process exits. If not automatic, should use epmetacity.pid to kill it when we are done.
|
||||
-echo "Current metacity processes running (check for accumulation):"
|
||||
-ps -ef | grep "metacity" | grep -v grep
|
||||
-echo
|
||||
-
|
||||
-echo "Triple check if any window managers are running (at least metacity should be!):"
|
||||
-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
|
||||
-echo "Window Manager processes: $wmpss"
|
||||
-echo
|
||||
-echo "extdirprop in runtest: ${extdirprop}"
|
||||
-echo "extdirproperty in runtest: ${extdirproperty}"
|
||||
-
|
||||
-# -Dtimeout=300000 "${ANT_OPTS}"
|
||||
-if [[ ! -z "${extdirproperty}" ]]
|
||||
-then
|
||||
- $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
-else
|
||||
- $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
-fi
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2016-02-17 00:50:39.910394827 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2016-02-17 00:54:04.625884958 +0000
|
||||
@@ -169,7 +169,9 @@
|
||||
<target
|
||||
name="setup-zip"
|
||||
description="Reinstall the test Eclipse installation if specified by user">
|
||||
- <delete dir="${install}" />
|
||||
+ <delete removeNotFollowedSymlinks="true" failonerror="false">
|
||||
+ <fileset dir="${install}" followsymlinks="false"/>
|
||||
+ </delete>
|
||||
<mkdir dir="${install}" />
|
||||
<exec
|
||||
dir="."
|
||||
@@ -187,7 +189,9 @@
|
||||
<property
|
||||
name="currentDir"
|
||||
value="${basedir}" />
|
||||
- <delete dir="${install}" />
|
||||
+ <delete removeNotFollowedSymlinks="true" failonerror="false">
|
||||
+ <fileset dir="${install}" followsymlinks="false"/>
|
||||
+ </delete>
|
||||
<mkdir dir="${install}" />
|
||||
<exec
|
||||
dir="${install}"
|
||||
@@ -233,7 +237,9 @@
|
||||
<target
|
||||
name="platform-zip"
|
||||
description="Reinstall the test Eclipse installation if specified by user">
|
||||
- <delete dir="${platformLocation}" />
|
||||
+ <delete removeNotFollowedSymlinks="true" failonerror="false">
|
||||
+ <fileset dir="${platformLocation}" followsymlinks="false"/>
|
||||
+ </delete>
|
||||
<mkdir dir="${platformLocation}" />
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
@@ -246,7 +252,9 @@
|
||||
<target
|
||||
name="platform-tar.gz"
|
||||
description="Reinstall the test Eclipse installation if specified by user">
|
||||
- <delete dir="${platformLocation}" />
|
||||
+ <delete removeNotFollowedSymlinks="true" failonerror="false">
|
||||
+ <fileset dir="${platformLocation}" followsymlinks="false"/>
|
||||
+ </delete>
|
||||
<mkdir dir="${platformLocation}" />
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
1911
eclipse.spec
1911
eclipse.spec
File diff suppressed because it is too large
Load Diff
|
|
@ -1,161 +0,0 @@
|
|||
--- eclipse.platform/ant/org.eclipse.ant.launching/build.properties.orig 2017-01-09 10:24:16.258243377 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.launching/build.properties 2017-01-09 10:25:08.302620557 +0000
|
||||
@@ -20,18 +20,14 @@
|
||||
about.html
|
||||
|
||||
jars.compile.order = .,\
|
||||
- lib/loggers.jar
|
||||
-# antdebug.jar and remote.jar are compiled locally using 1.6, see bug 495617:
|
||||
-# lib/antdebug.jar,\
|
||||
-# lib/remote.jar
|
||||
+ lib/antdebug.jar,\
|
||||
+ lib/loggers.jar,\
|
||||
+ lib/remote.jar
|
||||
source.lib/loggers.jar = loggers/
|
||||
output.lib/loggers.jar = loggers_bin/
|
||||
-extra.lib/loggers.jar = lib/antdebug.jar
|
||||
-#source.lib/antdebug.jar = common/
|
||||
-#output.lib/antdebug.jar = common_bin/
|
||||
-#source.lib/remote.jar = remote/
|
||||
-#output.lib/remote.jar = remote_bin/
|
||||
-src.includes = about.html,\
|
||||
- remote/,\
|
||||
- common/
|
||||
+source.lib/antdebug.jar = common/
|
||||
+output.lib/antdebug.jar = common_bin/
|
||||
+source.lib/remote.jar = remote/
|
||||
+output.lib/remote.jar = remote_bin/
|
||||
+src.includes = about.html
|
||||
javacWarnings..=-unavoidableGenericProblems
|
||||
--- eclipse.platform/ant/org.eclipse.ant.ui/build.properties.orig 2017-04-03 18:40:41.033489412 +0100
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.ui/build.properties 2017-04-03 18:43:21.614928391 +0100
|
||||
@@ -14,8 +14,8 @@
|
||||
source.lib/antrunner.jar = Ant Runner Support/
|
||||
output.lib/antrunner.jar = ant_runner_support_bin/
|
||||
# Compiled with 1.6 locally, see bug 495617:
|
||||
-#source.lib/remoteAnt.jar = Remote Ant Support/
|
||||
-#output.lib/remoteAnt.jar = remote_support_bin/
|
||||
+source.lib/remoteAnt.jar = Remote Ant Support/
|
||||
+output.lib/remoteAnt.jar = remote_support_bin/
|
||||
src.includes = about.html,\
|
||||
about_files/,\
|
||||
Remote Ant Support/
|
||||
@@ -31,6 +31,5 @@
|
||||
lib/antrunner.jar,\
|
||||
lib/remoteAnt.jar,\
|
||||
css/
|
||||
-jars.compile.order=.,lib/antrunner.jar
|
||||
-# ,lib/remoteAnt.jar
|
||||
+jars.compile.order=.,lib/antrunner.jar,lib/remoteAnt.jar
|
||||
javacWarnings..=-unavoidableGenericProblems
|
||||
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml.orig 2017-01-09 13:30:24.238066571 +0000
|
||||
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml 2017-01-09 13:31:19.228456113 +0000
|
||||
@@ -1,106 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<project name="org.eclipse.jdt.doc.user" default="build.jars" basedir=".">
|
||||
+<project name="org.eclipse.jdt.doc.user" default="build.index" basedir=".">
|
||||
|
||||
- <property name="version.suffix" value="3.3.0" />
|
||||
- <property name="full.name" value="org.eclipse.jdt.doc.user_${version.suffix}" />
|
||||
- <property name="bootclasspath" value="" />
|
||||
- <property name="basews" value="${ws}" />
|
||||
- <property name="baseos" value="${os}" />
|
||||
- <property name="basearch" value="${arch}" />
|
||||
- <property name="basenl" value="${nl}" />
|
||||
- <property name="javacFailOnError" value="false" />
|
||||
- <property name="javacDebugInfo" value="on" />
|
||||
- <property name="javacVerbose" value="true" />
|
||||
- <property name="javacSource" value="1.3" />
|
||||
- <property name="javacTarget" value="1.1" />
|
||||
-
|
||||
- <target name="init" depends="properties">
|
||||
- <property name="temp.folder" value="${basedir}/temp.folder" />
|
||||
- <property name="plugin.destination" value="${basedir}" />
|
||||
- <property name="build.result.folder" value="${basedir}" />
|
||||
- <available file="${basedir}/doc.zip" property="doc.zip.present" />
|
||||
- <condition property="p2.publish.parts" value="true">
|
||||
- <istrue value="${p2.gathering}" />
|
||||
- </condition>
|
||||
- </target>
|
||||
-
|
||||
- <target name="properties" if="eclipse.running">
|
||||
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jdt.doc.user for an update site.">
|
||||
- <delete dir="${temp.folder}" />
|
||||
- <mkdir dir="${temp.folder}" />
|
||||
- <antcall target="build.jars" />
|
||||
- <antcall target="gather.bin.parts">
|
||||
- <param name="destination.temp.folder" value="${temp.folder}/" />
|
||||
- </antcall>
|
||||
- <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" whenempty="skip" />
|
||||
- <delete dir="${temp.folder}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
|
||||
- <antcall target="gather.bin.parts">
|
||||
- <param name="destination.temp.folder" value="${build.result.folder}" />
|
||||
- </antcall>
|
||||
- <eclipse.gatherBundle metadataRepository="${p2.build.repo}" artifactRepository="${p2.build.repo}" buildResultFolder="${build.result.folder}" targetFolder="${build.result.folder}/${full.name}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
|
||||
- <antcall target="build.index" />
|
||||
- <mkdir dir="${destination.temp.folder}/${full.name}" />
|
||||
- <copy todir="${destination.temp.folder}/${full.name}">
|
||||
- <fileset dir="${basedir}" includes="*.properties,*.xml,*.zip,*.html,*.htm,*.png,*.css,META-INF/**,index/**,concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**" excludes="build.properties,build.xml" />
|
||||
- </copy>
|
||||
- <eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jdt.doc.user.">
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
|
||||
+ <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
|
||||
<help.buildHelpIndex manifest="plugin.xml" destination="." />
|
||||
</target>
|
||||
|
||||
- <target name="build.sources" depends="init">
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.zips" depends="init">
|
||||
- </target>
|
||||
-
|
||||
- <target name="gather.sources" depends="init" if="destination.temp.folder">
|
||||
- </target>
|
||||
-
|
||||
- <target name="gather.logs" depends="init" if="destination.temp.folder">
|
||||
- </target>
|
||||
-
|
||||
- <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jdt.doc.user of all the zips, jars and logs created.">
|
||||
- <delete file="${plugin.destination}/${full.name}.jar" />
|
||||
- <delete file="${plugin.destination}/${full.name}.zip" />
|
||||
- <delete dir="${temp.folder}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
|
||||
- <eclipse.convertPath fileSystemPath="D:/30workspace/org.eclipse.jdt.doc.user/" property="resourcePath" />
|
||||
- <eclipse.refreshLocal resource="${resourcePath}" depth="infinite" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
|
||||
- <delete dir="${temp.folder}" />
|
||||
- <mkdir dir="${temp.folder}" />
|
||||
- <antcall target="build.jars" />
|
||||
- <antcall target="build.sources" />
|
||||
- <antcall target="gather.bin.parts">
|
||||
- <param name="destination.temp.folder" value="${temp.folder}/" />
|
||||
- </antcall>
|
||||
- <antcall target="gather.sources">
|
||||
- <param name="destination.temp.folder" value="${temp.folder}/" />
|
||||
- </antcall>
|
||||
- <delete>
|
||||
- <fileset dir="${temp.folder}" includes="**/*.bin.log" />
|
||||
- </delete>
|
||||
- <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" />
|
||||
- <delete dir="${temp.folder}" />
|
||||
- </target>
|
||||
-
|
||||
</project>
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
||||
TAG=S4_5_2_RC4
|
||||
|
||||
rm -rf R4_platform-aggregator-$TAG
|
||||
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
||||
|
||||
# adding --depth 1 here may result in a quicker clone, but did not work for me
|
||||
git clone --branch $TAG $AGGREGATOR_PATH R4_platform-aggregator-$TAG
|
||||
|
||||
pushd R4_platform-aggregator-$TAG
|
||||
|
||||
git submodule init
|
||||
git submodule update
|
||||
|
||||
rm -rf bootstrap devutils streams scripts
|
||||
|
||||
# Comment this line to get a shallow clone.
|
||||
find . -type d -name ".git" | xargs rm -rf
|
||||
|
||||
# Delete pre-built binary artifacts except some test data that cannot be generated
|
||||
find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" \
|
||||
-type f -name *.jar -delete
|
||||
find . -type f -name *.class -delete
|
||||
find . -type f -name *.so -delete
|
||||
find . -type f -name *.dll -delete
|
||||
find . -type f -name *.jnilib -delete
|
||||
# Remove pre-compiled native launchers
|
||||
rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
|
||||
|
||||
popd
|
||||
|
||||
tar cJf R4_platform-aggregator-$TAG.tar.xz R4_platform-aggregator-$TAG
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig 2018-08-22 15:19:04.602623018 +0100
|
||||
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c 2018-08-22 15:20:03.453348722 +0100
|
||||
@@ -111,6 +111,11 @@
|
||||
#define DLFLAGS RTLD_LAZY
|
||||
#endif
|
||||
|
||||
+ char *gdkBackend = getenv("GDK_BACKEND");
|
||||
+ if (gdkBackend == NULL) {
|
||||
+ setenv("GDK_BACKEND", "x11", 0);
|
||||
+ }
|
||||
+
|
||||
void *gioLib = NULL, *glibLib = NULL, *gdkLib = NULL, *gtkLib = NULL, *objLib = NULL, *pixLib = NULL;
|
||||
|
||||
char *gtk3 = getenv("SWT_GTK3");
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (eclipse-platform-sources-I20180822-0800.tar.xz) = c1158fa81c21a1fe9d09fd814062e55623b4ceca34be9b44c50f917f14bab8643e29ec6d20879c01b107fb93e68de4af553edea0fb606add870230d0498a03ef
|
||||
SHA512 (org.eclipse.linuxtools.eclipse-build-23577466b35eaf62bee3b00090f4fbedc555b4e6.tar.xz) = d268ea945c33b997c79b390f9592c1139f52dc39ebdb7ea7155d41301459827f576389e20080462ad22f2aef833857626df983bbb2abe30845e79ca74a194bea
|
||||
74b34525c70e6f244554af6b28731c78 R4_platform-aggregator-S4_5_2_RC4.tar.xz
|
||||
2e5f505c39e60be51e0c10e0c4208494 org.eclipse.linuxtools.eclipse-build-73dbcff39b0e10cc61d6d5d3a8527d976af8bba8.tar.xz
|
||||
|
|
|
|||
Loading…
Reference in New Issue