Compare commits
No commits in common. "master" and "f25" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
@ -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,417 +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
|
||||
|
||||
231
disable-non-linux.patch
Normal file
231
disable-non-linux.patch
Normal file
@ -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"
|
||||
@@ -351,35 +343,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"
|
||||
@@ -439,26 +402,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"
|
||||
@@ -534,35 +477,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"
|
||||
@ -2,7 +2,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/e
|
||||
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 {
|
||||
@@ -144,7 +144,20 @@ public class EngineActivator implements BundleActivator {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@ -28,7 +28,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/
|
||||
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;
|
||||
}
|
||||
@ -50,3 +50,21 @@ index 12e4d89..77945ef 100644
|
||||
// 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.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
|
||||
index 3d7e313..debbfb8 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
|
||||
@@ -238,10 +238,11 @@ public class SurrogateProfileHandler implements ISurrogateProfileHandler {
|
||||
|| "feature".equals(cap.getName())) { //$NON-NLS-1$
|
||||
featureOrBundle = true;
|
||||
}
|
||||
- } else if (Boolean.TRUE.equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
|
||||
- featureOrBundle = true;
|
||||
}
|
||||
}
|
||||
+ if (Boolean.TRUE.toString().equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
|
||||
+ featureOrBundle = true;
|
||||
+ }
|
||||
if (featureOrBundle && !added.contains(unit)) {
|
||||
added.add(unit);
|
||||
sharedProfile.addInstallableUnit(unit);
|
||||
|
||||
360
eclipse-bug-386377.patch
Normal file
360
eclipse-bug-386377.patch
Normal file
@ -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>
|
||||
@ -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 \
|
||||
|
||||
@ -17,14 +17,14 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/o
|
||||
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 {
|
||||
@@ -182,11 +182,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<>();
|
||||
Set<IMetadataRepository> newRepos = new LinkedHashSet<IMetadataRepository>();
|
||||
Set<Site> toBeRemoved = new HashSet<Site>();
|
||||
for (Site site : sites) {
|
||||
String siteURL = site.getUrl();
|
||||
+ if (fragments != null) {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,30 +1,20 @@
|
||||
--- 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 @@
|
||||
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
|
||||
@@ -19,6 +19,11 @@
|
||||
%license
|
||||
</license>
|
||||
|
||||
+ <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 @@
|
||||
@@ -151,19 +156,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
@ -40,100 +30,18 @@
|
||||
- id="org.hamcrest.core"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- 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"
|
||||
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
|
||||
diff --git eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
|
||||
index 88a8daa..382c5ee 100644
|
||||
--- eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
|
||||
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
<requires>
|
||||
<import feature="org.eclipse.jdt" version="3.15.0" match="compatible"/>
|
||||
<import feature="org.eclipse.jdt" version="3.12.0" match="compatible"/>
|
||||
+ <import plugin="org.objectweb.asm" />
|
||||
+ <import plugin="org.objectweb.asm.tree" />
|
||||
</requires>
|
||||
@ -162,7 +70,7 @@
|
||||
<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 @@
|
||||
@@ -23,62 +23,6 @@
|
||||
</license>
|
||||
|
||||
<plugin
|
||||
@ -208,7 +116,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 +129,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 @@
|
||||
@@ -135,55 +79,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -288,20 +189,17 @@
|
||||
id="org.eclipse.core.net"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -204,4 +92,22 @@
|
||||
@@ -197,4 +92,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 +207,13 @@
|
||||
+ <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 @@
|
||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2017-01-13 11:29:16.362473652 +0000
|
||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2017-01-13 11:29:16.371473551 +0000
|
||||
@@ -95,62 +95,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -399,32 +276,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 +297,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 +311,7 @@
|
||||
id="org.eclipse.equinox.preferences"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -624,27 +542,6 @@
|
||||
@@ -757,27 +680,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
@ -490,23 +339,42 @@
|
||||
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
|
||||
@@ -806,13 +708,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.apache.commons.jxpath"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.e4.emf.xpath"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -835,4 +730,18 @@
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
+ <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.commons.jxpath" />
|
||||
+ <import plugin="org.apache.felix.gogo.command" />
|
||||
+ <import plugin="org.apache.felix.gogo.runtime" />
|
||||
+ <import plugin="org.apache.felix.gogo.shell" />
|
||||
+ <import plugin="org.w3c.dom.svg" />
|
||||
+ <import plugin="org.w3c.css.sac" />
|
||||
+ <import plugin="javax.inject" />
|
||||
+ <import plugin="javax.xml" />
|
||||
+ </requires>
|
||||
</feature>
|
||||
--- 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 @@
|
||||
@@ -61,11 +61,6 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
@ -515,21 +383,10 @@
|
||||
- </requirement>
|
||||
- <requirement>
|
||||
- <type>eclipse-plugin</type>
|
||||
- <id>javax.el</id>
|
||||
+ <id>javax.el-api</id>
|
||||
<id>javax.el</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 @@
|
||||
@@ -96,7 +91,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
@ -540,9 +397,9 @@
|
||||
<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
|
||||
@@ -38,8 +38,7 @@
|
||||
org.eclipse.e4.core.commands;bundle-version="0.10.0",
|
||||
org.eclipse.e4.ui.dialogs;bundle-version="1.0.0"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
-Import-Package: javax.annotation,
|
||||
- javax.inject;version="1.0.0",
|
||||
@ -552,7 +409,7 @@
|
||||
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 @@
|
||||
@@ -14,6 +14,5 @@
|
||||
org.eclipse.e4.core.di;bundle-version="0.9.0"
|
||||
Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
|
||||
Bundle-ActivationPolicy: lazy
|
||||
@ -560,4 +417,3 @@
|
||||
- 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
|
||||
|
||||
@ -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};
|
||||
|
||||
7
eclipse-fix-startup-class-refresh.patch
Normal file
7
eclipse-fix-startup-class-refresh.patch
Normal file
@ -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
|
||||
@ -20,15 +20,15 @@ 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.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,12 +59,27 @@ 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
|
||||
@ -231,46 +246,3 @@ index bc8963d..fbe4da3 100644
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- 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,56 +1,66 @@
|
||||
commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf
|
||||
Author: Mat Booth <mat.booth@redhat.com>
|
||||
Date: Thu May 3 15:58:49 2018 +0100
|
||||
From 051d84daff808349fc3eb4d44b2f9d56f7fe89ba Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Wed, 18 Jan 2017 15:51:40 -0500
|
||||
Subject: [PATCH] Don't show p2 Droplet locations in the UI.
|
||||
|
||||
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>
|
||||
Don't show p2 Droplets in the Repository Selection Combo Box, or in the
|
||||
Available Software Sites preferences.
|
||||
|
||||
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 {
|
||||
Change-Id: I4afddffbaaeae3f33958629eebb32861087a93de
|
||||
---
|
||||
.../internal/p2/ui/dialogs/RepositorySelectionGroup.java | 14 ++++++++++++++
|
||||
.../eclipse/equinox/p2/ui/RepositoryManipulationPage.java | 15 ++++++++++++++-
|
||||
2 files changed, 28 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
index 8d08101..59567c0 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
@@ -16,6 +16,7 @@ import java.lang.reflect.InvocationTargetException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.*;
|
||||
+import java.util.List;
|
||||
import org.eclipse.core.runtime.*;
|
||||
import org.eclipse.equinox.internal.p2.ui.*;
|
||||
import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
|
||||
@@ -314,6 +315,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));
|
||||
+ String fragments = System.getProperty("p2.fragments");
|
||||
+ List<URI> tmp = new ArrayList<URI>(Arrays.asList(sites));
|
||||
+ if (fragments != null) {
|
||||
+ for (String root : fragments.split(",")) { //$NON-NLS-1$
|
||||
+ String[] rootPaths = fragments.split(",");
|
||||
+ for (String root : rootPaths) {
|
||||
+ for (URI uri : sites) {
|
||||
+ if (uri.getPath() != null && uri.getPath().startsWith(root)) {
|
||||
+ filteredSites.remove(uri);
|
||||
+ tmp.remove(uri);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ sites = filteredSites.toArray(new URI[0]);
|
||||
+ sites = tmp.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
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
index c0f2ca1..03515c7 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
+++ 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$
|
||||
cachedElements = new Hashtable<String, MetadataRepositoryElement>(children.length);
|
||||
+ String fragments = System.getProperty("p2.fragments");
|
||||
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) {
|
||||
+ String[] rootPaths = fragments.split(",");
|
||||
+ boolean isDroplet = false;
|
||||
+ for (String root : fragments.split(",")) { //$NON-NLS-1$
|
||||
+ URI childLoc = ((MetadataRepositoryElement) children[i]).getLocation();
|
||||
+ for (String root : rootPaths) {
|
||||
+ URI childLoc = ((MetadataRepositoryElement)children[i]).getLocation();
|
||||
+ if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) {
|
||||
+ isDroplet = true;
|
||||
+ }
|
||||
@ -62,3 +72,6 @@ index d796aefd0..c03924f90 100644
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
||||
36
eclipse-jetty-9.4.patch
Normal file
36
eclipse-jetty-9.4.patch
Normal file
@ -0,0 +1,36 @@
|
||||
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java.old 2016-06-15 10:29:35.370386868 +0100
|
||||
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty9/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 2016-06-15 10:59:31.120348432 +0100
|
||||
@@ -26,7 +26,6 @@
|
||||
import org.eclipse.equinox.http.servlet.HttpServiceMultipartServlet;
|
||||
import org.eclipse.equinox.http.servlet.HttpServiceServlet;
|
||||
import org.eclipse.jetty.server.*;
|
||||
-import org.eclipse.jetty.server.session.HashSessionManager;
|
||||
import org.eclipse.jetty.server.session.SessionHandler;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
@@ -144,9 +143,9 @@
|
||||
// This servlet has no mapping as it's only used from named dispatcher
|
||||
httpContext.getServletHandler().addServlet(multiPartHolder);
|
||||
|
||||
- SessionManager sessionManager = httpContext.getSessionHandler().getSessionManager();
|
||||
+ SessionHandler sessionHandler = httpContext.getSessionHandler();
|
||||
try {
|
||||
- sessionManager.addEventListener((HttpSessionIdListener) holder.getServlet());
|
||||
+ sessionHandler.addEventListener((HttpSessionIdListener) holder.getServlet());
|
||||
} catch (ServletException e) {
|
||||
throw new ConfigurationException(pid, e.getMessage(), e);
|
||||
}
|
||||
@@ -241,10 +240,10 @@
|
||||
contextWorkDir.mkdir();
|
||||
httpContext.setAttribute(CONTEXT_TEMPDIR, contextWorkDir);
|
||||
|
||||
- HashSessionManager sessionManager = new HashSessionManager();
|
||||
- sessionManager.setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
|
||||
+ SessionHandler sessionHandler = new SessionHandler();
|
||||
+ sessionHandler.setMaxInactiveInterval(Details.getInt(dictionary, JettyConstants.CONTEXT_SESSIONINACTIVEINTERVAL, -1));
|
||||
|
||||
- httpContext.setSessionHandler(new SessionHandler(sessionManager));
|
||||
+ httpContext.setSessionHandler(sessionHandler);
|
||||
|
||||
return httpContext;
|
||||
}
|
||||
1934
eclipse-lucene-5.patch
Normal file
1934
eclipse-lucene-5.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -39,9 +39,9 @@ index 342e33e..425a166 100644
|
||||
+ return super.getProperty(key);
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
public String setProperty(String key, String value, IProgressMonitor monitor) {
|
||||
try {
|
||||
ensureInitialized();
|
||||
--
|
||||
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"
|
||||
org.eclipse.e4.ui.css.core;bundle-version="0.10.100"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
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,36 +35,6 @@
|
||||
- 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 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.mockito"
|
||||
+ id="org.mockito.mockito-core"
|
||||
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
|
||||
org.eclipse.equinox.preferences;bundle-version="3.5.200"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
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"
|
||||
|
||||
@ -59,10 +59,12 @@
|
||||
</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>
|
||||
@ -70,32 +72,61 @@
|
||||
</execution>
|
||||
--- 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.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"/>
|
||||
@ -106,19 +137,19 @@
|
||||
</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 @@
|
||||
@@ -59,16 +59,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"/>
|
||||
- <import feature="org.eclipse.ecf.core.source.feature" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.ssl.source.feature" version="1.0.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.source.feature" version="3.9.0" match="compatible"/>
|
||||
- <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>
|
||||
|
||||
<plugin
|
||||
|
||||
@ -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
|
||||
@@ -807,7 +807,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);
|
||||
|
||||
@ -14,7 +14,7 @@ diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF eclipse.p
|
||||
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:
|
||||
@@ -102,5 +102,6 @@ Require-Bundle:
|
||||
org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)"
|
||||
Eclipse-LazyStart: true
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
@ -22,7 +22,6 @@ index 7c20994..ab702e3 100644
|
||||
+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
|
||||
|
||||
11
eclipse-pluginconverter-warning.patch
Normal file
11
eclipse-pluginconverter-warning.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2016-04-17 00:05:41.751589113 +0100
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2016-04-17 00:11:13.032263291 +0100
|
||||
@@ -519,8 +519,6 @@
|
||||
try {
|
||||
converter = acquirePluginConverter();
|
||||
if (converter == null) {
|
||||
- String message = NLS.bind(Messages.exception_noPluginConverter, bundleLocation);
|
||||
- LogHelper.log(new Status(IStatus.ERROR, Activator.ID, message));
|
||||
return null;
|
||||
}
|
||||
return converter.convertManifest(bundleLocation, false, null, true, null);
|
||||
@ -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>
|
||||
|
||||
@ -2,7 +2,7 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip
|
||||
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 @@
|
||||
@@ -423,6 +423,26 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
@ -25,38 +25,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"
|
||||
@@ -597,6 +627,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 +53,180 @@ 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,128 @@
|
||||
</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.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,6 @@
|
||||
<include name="gtk/solaris/sparcv9/**/*"/>
|
||||
<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/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
|
||||
|
||||
+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
|
||||
|
||||
<modules>
|
||||
|
||||
@ -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
|
||||
@ -60,7 +62,7 @@ index ab69b88..d6bf121 100644
|
||||
int startLevel = Integer.parseInt(tok.nextToken().trim());
|
||||
boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken());
|
||||
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,5 +1,5 @@
|
||||
--- 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
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2017-03-06 14:35:07.000000000 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2017-03-07 15:30:44.993586317 +0000
|
||||
@@ -39,21 +39,6 @@
|
||||
arg1="${testPlugin}"
|
||||
arg2="org.eclipse.equinox.p2.tests.discovery" />
|
||||
@ -103,24 +103,6 @@
|
||||
<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
|
||||
@ -130,30 +112,10 @@
|
||||
<echo message="current.build.repo: ${current.build.repo}" />
|
||||
|
||||
|
||||
@@ -1887,6 +1860,7 @@
|
||||
-->
|
||||
@@ -2017,6 +1990,15 @@
|
||||
<antcall target="quickTests" />
|
||||
<antcall target="longRunningTests" />
|
||||
+ <antcall target="mergeAllTestResults" />
|
||||
|
||||
</target>
|
||||
|
||||
@@ -1948,6 +1922,8 @@
|
||||
<antcall target="jdttext" />
|
||||
<antcall target="jdtuirefactoring" />
|
||||
</target>
|
||||
+ <target name="distroCustomTests" depends="init">
|
||||
+ </target>
|
||||
<target
|
||||
name="quickTests"
|
||||
depends="init">
|
||||
@@ -2057,6 +2033,20 @@
|
||||
|
||||
</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"/>
|
||||
@ -163,12 +125,10 @@
|
||||
+ </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>
|
||||
|
||||
<!-- This and all the performance specific targets
|
||||
@@ -2194,8 +2176,6 @@
|
||||
<target
|
||||
name="platform"
|
||||
depends="init">
|
||||
@ -177,7 +137,7 @@
|
||||
|
||||
<antcall target="ant" />
|
||||
<antcall target="antui" />
|
||||
@@ -2099,7 +2087,6 @@
|
||||
@@ -2227,7 +2207,6 @@
|
||||
<antcall target="e4CssSwt" />
|
||||
<antcall target="e4UI" />
|
||||
<antcall target="equinoxds" />
|
||||
@ -185,7 +145,7 @@
|
||||
<antcall target="bidi" />
|
||||
<antcall target="ltkuirefactoringtests" />
|
||||
<antcall target="ltkcorerefactoringtests" />
|
||||
@@ -2115,7 +2102,6 @@
|
||||
@@ -2243,7 +2222,6 @@
|
||||
<antcall target="osgi" />
|
||||
<antcall target="coreresources" />
|
||||
<antcall target="equinoxp2" />
|
||||
@ -241,7 +201,7 @@
|
||||
echo "command line as passed into $(basename ${0}): ${*}"
|
||||
echo "command line (quoted) as passed into $(basename ${0}): ${@}"
|
||||
|
||||
@@ -166,6 +205,8 @@
|
||||
@@ -159,6 +198,8 @@
|
||||
if [[ "true" == "${START_WINDOW_MGT}" ]]
|
||||
then
|
||||
./startWindowManager.sh
|
||||
@ -250,7 +210,7 @@
|
||||
fi
|
||||
|
||||
# During production tests, we define 'testedPlatform' as a combination of
|
||||
@@ -199,6 +240,7 @@
|
||||
@@ -192,6 +233,7 @@
|
||||
echo "platformString: ${platformString}"
|
||||
echo "testedPlatform: ${testedPlatform}"
|
||||
|
||||
@ -258,63 +218,9 @@
|
||||
# -Dtimeout=300000 "${ANT_OPTS}"
|
||||
if [[ -n "${extdirproperty}" ]]
|
||||
then
|
||||
@@ -209,4 +251,4 @@
|
||||
@@ -202,4 +244,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>
|
||||
+
|
||||
+ <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}" />
|
||||
|
||||
12
eclipse-webkit2-by-default.patch
Normal file
12
eclipse-webkit2-by-default.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- "./eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java.orig" 2016-04-29 12:15:18.524027606 +0100
|
||||
+++ "./eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java" 2016-04-29 12:20:19.696980780 +0100
|
||||
@@ -16,9 +16,6 @@
|
||||
|
||||
WebBrowser createWebBrowser (int style) {
|
||||
boolean webkitInstalled = WebKit.IsInstalled ();
|
||||
- if ((style & SWT.MOZILLA) != 0 || (!webkitInstalled && (style & SWT.WEBKIT) == 0)) {
|
||||
- return new Mozilla ();
|
||||
- }
|
||||
if (!webkitInstalled) return null;
|
||||
|
||||
return new WebKit ();
|
||||
1471
eclipse.spec
1471
eclipse.spec
File diff suppressed because it is too large
Load Diff
33
get-eclipse.sh
Executable file
33
get-eclipse.sh
Executable file
@ -0,0 +1,33 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
||||
TAG=S4_6_3_RC4
|
||||
|
||||
rm -rf R4_platform-aggregator-$TAG
|
||||
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
||||
|
||||
git clone --depth 1 --branch $TAG $AGGREGATOR_PATH R4_platform-aggregator-$TAG
|
||||
|
||||
pushd R4_platform-aggregator-$TAG
|
||||
|
||||
git submodule init
|
||||
git submodule update
|
||||
|
||||
rm -rf production
|
||||
|
||||
# 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 +1,14 @@
|
||||
--- 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
|
||||
|
||||
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig 2016-10-13 16:53:39.092748697 +0100
|
||||
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c 2016-10-13 17:01:12.350231281 +0100
|
||||
@@ -122,6 +122,11 @@
|
||||
setenv("OXYGEN_DISABLE_INNER_SHADOWS_HACK", "1", 0);
|
||||
}
|
||||
|
||||
+ 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");
|
||||
/* Disable GTK scaling*/
|
||||
setenv("GDK_SCALE", "1", 1);
|
||||
|
||||
|
||||
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
|
||||
SHA512 (R4_platform-aggregator-S4_6_3_RC4.tar.xz) = cdcca67a43b135736eac52ea260d61b50ac27f84372a4b8315db3b475ab152d55f101b3907d811367833ffb1630ffd8e9b1ae18639f5e7aa93de3c63dd33377f
|
||||
SHA512 (org.eclipse.linuxtools.eclipse-build-a8c4189f4b7af192e2295b27aef74300ac3bfce9.tar.xz) = be572ffae464f329ea2d2a9d14426853739be01027cec4946e47a29567cb398cd1bccaf7385e4560cfa8d6a7d4fede6d4e025b4b4b1203fb91e8343b75da5fdb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user