Compare commits
552 Commits
Author | SHA1 | Date |
---|---|---|
|
6c5fe13094 | |
|
645f7eef9b | |
|
f04da6c579 | |
|
28ef9d8526 | |
|
d483abb3d0 | |
|
4085f55748 | |
|
b5942231d3 | |
|
9b062d799a | |
|
c7f2d1eaf9 | |
|
c1b9fae7c8 | |
|
be2a7ad2e8 | |
|
05065b62ed | |
|
eeebfc1ba5 | |
|
3fb4ba4035 | |
|
5e05a2acff | |
|
e89f786234 | |
|
7996b3e543 | |
|
daa02f7158 | |
|
2c77185405 | |
|
be32b7c751 | |
|
c48d605385 | |
|
dea287ee2a | |
|
0b9a25926e | |
|
6ea29d2336 | |
|
2d676dbd55 | |
|
95bcc68341 | |
|
18210b43ff | |
|
fa7df01f1e | |
|
374db1b0a4 | |
|
37911ff92b | |
|
a737630474 | |
|
413c75edf8 | |
|
4e6fc1865a | |
|
d4a43f6b61 | |
|
53f7c532a2 | |
|
505e54f634 | |
|
d8b4167392 | |
|
7ad9810339 | |
|
f4ee2f43be | |
|
2107e71b97 | |
|
7b82911ae1 | |
|
e2606ecbb2 | |
|
40542303be | |
|
cb0fc2a8ab | |
|
d481808be1 | |
|
1aa3dbe31b | |
|
3446dc9a62 | |
|
67799d4caa | |
|
514254ef98 | |
|
4a63eb6fb9 | |
|
1902f7437e | |
|
edec020500 | |
|
79166a39a6 | |
|
0c31782d18 | |
|
a0f3cd3bfe | |
|
af43396240 | |
|
6db7b846d4 | |
|
1d99f99767 | |
|
e12344b17b | |
|
74c26cc00a | |
|
704905cea2 | |
|
a33980e58d | |
|
46cd6ace8d | |
|
8ae0eb0553 | |
|
908a2dcc66 | |
|
d859489be8 | |
|
05b20dd39f | |
|
c736234c3b | |
|
207c510d53 | |
|
5826134660 | |
|
2649d07c0e | |
|
e73c02762d | |
|
e7779ed10e | |
|
7de04d1d88 | |
|
6d183461b5 | |
|
3196467104 | |
|
f1d2d32049 | |
|
fba2319f05 | |
|
3af4dfa060 | |
|
f58cdcbe80 | |
|
fa7c12a7d2 | |
|
1ea5f34dc3 | |
|
646e9715ea | |
|
a211b2929a | |
|
1574beda8e | |
|
c769df5122 | |
|
31d8cec30c | |
|
fe0ce9bb36 | |
|
5e90fab366 | |
|
c271131fb2 | |
|
331baf8b89 | |
|
c4932416e5 | |
|
b201a3b968 | |
|
bd92304a71 | |
|
1356376804 | |
|
92fc61dc80 | |
|
4bce9c460d | |
|
8cdeae6f14 | |
|
fd15ae863b | |
|
e1c5f1b1c3 | |
|
bbe60759f7 | |
|
8011808a2d | |
|
87609c6b47 | |
|
c35a6c7d91 | |
|
993efd4a69 | |
|
0199501365 | |
|
3cd2ce87f5 | |
|
230ce848b8 | |
|
467bdc5dca | |
|
d96d2db4a8 | |
|
cda67b1eea | |
|
7953eead0e | |
|
395cae2656 | |
|
ecd5e2dd0a | |
|
bc5873ed84 | |
|
81b57d5eff | |
|
95f6173407 | |
|
c3ea0cb85f | |
|
edec03c935 | |
|
5a2ea49eea | |
|
dc64e86b25 | |
|
4c47d08d5a | |
|
dd11272b9e | |
|
e8a8bf21f3 | |
|
47041fe349 | |
|
f2e612a4c0 | |
|
2a679db694 | |
|
3644239ecd | |
|
69456f4999 | |
|
03adf48477 | |
|
ae86da2d2c | |
|
8fcf627b49 | |
|
ac4aaa9f71 | |
|
82a74fd648 | |
|
b5a4b49b6e | |
|
fa44ffe8d9 | |
|
da94d71957 | |
|
9b95fdbb48 | |
|
89893fbd4d | |
|
703d5b3def | |
|
8f14e0f118 | |
|
d5d3d8a5cc | |
|
0225c6f039 | |
|
745b418992 | |
|
e54b69667a | |
|
ee9280af01 | |
|
62588ab5a8 | |
|
bff49ecb84 | |
|
809f8c5ee9 | |
|
db65955d9f | |
|
03e744976b | |
|
8f44d73186 | |
|
4a130aca2a | |
|
2970ae9d51 | |
|
031c270a0a | |
|
a3ce5dae3f | |
|
ef39c8beda | |
|
65a9a80615 | |
|
ceeed8bb8a | |
|
206222886b | |
|
1a50384dcf | |
|
283abe4ed7 | |
|
b199371950 | |
|
c2bc24dd69 | |
|
85aae85f71 | |
|
4164cad70e | |
|
6e2f7e6539 | |
|
910583eed2 | |
|
39f36cc25b | |
|
291d341461 | |
|
1b652f2eca | |
|
a369ee2b4a | |
|
a8bf0894b2 | |
|
1a83c95597 | |
|
26f108de3b | |
|
59f828fcdb | |
|
0711cd3fe1 | |
|
7cf0be83ee | |
|
fca354ab45 | |
|
607aa80672 | |
|
1ce34dbb47 | |
|
804a28ab1e | |
|
4dba2970c7 | |
|
d009392a6d | |
|
2ba2034165 | |
|
d1ce72cbb8 | |
|
03b08aee67 | |
|
9b964a4af8 | |
|
a9852033a5 | |
|
974063d585 | |
|
f23ad578de | |
|
da24e3513b | |
|
30a4fac51d | |
|
9bf8f5629c | |
|
b601743088 | |
|
ba42d1328a | |
|
f652cb09ba | |
|
2ff086598f | |
|
6c1a39d2dd | |
|
d22dad7e04 | |
|
1a78a81318 | |
|
8a445a00f7 | |
|
25f005f937 | |
|
34ff157bb2 | |
|
d06642a92c | |
|
8b5c72eeca | |
|
c7e197f5f2 | |
|
db2abf334d | |
|
365159b3a7 | |
|
98fd2d20f5 | |
|
75e5a7138a | |
|
336a4b988d | |
|
fee5f14c93 | |
|
88b9791c91 | |
|
15fe3fd6e5 | |
|
39770762ff | |
|
ee10ab0a9d | |
|
ea875ab389 | |
|
8a330a205f | |
|
099a0c5363 | |
|
3f218dd8e2 | |
|
2224bc232e | |
|
f73fd5c4dc | |
|
648876d883 | |
|
03cbc7dfd0 | |
|
5f886750c5 | |
|
1695dc11fd | |
|
a69dbca5e3 | |
|
055eeb4c70 | |
|
6a3b1d5b09 | |
|
20460c3aed | |
|
baeab06da9 | |
|
c4ff7ce75d | |
|
db8afc497c | |
|
74681a1ae0 | |
|
d153955974 | |
|
07a27e970b | |
|
c63a99347c | |
|
1b44a526ad | |
|
75f9fa285b | |
|
297a59ae77 | |
|
298ce4d318 | |
|
e9d4fa177d | |
|
322be2b48a | |
|
07c056ffd6 | |
|
e70f9a8fce | |
|
5b778ad345 | |
|
5c932a3a60 | |
|
0943f75891 | |
|
22962f4bc4 | |
|
1f23ca884b | |
|
36ec014308 | |
|
cfecee2c8c | |
|
df1932eb0c | |
|
4e51ca4134 | |
|
f352deec70 | |
|
8a5d1683bd | |
|
dff65d38b7 | |
|
1092ad1b7c | |
|
e64605210a | |
|
8fc0bff2b4 | |
|
54a04fb7a2 | |
|
e837ad58a2 | |
|
01ca5c284a | |
|
03f33d1f12 | |
|
77e4a86271 | |
|
d8b8dbe675 | |
|
13f1021d35 | |
|
d174f3ffb2 | |
|
fa9a135942 | |
|
b4d349eb99 | |
|
ec734db413 | |
|
2ef21fd1fd | |
|
d092dfa5bd | |
|
22dc665e29 | |
|
29de6da9ac | |
|
9efa4fc428 | |
|
a0e15dca45 | |
|
d3387df69d | |
|
e5a0d82e00 | |
|
7e377c3611 | |
|
974ce9f47e | |
|
bd6cdcc3e9 | |
|
1b21726dd9 | |
|
7e85039c15 | |
|
fa7a0c9e17 | |
|
30b23e4608 | |
|
39a3b2a9b7 | |
|
dfe5517d28 | |
|
5b5acb8e74 | |
|
cf13ac93a2 | |
|
25a5e146ff | |
|
f0d416ff3a | |
|
a0428e1bc7 | |
|
2af4050a9b | |
|
8f9b75af6f | |
|
e635b2d1ac | |
|
3844ee61fb | |
|
71159a6db6 | |
|
f4a1571796 | |
|
c56b12879d | |
|
dd8ac278cd | |
|
5d8802038d | |
|
1824734b92 | |
|
46d5e17a7e | |
|
4cf725c4c8 | |
|
7511cd7779 | |
|
0c06dfb7bb | |
|
017a13e759 | |
|
1330442729 | |
|
30a061b6ac | |
|
2706151cf6 | |
|
73d4aa0297 | |
|
2a398422ee | |
|
c07c10859d | |
|
6007ad1f60 | |
|
f37f7b91d7 | |
|
82a8cbb92b | |
|
c5e54e29d4 | |
|
df7aa8d28f | |
|
3caab92320 | |
|
2a9be3b34b | |
|
88ea960325 | |
|
61d5b8f834 | |
|
2cf3a178d4 | |
|
6d6e1a048a | |
|
db9ecbf483 | |
|
059d3d3f93 | |
|
6771897275 | |
|
ea1e9fd30c | |
|
1216804d79 | |
|
d50acf1237 | |
|
e9f7bf890f | |
|
b526d5c6f1 | |
|
5641e6d253 | |
|
6af4a76b90 | |
|
a8ce8886ca | |
|
6184f075fc | |
|
458c12139f | |
|
fb07882322 | |
|
e235ca58a5 | |
|
804ccff5ca | |
|
c9dcad54c9 | |
|
00a9bb7a3f | |
|
7ce01aaf31 | |
|
781979c278 | |
|
f72ca1be37 | |
|
dc9f536855 | |
|
049ca94a64 | |
|
f91f424b56 | |
|
8592bf0d81 | |
|
161d8f4e87 | |
|
e3ff775455 | |
|
ec3bf12c33 | |
|
82a95577fe | |
|
fe9f5c83b1 | |
|
d6ead3b036 | |
|
ce171a574e | |
|
d545f8925e | |
|
2f07c26ed8 | |
|
1ea52f2ade | |
|
b562a08c53 | |
|
64852d1800 | |
|
835cdab9f7 | |
|
3217da02be | |
|
847349c859 | |
|
9f3488751b | |
|
2d61ac2ddc | |
|
f4cbda4b7f | |
|
e7437197ec | |
|
a31024c574 | |
|
316464cc38 | |
|
c3f4c27583 | |
|
5eaee80112 | |
|
294211a14a | |
|
9d980691c1 | |
|
49967ccf00 | |
|
6642d3ca21 | |
|
5bb4594505 | |
|
f3bcb8d75b | |
|
8bac47d1f4 | |
|
565a771557 | |
|
ff2ebc57c5 | |
|
2e32d44e6d | |
|
f2571e53cf | |
|
0d0e616238 | |
|
0b0fec3f52 | |
|
1ee81143a8 | |
|
3ac85ea950 | |
|
5dda4fa4a2 | |
|
e7091612f3 | |
|
5f9e8d6e0b | |
|
ac28a8b422 | |
|
cc03dc0fa2 | |
|
432494e63b | |
|
28edf38a5c | |
|
a75b68ca05 | |
|
857059a7ef | |
|
81a7921113 | |
|
44a8b751b8 | |
|
523aebc0ac | |
|
582d8ade2f | |
|
75d982efa2 | |
|
475caa030b | |
|
b14168403d | |
|
668fe2cc49 | |
|
1116ae67e7 | |
|
94e2c82624 | |
|
2f9eafb3a0 | |
|
3d5718cc32 | |
|
9ccedd7e5e | |
|
b468f97623 | |
|
f64e087adc | |
|
452d050812 | |
|
7fcdb7701c | |
|
c021195f5a | |
|
ae3f4d9043 | |
|
7d0dd43530 | |
|
52d2cc07fa | |
|
782e0697c5 | |
|
952ca485ac | |
|
a3320ab005 | |
|
286c3a0a4a | |
|
7b34664b94 | |
|
37a3ec32a6 | |
|
5819fd72cd | |
|
a79a77dc21 | |
|
4c7bfc851a | |
|
894aed75db | |
|
f1d55bd33a | |
|
44e31045cc | |
|
ab4a085e7c | |
|
71f860fb5b | |
|
9e28e1b676 | |
|
b17e6a35bc | |
|
9929ce368c | |
|
0d2b243cd9 | |
|
5b3bee5414 | |
|
4280c7a6b7 | |
|
57d06ede7f | |
|
71615b111b | |
|
9dfcba9814 | |
|
e734c28db8 | |
|
5232c6c050 | |
|
8a5ee96acd | |
|
27576df6a2 | |
|
0548478c0f | |
|
ecd1194b37 | |
|
dbb4c0bc90 | |
|
b5f8471bfe | |
|
6b94ce7c85 | |
|
7bc99399ec | |
|
a72972fbe9 | |
|
6de4969a87 | |
|
bd2cd5dbcc | |
|
520ecd570c | |
|
0c1daf2f7f | |
|
fe0f2f640c | |
|
2d2e1c3aa6 | |
|
023045a22d | |
|
d2bcfb6988 | |
|
89cfef5d9d | |
|
fe2d6eaa37 | |
|
54fb925d4d | |
|
74c107b4a1 | |
|
babd31e442 | |
|
c0f90a91f2 | |
|
03ba9e74ea | |
|
3efd1a22f4 | |
|
09d178785d | |
|
b28c40af3b | |
|
286cbad097 | |
|
01bdabeb68 | |
|
eeaf9612cb | |
|
f05d64a028 | |
|
6712b4b8b4 | |
|
ef0d30bafa | |
|
55d6f2b752 | |
|
453b225467 | |
|
cfbc6c626b | |
|
85b0f06d71 | |
|
334c54ec08 | |
|
24ccb9c0d4 | |
|
48b3c87894 | |
|
731dc46c8b | |
|
90d08fe209 | |
|
fc35c148b1 | |
|
cdfdcb524f | |
|
65326ea300 | |
|
71440e5058 | |
|
b8c7a3727c | |
|
326bd496be | |
|
d12201287f | |
|
1a4d3ef118 | |
|
684ab3d47e | |
|
b56344760c | |
|
8cdb377ebc | |
|
3948221f31 | |
|
28cbe098c6 | |
|
8a2e8d7bc7 | |
|
768a1aa57c | |
|
fcb15c3485 | |
|
f37837f70e | |
|
4db9bcc148 | |
|
68c9115dc7 | |
|
e096f8e381 | |
|
ac25ee8fc6 | |
|
1a00b07b2f | |
|
286a69f291 | |
|
c83f1cfdba | |
|
3838d2d6b2 | |
|
800b0613e5 | |
|
6d46f95da5 | |
|
1654f952e0 | |
|
fa0df81400 | |
|
594dc7c32b | |
|
9ae7d9aff7 | |
|
f99dc68135 | |
|
0e6247809b | |
|
c54af422f1 | |
|
0fcb34fe3c | |
|
bce795dc8f | |
|
8c4961f4d9 | |
|
01cf877a08 | |
|
a721e707e8 | |
|
8a5976cbac | |
|
d3b93f5563 | |
|
6921e78fff | |
|
c6534d6c27 | |
|
741cb12c7f | |
|
52566ea28c | |
|
c0e7b95f0d | |
|
9fadb9177a | |
|
c38055a5c3 | |
|
4ab1f5aaa0 | |
|
ab94e592e2 | |
|
70451e6518 | |
|
a65b26d35c | |
|
44ed88405c | |
|
393349e0c9 | |
|
4698c97ba9 | |
|
ccfdfc68c6 | |
|
182f722de4 | |
|
0529ad39ca | |
|
2a3097bd0f | |
|
79e68dedfa | |
|
4131143144 | |
|
2590ade9af | |
|
25676de459 | |
|
d0fc88358e | |
|
30478c793b | |
|
adf24f285b |
|
@ -1,19 +1,14 @@
|
|||
eclipse-*-src.tar.bz2
|
||||
eclipse-build-*
|
||||
*.rpm
|
||||
eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz
|
||||
eclipse-build-eb76edf3fb5bbeb115c59d1b076f4821a6d47d74.tar.xz
|
||||
eclipse-3.8.0-M4c-src.tar.bz2
|
||||
eclipse-build-c7f168527c3ed0495e614dd21244285a57ca6e5c.tar.xz
|
||||
eclipse-build-90f6aec69b933e8e96d5e740b0151d3645a12529.tar.xz
|
||||
eclipse-3.8.0-M5-src.tar.bz2
|
||||
eclipse-build-0316c8034d15e2c083090fa759677166a76c8755.tar.xz
|
||||
eclipse-3.8.0-I20120207-0800-src.tar.bz2
|
||||
eclipse-build-34f1eef37f75faf19c8951c8351483e7a98467e9.tar.xz
|
||||
eclipse-build-f58835e3e02b0416d746bc17299acd628a72e506.tar.xz
|
||||
eclipse-3.8.0-I20120306-0800-src.tar.bz2
|
||||
eclipse-build-85830ed757416af1ca59aa1c43dce00791d12241.tar.xz
|
||||
eclipse-3.8.0-I20120314-1800-src.tar.bz2
|
||||
eclipse-build-2c0f2ac34e3aee110187aa1dea28430bec724bdb.tar.xz
|
||||
eclipse-4.2.0-I20120405-1114-src.tar.bz2
|
||||
eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
|
||||
eclipse-build-*.tar.gz
|
||||
eclipse-build-*.tar.xz
|
||||
/R4_platform-aggregator-*
|
||||
/eclipse-jdtpdeupdatesite.tar.bz2
|
||||
/x86_64
|
||||
/results_eclipse
|
||||
/.m2
|
||||
/.xmvn
|
||||
/.build-*.log
|
||||
/org.eclipse.linuxtools.eclipse-build-*.tar.bz2
|
||||
/org.eclipse.linuxtools.eclipse-build-*.tar.xz
|
||||
/org.eclipse.linuxtools.eclipse-build-*/
|
||||
/eclipse-platform-sources-*.tar.xz
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>eclipse</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
|
||||
<nature>org.eclipse.linuxtools.rpm.core.rpmnature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,52 @@
|
|||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
index 5fc0e73..ed7e4fa 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
||||
@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
- File[] listFiles = extension.listFiles();
|
||||
+
|
||||
+ // Support the additional 'eclipse' directory if it exists.
|
||||
+ File[] extensionFiles = extension.listFiles(new FilenameFilter() {
|
||||
+ public boolean accept(File dir, String name) {
|
||||
+ return name.equals("eclipse");
|
||||
+ }
|
||||
+ });
|
||||
+
|
||||
+ File[] listFiles;
|
||||
+ if (extensionFiles.length == 1) {
|
||||
+ listFiles = extensionFiles[0].listFiles();
|
||||
+ } else {
|
||||
+ listFiles = extension.listFiles();
|
||||
+ }
|
||||
// new magic - multiple info files, f.e.
|
||||
// egit.info (git feature)
|
||||
// cdt.link (properties file containing link=path) to other info file
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
index 12e4d89..77945ef 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
- File[] listFiles = extension.listFiles();
|
||||
+
|
||||
+ // Support the additional 'eclipse' directory if it exists.
|
||||
+ File[] extensionFiles = extension.listFiles(new FilenameFilter() {
|
||||
+ public boolean accept(File dir, String name) {
|
||||
+ return name.equals("eclipse");
|
||||
+ }
|
||||
+ });
|
||||
+
|
||||
+ File[] listFiles;
|
||||
+ if (extensionFiles.length == 1) {
|
||||
+ listFiles = extensionFiles[0].listFiles();
|
||||
+ } else {
|
||||
+ listFiles = extension.listFiles();
|
||||
+ }
|
||||
// new magic - multiple info files, f.e.
|
||||
// egit.info (git feature)
|
||||
// cdt.link (properties file containing link=path) to other info file
|
|
@ -0,0 +1,23 @@
|
|||
--- 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 @@
|
||||
|
||||
MAKE_TYPE=make
|
||||
|
||||
-export CFLAGS='-O -Wall -fPIC'
|
||||
+export CFLAGS='-O -g -Wall -fPIC'
|
||||
+export NO_STRIP=1
|
||||
|
||||
# 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\""
|
||||
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
|
||||
-CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
|
||||
+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
|
||||
-fpic \
|
||||
-DLINUX \
|
||||
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
|
|
@ -0,0 +1,47 @@
|
|||
From edd5a395dd96699f91c463c0e0409a7488814775 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Tue, 16 Aug 2016 17:51:46 -0400
|
||||
Subject: [PATCH] Skip loading droplets in the configuration during
|
||||
reconciliation.
|
||||
|
||||
The reconciler attempts to load droplets as extended locations, which
|
||||
seems to be an expensive operation. Avoid doing this for the sake of
|
||||
efficiency.
|
||||
|
||||
Change-Id: Iaf07aacb2d7eaabf3730654e757e69d22f0bc4ab
|
||||
---
|
||||
.../internal/p2/reconciler/dropins/PlatformXmlListener.java | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
|
||||
index 802ee1b..74023fe 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
|
||||
@@ -168,11 +168,24 @@ public class PlatformXmlListener extends DirectoryChangeListener {
|
||||
* Ensure that we have a repository for each site in the given configuration.
|
||||
*/
|
||||
protected void synchronizeConfiguration(Configuration config) {
|
||||
+ String fragments = System.getProperty("p2.fragments");
|
||||
List<Site> sites = config.getSites();
|
||||
Set<IMetadataRepository> newRepos = new LinkedHashSet<>();
|
||||
Set<Site> toBeRemoved = new HashSet<>();
|
||||
for (Site site : sites) {
|
||||
String siteURL = site.getUrl();
|
||||
+ if (fragments != null) {
|
||||
+ String[] rootPaths = fragments.split(",");
|
||||
+ boolean skip = false;
|
||||
+ for (String path : rootPaths) {
|
||||
+ if (siteURL.startsWith("file:" + path)) {
|
||||
+ skip = true;
|
||||
+ }
|
||||
+ }
|
||||
+ if (skip) {
|
||||
+ continue;
|
||||
+ }
|
||||
+ }
|
||||
IMetadataRepository match = getMatchingRepo(Activator.getRepositories(), siteURL);
|
||||
if (match == null) {
|
||||
try {
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From 889543269853e12925ef00a6e76c3dd85ce5b915 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Tue, 25 Oct 2016 16:48:28 -0400
|
||||
Subject: [PATCH] Disable uses by default (osgi.resolver.usesMode=ignore).
|
||||
set.
|
||||
|
||||
---
|
||||
.../felix/src/org/apache/felix/resolver/ResolverImpl.java | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
|
||||
index ded683f..7216865 100755
|
||||
--- rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
|
||||
@@ -1230,7 +1230,9 @@ public class ResolverImpl implements Resolver
|
||||
{
|
||||
public void run()
|
||||
{
|
||||
- computeUses(session, allWireCandidates, allPackages, resource);
|
||||
+ if (! "ignore".equals(System.getProperty("osgi.resolver.usesMode"))) {
|
||||
+ computeUses(session, allWireCandidates, allPackages, resource);
|
||||
+ }
|
||||
}
|
||||
});
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -0,0 +1,563 @@
|
|||
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig 2018-08-17 01:24:16.000000000 +0100
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2018-08-19 12:50:33.575708475 +0100
|
||||
@@ -19,6 +19,23 @@
|
||||
%license
|
||||
</license>
|
||||
|
||||
+ <requires>
|
||||
+ <import plugin="org.junit" />
|
||||
+ <import plugin="org.hamcrest.core" />
|
||||
+ <import plugin="org.junit.jupiter.api" />
|
||||
+ <import plugin="org.junit.jupiter.engine" />
|
||||
+ <import plugin="org.junit.jupiter.migrationsupport" />
|
||||
+ <import plugin="org.junit.jupiter.params" />
|
||||
+ <import plugin="org.junit.platform.commons" />
|
||||
+ <import plugin="org.junit.platform.engine" />
|
||||
+ <import plugin="org.junit.platform.launcher" />
|
||||
+ <import plugin="org.junit.platform.runner" />
|
||||
+ <import plugin="org.junit.platform.suite.api" />
|
||||
+ <import plugin="org.junit.vintage.engine" />
|
||||
+ <import plugin="org.opentest4j" />
|
||||
+ <import plugin="org.apiguardian" />
|
||||
+ </requires>
|
||||
+
|
||||
<plugin
|
||||
id="org.eclipse.jdt"
|
||||
download-size="0"
|
||||
@@ -158,103 +175,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.junit"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <plugin
|
||||
- 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
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
<requires>
|
||||
<import feature="org.eclipse.jdt" version="3.15.0" match="compatible"/>
|
||||
+ <import plugin="org.objectweb.asm" />
|
||||
+ <import plugin="org.objectweb.asm.tree" />
|
||||
</requires>
|
||||
|
||||
<plugin
|
||||
@@ -83,20 +85,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.objectweb.asm"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.objectweb.asm.tree"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig 2017-01-04 10:57:15.000000000 +0000
|
||||
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2017-01-13 11:29:16.371473551 +0000
|
||||
@@ -23,69 +23,6 @@
|
||||
</license>
|
||||
|
||||
<plugin
|
||||
- id="javax.el"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="javax.servlet"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="javax.servlet.jsp"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="com.sun.el"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.commons.logging"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.jasper.glassfish"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.lucene.analyzers-common"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.lucene.core"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- 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 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.jetty.continuation"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.jetty.http"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.jetty.io"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.jetty.security"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.jetty.server"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.jetty.servlet"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.jetty.util"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.core.net"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -204,4 +92,22 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
+ <requires>
|
||||
+ <import plugin="javax.el-api" />
|
||||
+ <import plugin="javax.servlet-api" />
|
||||
+ <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" />
|
||||
+ <import plugin="org.eclipse.jetty.security" />
|
||||
+ <import plugin="org.eclipse.jetty.server" />
|
||||
+ <import plugin="org.eclipse.jetty.servlet" />
|
||||
+ <import plugin="org.eclipse.jetty.util" />
|
||||
+ </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 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.apache.batik.css"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.w3c.css.sac"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.batik.util"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.w3c.dom.svg"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.w3c.dom.smil"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.w3c.dom.events"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="javax.inject"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="javax.annotation"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.e4.core.di"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -172,34 +132,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.apache.batik.constants"
|
||||
- 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"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
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 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="com.ibm.icu"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.equinox.preferences"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -624,27 +542,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.apache.felix.gogo.command"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.felix.gogo.runtime"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.felix.gogo.shell"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.equinox.console"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -670,13 +567,6 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.commons.jxpath"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig 2017-01-04 10:54:36.000000000 +0000
|
||||
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2017-01-13 11:28:25.827041896 +0000
|
||||
@@ -60,12 +60,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>javax.annotation</id>
|
||||
- <versionRange>0.0.0</versionRange>
|
||||
- </requirement>
|
||||
- <requirement>
|
||||
- <type>eclipse-plugin</type>
|
||||
- <id>javax.el</id>
|
||||
+ <id>javax.el-api</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
@@ -75,7 +70,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>javax.servlet</id>
|
||||
+ <id>javax.servlet-api</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
@@ -95,7 +90,7 @@
|
||||
</requirement>
|
||||
<requirement>
|
||||
<type>eclipse-plugin</type>
|
||||
- <id>org.apache.jasper.glassfish</id>
|
||||
+ <id>org.glassfish.web.javax.servlet.jsp</id>
|
||||
<versionRange>0.0.0</versionRange>
|
||||
</requirement>
|
||||
<requirement>
|
||||
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF.orig 2017-02-15 10:01:24.202436806 +0000
|
||||
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF 2017-02-15 10:01:35.454301845 +0000
|
||||
@@ -39,8 +39,7 @@
|
||||
org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
|
||||
org.eclipse.e4.emf.xpath
|
||||
Bundle-ActivationPolicy: lazy
|
||||
-Import-Package: javax.annotation,
|
||||
- javax.inject;version="1.0.0",
|
||||
+Import-Package: javax.inject;version="1.0.0",
|
||||
org.osgi.framework;version="1.5.0",
|
||||
org.osgi.service.event;version="1.3.1"
|
||||
Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
|
||||
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF.orig 2017-02-15 10:00:56.352770853 +0000
|
||||
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF 2017-02-15 10:01:06.757646050 +0000
|
||||
@@ -14,7 +14,6 @@
|
||||
org.eclipse.e4.core.di;bundle-version="0.9.0"
|
||||
Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
|
||||
Bundle-ActivationPolicy: lazy
|
||||
-Import-Package: javax.annotation,
|
||||
- javax.inject;version="1.0.0"
|
||||
+Import-Package: javax.inject;version="1.0.0"
|
||||
Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
|
||||
Automatic-Module-Name: org.eclipse.e4.tools.services
|
|
@ -0,0 +1,88 @@
|
|||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java.orig 2014-03-24 10:49:00.000000000 +0000
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java 2014-03-24 15:39:32.122246214 +0000
|
||||
@@ -39,6 +39,7 @@
|
||||
|
||||
public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
|
||||
|
||||
+ private static final String PROP_IGNORE_USER_CONFIGURATION = "eclipse.ignoreUserConfiguration"; //$NON-NLS-1$
|
||||
private static final String SIMPLE_PROFILE_REGISTRY_INTERNAL = "_simpleProfileRegistry_internal_"; //$NON-NLS-1$
|
||||
private static final String PROFILE_REGISTRY = "profile registry"; //$NON-NLS-1$
|
||||
private static final String PROFILE_PROPERTIES_FILE = "state.properties"; //$NON-NLS-1$
|
||||
@@ -266,6 +267,14 @@
|
||||
//fragments support - remeber the property
|
||||
internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp());
|
||||
agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp()));
|
||||
+
|
||||
+ // this looks like a hack, but:
|
||||
+ // (1) SimpleConfigurationImpl keeps returning master configuration as long as the property is set
|
||||
+ // (2) SimpleConfigurationImpl sets the propery after it drops user configuration
|
||||
+ // therefore dropins reconciliation can't load dropins plugins installed into user configuration
|
||||
+ // after the user configuration has been dropped.
|
||||
+ // It is necessary to unset this property.
|
||||
+ //System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
} else {
|
||||
//This is the first time we create the shared profile. Tag it as such and also remember the timestamp of the base
|
||||
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
|
||||
@@ -299,6 +308,13 @@
|
||||
if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null)
|
||||
return false;
|
||||
|
||||
+ // if the property is set by OSGI, and there is no new timestamp (because of the previous condition)
|
||||
+ // ignore current profile. This will happen only once, because SERVICE_SHARED_INSTALL_NEW_TIMESTAMP
|
||||
+ // is set during profile reset.
|
||||
+ if ("true".equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION))) { //$NON-NLS-1$ //$NON-NLS-2$
|
||||
+ System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
+ return true;
|
||||
+ }
|
||||
String baseTimestamp = getBaseTimestamp(profile.getProfileId());
|
||||
String extTimestamp = getExtTimeStamp();
|
||||
if (baseTimestamp == null) {
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
|
||||
@@ -570,6 +570,7 @@
|
||||
|
||||
// get all IUs from all our repos
|
||||
IQueryResult<IInstallableUnit> allIUs = getAllIUsFromRepos();
|
||||
+ HashSet<IInstallableUnit> removedFromAllIUs = new HashSet<IInstallableUnit>();
|
||||
for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();) {
|
||||
final IInstallableUnit iu = iter.next();
|
||||
IInstallableUnit existing = profileIUs.get(iu);
|
||||
@@ -583,6 +584,7 @@
|
||||
// (and more expensive) way to find this out is to do an IU profile property query.
|
||||
if (two == null) {
|
||||
// the IU is already installed so don't mark it as a dropin now - see bug 404619.
|
||||
+ removedFromAllIUs.add(iu);
|
||||
iter.remove();
|
||||
continue;
|
||||
}
|
||||
@@ -625,7 +627,7 @@
|
||||
}
|
||||
// if the IU from the profile is in the "all available" list, then it is already added
|
||||
// otherwise if it isn't in the repo then we have to remove it from the profile.
|
||||
- if (!all.contains(iu))
|
||||
+ if (!all.contains(iu) && !removedFromAllIUs.contains(iu))
|
||||
toRemove.add(iu);
|
||||
}
|
||||
|
||||
@@ -799,8 +801,8 @@
|
||||
IStatus installerPlanStatus = engine.perform(plan.getInstallerPlan(), phaseSet, monitor);
|
||||
if (!installerPlanStatus.isOK())
|
||||
return installerPlanStatus;
|
||||
-
|
||||
- applyConfiguration(true);
|
||||
+ if (isReconciliationApplicationRunning())
|
||||
+ applyConfiguration(true);
|
||||
}
|
||||
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 @@
|
||||
|
||||
@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};
|
||||
MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2);
|
||||
|
||||
return rememberCancellationDecision(dialog.open());
|
|
@ -0,0 +1,276 @@
|
|||
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java.orig 2016-04-19 20:07:36.947017206 +0100
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java 2016-04-19 20:09:59.166077383 +0100
|
||||
@@ -77,7 +77,7 @@
|
||||
*/
|
||||
protected IPath getJdtFeatureLocation() {
|
||||
IPath path = new Path(TargetPlatform.getDefaultLocation());
|
||||
- path = path.append("features");
|
||||
+ path = path.append("droplets").append("eclipse-jdt").append("eclipse").append("features");
|
||||
File dir = path.toFile();
|
||||
assertTrue("Missing features directory", dir.exists() && !dir.isFile());
|
||||
String[] files = dir.list();
|
||||
@@ -613,4 +613,4 @@
|
||||
assertTrue(iubc.getIncludeSource());
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git 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
|
||||
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-");
|
||||
});
|
||||
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
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
|
||||
@@ -14,6 +14,7 @@ bin.includes = .,\
|
||||
resources/,\
|
||||
lib/
|
||||
src.includes = about.html
|
||||
-jars.compile.order = .
|
||||
+jars.compile.order = .,\
|
||||
+ lib/annotations.jar
|
||||
source.. = src/
|
||||
-output.. = bin/
|
||||
+source.lib/annotations.jar = src/
|
||||
diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
||||
index f34ae40..0f9877d 100644
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
|
||||
@@ -21,4 +21,6 @@ bin.includes = plugin.xml,\
|
||||
plugin.properties
|
||||
src.includes = about.html
|
||||
src.excludes = src-resources/
|
||||
-jars.compile.order = aptext.jar,apt.jar,.
|
||||
+jars.compile.order = aptext.jar,apt.jar,.,\
|
||||
+ resources/question.jar
|
||||
+source.resources/question.jar = src-resources/
|
||||
diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties 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 @@
|
||||
src.includes = about.html
|
||||
compilerArg=-proc:none
|
||||
jars.extra.classpath = java10/java10api.jar
|
||||
+source.lib/apttestprocessors.jar = processors/
|
||||
+jars.compile.order = lib/apttestprocessors.jar,\
|
||||
+ .
|
||||
--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig 2016-03-24 14:25:47.076289150 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties 2016-03-24 14:26:39.528660802 +0000
|
||||
@@ -25,6 +25,8 @@
|
||||
Ant Tests/
|
||||
|
||||
source.lib/antUITestsSupport.jar = test support/
|
||||
-jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar
|
||||
+source.testbuildfiles/antUITestsSupport.jar = test support/
|
||||
+jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar,testbuildfiles/antUITestsSupport.jar
|
||||
output.lib/antUITestsSupport.jar = test_support_bin/
|
||||
+output.testbuildfiles/antUITestsSupport.jar = test_support_bin/
|
||||
output.anttestsui.jar = bin/
|
||||
--- eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig 2016-03-25 15:09:40.557786910 +0000
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties 2016-03-25 15:12:08.476059326 +0000
|
||||
@@ -22,3 +22,5 @@
|
||||
leaks/,\
|
||||
performance/
|
||||
javacWarnings..=-raw,-unchecked
|
||||
+source.testresources/nls.jar = nls/
|
||||
+jars.compile.order = .,testresources/nls.jar
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Client.java 2004-11-12 14:37:36.000000000 +0000
|
||||
@@ -0,0 +1,25 @@
|
||||
+/*******************************************************************************
|
||||
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
|
||||
+ * All rights reserved. This program and the accompanying materials
|
||||
+ * are made available under the terms of the Common Public License v1.0
|
||||
+ * which accompanies this distribution, and is available at
|
||||
+ * http://www.eclipse.org/legal/cpl-v10.html
|
||||
+ *
|
||||
+ * Contributors:
|
||||
+ * IBM Corporation - initial API and implementation
|
||||
+ *******************************************************************************/
|
||||
+package pkg;
|
||||
+
|
||||
+public class Client {
|
||||
+
|
||||
+ public String s;
|
||||
+
|
||||
+ {
|
||||
+ s= Messages.getString("test");
|
||||
+ s= Messages.getString("test_undefined");
|
||||
+ s= Messages.getString("duplicate");
|
||||
+ s= Messages.getString("test.long.key");
|
||||
+ s= Messages.getString("SearchResultView.removed_resource");
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.java 2004-11-12 14:37:28.000000000 +0000
|
||||
@@ -0,0 +1,58 @@
|
||||
+/*******************************************************************************
|
||||
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
|
||||
+ * All rights reserved. This program and the accompanying materials
|
||||
+ * are made available under the terms of the Common Public License v1.0
|
||||
+ * which accompanies this distribution, and is available at
|
||||
+ * http://www.eclipse.org/legal/cpl-v10.html
|
||||
+ *
|
||||
+ * Contributors:
|
||||
+ * IBM Corporation - initial API and implementation
|
||||
+ *******************************************************************************/
|
||||
+package pkg;
|
||||
+
|
||||
+import java.text.MessageFormat;
|
||||
+import java.util.MissingResourceException;
|
||||
+import java.util.ResourceBundle;
|
||||
+
|
||||
+public class Messages extends Object {
|
||||
+ private static final String RESOURCE_BUNDLE = Messages.class.getName();
|
||||
+ private static ResourceBundle fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
|
||||
+
|
||||
+ private Messages() {}
|
||||
+
|
||||
+ /**
|
||||
+ * Gets a string from the resource bundle and formats it with the argument
|
||||
+ *
|
||||
+ * @param key the string used to get the bundle value, must not be null
|
||||
+ */
|
||||
+ public static String getFormattedString(String key, Object arg) {
|
||||
+ String format = null;
|
||||
+
|
||||
+ try {
|
||||
+ format = fgResourceBundle.getString(key);
|
||||
+ } catch (MissingResourceException e) {
|
||||
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
|
||||
+ }
|
||||
+
|
||||
+ if (arg == null) {
|
||||
+ arg = ""; //$NON-NLS-1$
|
||||
+ }
|
||||
+
|
||||
+ return MessageFormat.format(format, new Object[] { arg });
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Gets a string from the resource bundle and formats it with arguments
|
||||
+ */
|
||||
+ public static String getFormattedString(String key, String[] args) {
|
||||
+ return MessageFormat.format(fgResourceBundle.getString(key), args);
|
||||
+ }
|
||||
+
|
||||
+ public static String getString(String key) {
|
||||
+ try {
|
||||
+ return fgResourceBundle.getString(key);
|
||||
+ } catch (MissingResourceException e) {
|
||||
+ return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.properties 2004-11-12 14:38:06.000000000 +0000
|
||||
@@ -0,0 +1,15 @@
|
||||
+###############################################################################
|
||||
+# Copyright (c) 2000, 2004 IBM Corporation and others.
|
||||
+# All rights reserved. This program and the accompanying materials
|
||||
+# are made available under the terms of the Common Public License v1.0
|
||||
+# which accompanies this distribution, and is available at
|
||||
+# http://www.eclipse.org/legal/cpl-v10.html
|
||||
+#
|
||||
+# Contributors:
|
||||
+# IBM Corporation - initial API and implementation
|
||||
+###############################################################################
|
||||
+test= Hello World
|
||||
+duplicate= Duplicate 1
|
||||
+test.long.key= Hello World Long
|
||||
+duplicate= Duplicate 2
|
||||
+SearchResultView.removed_resource= <removed resource>
|
||||
--- eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig 2017-03-03 14:20:53.868573338 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties 2017-03-06 14:26:42.382365639 +0000
|
||||
@@ -23,6 +23,8 @@
|
||||
source.anttestscore.jar = test plugin/,\
|
||||
tests/
|
||||
source.lib/antTestsSupport.jar = test support/
|
||||
-jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar
|
||||
+source.testlib/classpathOrdering1.jar = testlib_src/classpathOrdering1/
|
||||
+source.testlib/classpathOrdering2.jar = testlib_src/classpathOrdering2/
|
||||
+jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar,testlib/classpathOrdering1.jar,testlib/classpathOrdering2.jar
|
||||
output.lib/antTestsSupport.jar = test_support_bin/
|
||||
output.anttestscore.jar = bin/
|
||||
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering1/ClasspathOrdering.java 2017-03-06 14:28:57.742879825 +0000
|
||||
@@ -0,0 +1,10 @@
|
||||
+import java.io.PrintStream;
|
||||
+
|
||||
+public class ClasspathOrdering
|
||||
+{
|
||||
+ public static void main(String[] args)
|
||||
+ {
|
||||
+ System.out.println("classpathOrdering1");
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- /dev/null 2017-02-12 18:27:14.283389371 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering2/ClasspathOrdering.java 2017-03-06 14:29:45.759352762 +0000
|
||||
@@ -0,0 +1,10 @@
|
||||
+import java.io.PrintStream;
|
||||
+
|
||||
+public class ClasspathOrdering
|
||||
+{
|
||||
+ public static void main(String[] args)
|
||||
+ {
|
||||
+ System.out.println("classpathOrdering2");
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig 2017-04-07 10:44:33.764607961 +0100
|
||||
+++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml 2017-04-07 11:26:44.511961798 +0100
|
||||
@@ -26,4 +26,24 @@
|
||||
<testClass>org.eclipse.jdt.core.tests.builder.BuilderTests</testClass>
|
||||
<testSuite>${project.artifactId}</testSuite>
|
||||
</properties>
|
||||
+
|
||||
+ <build>
|
||||
+ <plugins>
|
||||
+ <plugin>
|
||||
+ <groupId>org.eclipse.tycho</groupId>
|
||||
+ <artifactId>target-platform-configuration</artifactId>
|
||||
+ <configuration>
|
||||
+ <dependency-resolution>
|
||||
+ <extraRequirements>
|
||||
+ <requirement>
|
||||
+ <type>eclipse-plugin</type>
|
||||
+ <id>org.eclipse.jdt.annotation</id>
|
||||
+ <versionRange>0.0.0</versionRange>
|
||||
+ </requirement>
|
||||
+ </extraRequirements>
|
||||
+ </dependency-resolution>
|
||||
+ </configuration>
|
||||
+ </plugin>
|
||||
+ </plugins>
|
||||
+ </build>
|
||||
</project>
|
||||
--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig 2017-04-28 11:49:47.046123546 +0100
|
||||
+++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml 2017-04-28 12:05:11.947521737 +0100
|
||||
@@ -156,13 +156,6 @@
|
||||
id="org.eclipse.jdt.source.feature.group"
|
||||
version="" />
|
||||
<iu
|
||||
- id="org.eclipse.rcp.configuration.feature.group"
|
||||
- version="" />
|
||||
-
|
||||
- <iu
|
||||
- id="org.eclipse.equinox.executable"
|
||||
- version="" />
|
||||
- <iu
|
||||
id="org.eclipse.e4.rcp.feature.group"
|
||||
version="" />
|
||||
<iu
|
|
@ -0,0 +1,64 @@
|
|||
commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf
|
||||
Author: Mat Booth <mat.booth@redhat.com>
|
||||
Date: Thu May 3 15:58:49 2018 +0100
|
||||
|
||||
Bug 534326 - Awkward p2 UI when many droplets are installed
|
||||
|
||||
Filter out software site locations where we know that they are p2
|
||||
droplets in places we show the list to the user.
|
||||
|
||||
Change-Id: I12364223850862783cb7cffd32fb7428fbf6b270
|
||||
Signed-off-by: Mat Booth <mat.booth@redhat.com>
|
||||
|
||||
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
index e6eef8c39..fe5970e79 100644
|
||||
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
|
||||
@@ -300,6 +300,19 @@ public class RepositorySelectionGroup {
|
||||
void fillRepoCombo(final String selection) {
|
||||
RepositoryTracker tracker = ui.getRepositoryTracker();
|
||||
URI[] sites = tracker.getKnownRepositories(ui.getSession());
|
||||
+ // Filter out sites that are actually installed p2 droplets
|
||||
+ String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
|
||||
+ ArrayList<URI> filteredSites = new ArrayList<>(Arrays.asList(sites));
|
||||
+ if (fragments != null) {
|
||||
+ for (String root : fragments.split(",")) { //$NON-NLS-1$
|
||||
+ for (URI uri : sites) {
|
||||
+ if (uri.getPath() != null && uri.getPath().startsWith(root)) {
|
||||
+ filteredSites.remove(uri);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ sites = filteredSites.toArray(new URI[0]);
|
||||
boolean hasLocalSites = getLocalSites().length > 0;
|
||||
final String[] items;
|
||||
if (hasLocalSites) {
|
||||
diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
index d796aefd0..c03924f90 100644
|
||||
--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
|
||||
@@ -130,9 +130,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
|
||||
if (cachedElements == null) {
|
||||
Object[] children = super.fetchChildren(o, monitor);
|
||||
cachedElements = new Hashtable<>(children.length);
|
||||
+ String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
|
||||
for (int i = 0; i < children.length; i++) {
|
||||
if (children[i] instanceof MetadataRepositoryElement) {
|
||||
- put((MetadataRepositoryElement) children[i]);
|
||||
+ // Filter out locations that are actually installed p2 droplets
|
||||
+ if (fragments != null) {
|
||||
+ boolean isDroplet = false;
|
||||
+ for (String root : fragments.split(",")) { //$NON-NLS-1$
|
||||
+ URI childLoc = ((MetadataRepositoryElement) children[i]).getLocation();
|
||||
+ if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) {
|
||||
+ isDroplet = true;
|
||||
+ }
|
||||
+ }
|
||||
+ if (!isDroplet) {
|
||||
+ put((MetadataRepositoryElement) children[i]);
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,22 @@
|
|||
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig 2014-03-24 12:06:59.530918305 +0000
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2014-03-24 12:07:42.709932098 +0000
|
||||
@@ -1362,7 +1362,7 @@
|
||||
String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
|
||||
if (appVersion == null || appVersion.trim().length() == 0)
|
||||
appVersion = ""; //$NON-NLS-1$
|
||||
- appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
+ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
} catch (IOException e) {
|
||||
// Do nothing if we get an exception. We will default to a standard location
|
||||
// in the user's home dir.
|
||||
--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java.orig 2014-03-24 12:05:52.666896971 +0000
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java 2014-03-24 12:06:46.076914704 +0000
|
||||
@@ -296,7 +296,7 @@
|
||||
String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
|
||||
if (appVersion == null || appVersion.trim().length() == 0)
|
||||
appVersion = ""; //$NON-NLS-1$
|
||||
- appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
+ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
} catch (IOException e) {
|
||||
// Do nothing if we get an exception. We will default to a standard location
|
||||
// in the user's home dir.
|
|
@ -0,0 +1,47 @@
|
|||
From decc6ec5f3c5ce87fa50c2cfe932d66e89496810 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Wed, 3 Aug 2016 14:57:10 -0400
|
||||
Subject: [PATCH] p2 Droplets should be recognized as runnable repositories.
|
||||
|
||||
Normally, a runnable repository is identified by the 'p2.runnable'
|
||||
property contained within the artifact repository (artifact.xml).
|
||||
However, in Fedora we ship p2 Droplets without this file so we need a
|
||||
way to let methods like getRunnableRepositories in
|
||||
o.e.equinox.internal.p2.touchpoint.eclipse.Util know that p2 Droplets
|
||||
are runnable repositories.
|
||||
|
||||
Change-Id: I0ad0a7557f998b4d032466f89e6cc76036d1fb38
|
||||
---
|
||||
.../ExtensionLocationArtifactRepository.java | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
||||
index 342e33e..425a166 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
||||
@@ -260,6 +260,22 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository<IArt
|
||||
return artifactRepository.getProperties();
|
||||
}
|
||||
|
||||
+ public String getProperty(String key) {
|
||||
+ if (IArtifactRepository.PROP_RUNNABLE.equals(key)) {
|
||||
+ String candidate = getLocation().getPath();
|
||||
+ String fragments = System.getProperty("p2.fragments");
|
||||
+ if (fragments != null) {
|
||||
+ String[] rootPaths = fragments.split(",");
|
||||
+ for (String root : rootPaths) {
|
||||
+ if (candidate.startsWith(root)) {
|
||||
+ return Boolean.TRUE.toString();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return super.getProperty(key);
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
public String setProperty(String key, String value, IProgressMonitor monitor) {
|
||||
try {
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
--- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000
|
||||
+++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000
|
||||
@@ -42,8 +42,9 @@
|
||||
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
|
||||
org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
|
||||
org.eclipse.osgi.services;bundle-version="3.3.100",
|
||||
- org.hamcrest;bundle-version="1.1.0",
|
||||
- org.mockito;bundle-version="1.8.4"
|
||||
+ org.hamcrest.core,
|
||||
+ org.hamcrest.library,
|
||||
+ org.mockito.mockito-core
|
||||
Eclipse-AutoStart: true
|
||||
Export-Package: org.eclipse.ui.tests.api,
|
||||
org.eclipse.ui.tests.menus
|
||||
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:44:04.400306048 +0000
|
||||
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:58:07.608331033 +0000
|
||||
@@ -31,8 +31,8 @@
|
||||
org.eclipse.core.expressions;bundle-version="3.4.200",
|
||||
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
|
||||
org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
|
||||
- org.hamcrest;bundle-version="1.1.0",
|
||||
- org.mockito;bundle-version="1.8.4",
|
||||
+ org.hamcrest.core,
|
||||
+ org.mockito.mockito-core,
|
||||
org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
|
||||
org.eclipse.test.performance;bundle-version="3.13.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
--- 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 @@
|
||||
org.w3c.css.sac,
|
||||
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
|
||||
org.eclipse.ui;bundle-version="3.106.0",
|
||||
- org.hamcrest;bundle-version="1.1.0",
|
||||
- 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
|
||||
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"
|
|
@ -0,0 +1,125 @@
|
|||
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200
|
||||
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200
|
||||
@@ -40,6 +40,25 @@
|
||||
<excludes>
|
||||
<plugin id="org.sat4j.core"/>
|
||||
<plugin id="org.sat4j.pb"/>
|
||||
+ <plugin id="org.apache.commons.codec" />
|
||||
+ <plugin id="org.apache.commons.httpclient" />
|
||||
+ <plugin id="org.apache.httpcomponents.httpclient" />
|
||||
+ <plugin id="org.apache.httpcomponents.httpcore" />
|
||||
+ <plugin id="org.apache.commons.logging" />
|
||||
+ <plugin id="org.eclipse.ecf"/>
|
||||
+ <plugin id="org.eclipse.ecf.filetransfer"/>
|
||||
+ <plugin id="org.eclipse.ecf.identity"/>
|
||||
+ <plugin id="org.eclipse.ecf.provider.filetransfer"/>
|
||||
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
|
||||
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"/>
|
||||
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
|
||||
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"/>
|
||||
+ <plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
|
||||
+ <plugin id="org.eclipse.ecf.ssl"/>
|
||||
+ <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.tukaani.xz" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200
|
||||
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200
|
||||
@@ -34,6 +34,17 @@
|
||||
<goals>
|
||||
<goal>source-feature</goal>
|
||||
</goals>
|
||||
+ <configuration>
|
||||
+ <excludes>
|
||||
+ <plugin id="javax.servlet-api" /><plugin id="javax.el" /><plugin id="com.sun.el.javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
|
||||
+ <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
|
||||
+ <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
|
||||
+ <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
|
||||
+ <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
|
||||
+ <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin id="org.eclipse.jetty.servlet" />
|
||||
+ <plugin id="org.apache.commons.el" /><plugin id="org.glassfish.web.javax.servlet.jsp" />
|
||||
+ </excludes>
|
||||
+ </configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
--- eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
|
||||
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
|
||||
@@ -38,6 +38,8 @@
|
||||
<configuration>
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.pde"/>
|
||||
+ <plugin id="org.objectweb.asm"/>
|
||||
+ <plugin id="org.objectweb.asm.tree"/>
|
||||
<plugin id="org.eclipse.pde.doc.user"/>
|
||||
</excludes>
|
||||
</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 @@
|
||||
<excludes>
|
||||
<plugin id="org.eclipse.jdt"/>
|
||||
<plugin id="org.eclipse.jdt.doc.user"/>
|
||||
+ <plugin id="org.junit" />
|
||||
+ <plugin id="org.hamcrest.core" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</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 @@
|
||||
<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="com.jcraft.jsch"/>
|
||||
+ <plugin id="org.apache.ant"/>
|
||||
</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"/>
|
||||
<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.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.w3c.dom.svg" />
|
||||
+ <plugin id="javax.inject" />
|
||||
+ <plugin id="com.ibm.icu"/>
|
||||
+ <plugin id="org.apache.felix.gogo.runtime" />
|
||||
+ <plugin id="org.apache.felix.gogo.shell" />
|
||||
</excludes>
|
||||
</configuration>
|
||||
</execution>
|
||||
--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2016-04-27 09:18:50.421221722 +0100
|
||||
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2016-04-27 09:19:08.454957280 +0100
|
||||
@@ -51,16 +51,6 @@
|
||||
id="org.eclipse.help.source"
|
||||
version="0.0.0"/>
|
||||
|
||||
- <requires>
|
||||
- <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.feature.source" version="1.4.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||
- </requires>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.sdk"
|
|
@ -0,0 +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);
|
|
@ -0,0 +1,114 @@
|
|||
From 72e58be8c9c5fbc6f6527318b4381a58cebfc120 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Thu, 7 Apr 2016 10:23:49 -0400
|
||||
Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled
|
||||
installations.
|
||||
|
||||
- Additionally support reading source bundles from p2 Droplets location
|
||||
---
|
||||
ui/org.eclipse.pde.core/META-INF/MANIFEST.MF | 3 +-
|
||||
.../src/org/eclipse/pde/internal/core/P2Utils.java | 48 +++++++++++++++++++---
|
||||
2 files changed, 45 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
|
||||
index 7c20994..ab702e3 100644
|
||||
--- eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
|
||||
@@ -102,6 +102,7 @@ Require-Bundle:
|
||||
org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)"
|
||||
Eclipse-LazyStart: true
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
-Import-Package: com.ibm.icu.util
|
||||
+Import-Package: com.ibm.icu.util,
|
||||
+ org.eclipse.equinox.internal.simpleconfigurator.utils
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Automatic-Module-Name: org.eclipse.pde.core
|
||||
diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
index fbd4b81..55cd40e 100644
|
||||
--- eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
+++ eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
|
||||
@@ -12,11 +12,12 @@
|
||||
package org.eclipse.pde.internal.core;
|
||||
|
||||
import java.io.*;
|
||||
-import java.net.MalformedURLException;
|
||||
-import java.net.URL;
|
||||
+import java.net.*;
|
||||
+import java.nio.file.Paths;
|
||||
import java.util.*;
|
||||
import org.eclipse.core.runtime.*;
|
||||
import org.eclipse.equinox.frameworkadmin.BundleInfo;
|
||||
+import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorUtils;
|
||||
import org.eclipse.equinox.p2.core.IProvisioningAgent;
|
||||
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
|
||||
import org.eclipse.equinox.p2.engine.*;
|
||||
@@ -29,6 +30,7 @@ import org.eclipse.osgi.service.resolver.*;
|
||||
import org.eclipse.pde.core.plugin.*;
|
||||
import org.eclipse.pde.internal.build.BundleHelper;
|
||||
import org.eclipse.pde.internal.core.plugin.PluginBase;
|
||||
+import org.eclipse.pde.internal.core.util.ManifestUtils;
|
||||
import org.osgi.framework.Constants;
|
||||
|
||||
/**
|
||||
@@ -108,7 +110,16 @@ public class P2Utils {
|
||||
try {
|
||||
URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath());
|
||||
File home = basePath.toFile();
|
||||
- BundleInfo bundles[] = getBundlesFromFile(bundlesTxt, home);
|
||||
+ List<org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo> ibundleList = SimpleConfiguratorUtils.readConfiguration(bundlesTxt, home.toURI());
|
||||
+ List<BundleInfo> bundleList = new ArrayList<>();
|
||||
+ for (org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo b : ibundleList) {
|
||||
+ URI location = b.getLocation();
|
||||
+ if (!location.isAbsolute() && b.getBaseLocation() != null)
|
||||
+ location = URIUtil.makeAbsolute(location, b.getBaseLocation());
|
||||
+ BundleInfo binfo = new BundleInfo(b.getSymbolicName(), b.getVersion(), location, b.getStartLevel(), b.isMarkedAsStarted());
|
||||
+ bundleList.add(binfo);
|
||||
+ }
|
||||
+ BundleInfo[] bundles = bundleList.toArray(new BundleInfo[0]);
|
||||
if (bundles == null || bundles.length == 0) {
|
||||
return null;
|
||||
}
|
||||
@@ -140,11 +151,38 @@ public class P2Utils {
|
||||
try {
|
||||
File home = basePath.toFile();
|
||||
URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH));
|
||||
+ final List<BundleInfo> allSrcBundles = new ArrayList<>();
|
||||
+ try {
|
||||
+ for (File infoFile : SimpleConfiguratorUtils.getInfoFiles()) {
|
||||
+ File pluginsDir = Paths.get(infoFile.getParent(), "plugins").toFile(); //$NON-NLS-1$
|
||||
+ File[] sourceJars = pluginsDir.listFiles((dir, name) -> {
|
||||
+ return name.matches(".*\\.source_.*\\.jar$"); //$NON-NLS-1$
|
||||
+ });
|
||||
+ for (File sourceJar : sourceJars) {
|
||||
+ Map<String, String> manifest;
|
||||
+ try {
|
||||
+ manifest = ManifestUtils.loadManifest(sourceJar);
|
||||
+ final String bsn = manifest.get(Constants.BUNDLE_SYMBOLICNAME);
|
||||
+ final String version = manifest.get(Constants.BUNDLE_VERSION);
|
||||
+ BundleInfo info = new BundleInfo(bsn, version, sourceJar.toURI(), -1, false);
|
||||
+ allSrcBundles.add(info);
|
||||
+ } catch (CoreException e) {
|
||||
+ // continue
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ } catch (URISyntaxException e) {
|
||||
+ // continue
|
||||
+ }
|
||||
+
|
||||
BundleInfo srcBundles[] = getBundlesFromFile(srcBundlesTxt, home);
|
||||
- if (srcBundles == null || srcBundles.length == 0) {
|
||||
+ if (srcBundles != null && srcBundles.length > 0) {
|
||||
+ allSrcBundles.addAll(Arrays.asList(srcBundles));
|
||||
+ }
|
||||
+ if (allSrcBundles.size() == 0) {
|
||||
return null;
|
||||
}
|
||||
- return srcBundles;
|
||||
+ return allSrcBundles.toArray(new BundleInfo[0]);
|
||||
} catch (MalformedURLException e) {
|
||||
PDECore.log(e);
|
||||
return null;
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# This script is used to be a dummy script for old
|
||||
# packagers which have scriptlet code which runs the
|
||||
# reconciler.
|
||||
# This file should be removed after a coupld of update
|
||||
# cycles.
|
||||
exit 0
|
|
@ -0,0 +1,35 @@
|
|||
--- 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 @@
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<dependencies>
|
||||
- <dependency>
|
||||
+ <!-- dependency>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
@@ -492,19 +492,19 @@
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-sourceref-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
- </dependency>
|
||||
+ </dependency-->
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>${qualifier.format}</format>
|
||||
- <timestampProvider>jgit</timestampProvider>
|
||||
+ <!--timestampProvider>jgit</timestampProvider-->
|
||||
<jgit.ignore>
|
||||
pom.xml
|
||||
</jgit.ignore>
|
||||
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
|
||||
- <sourceReferences>
|
||||
+ <!--sourceReferences>
|
||||
<generate>true</generate>
|
||||
- </sourceReferences>
|
||||
+ </sourceReferences-->
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
</archive>
|
|
@ -0,0 +1,197 @@
|
|||
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
index 7e1f520..734dd10 100644
|
||||
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
@@ -418,6 +418,36 @@
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="arm"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="aarch64"
|
||||
+ 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"
|
||||
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"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.arm"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="arm"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
+ fragment="true"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.swt.gtk.linux.aarch64"
|
||||
+ os="linux"
|
||||
+ ws="gtk"
|
||||
+ arch="aarch64"
|
||||
+ download-size="0"
|
||||
+ install-size="0"
|
||||
+ version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
--- 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>
|
||||
</profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.ppc64</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <modules>
|
||||
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
|
||||
+ </modules>
|
||||
+ </profile>
|
||||
+ <profile>
|
||||
+ <id>build-native-launchers-gtk.linux.s390x</id>
|
||||
+ <activation>
|
||||
+ <property>
|
||||
+ <name>native</name>
|
||||
+ <value>gtk.linux.s390x</value>
|
||||
+ </property>
|
||||
+ </activation>
|
||||
+ <modules>
|
||||
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
|
||||
+ </modules>
|
||||
+ </profile>
|
||||
</profiles>
|
||||
|
||||
<modules>
|
|
@ -0,0 +1,159 @@
|
|||
From aabcf5acff194b807c4d0bcf68425c3452c90339 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Fri, 12 Sep 2014 10:27:14 -0400
|
||||
Subject: [PATCH] Add support for regenerating bundle versions for symlinks.
|
||||
|
||||
When the version field in a bundle info file corresponds to a bundle
|
||||
whose location is a symbolic link, the correct version should be
|
||||
regenerated every time, in case a change has occured.
|
||||
|
||||
Change-Id: Ifbe8efed2218a8a1250fd1ac59f0cdd6bdd5f309
|
||||
---
|
||||
.../META-INF/MANIFEST.MF | 1 +
|
||||
.../utils/SimpleConfiguratorUtils.java | 106 ++++++++++++++++++++-
|
||||
2 files changed, 106 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
|
||||
index d88d0a6..07fe087 100644
|
||||
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
|
||||
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
|
||||
@@ -9,6 +9,7 @@ Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Import-Package: org.eclipse.osgi.framework.console;version="1.0.0";resolution:=optional,
|
||||
org.eclipse.osgi.service.datalocation;version="1.0.0";resolution:=optional,
|
||||
+ org.eclipse.osgi.util;version="1.1.0",
|
||||
org.osgi.framework;version="1.3.0",
|
||||
org.osgi.framework.namespace;version="1.0.0",
|
||||
org.osgi.framework.wiring;version="1.2.0",
|
||||
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
||||
index 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;
|
||||
import java.net.*;
|
||||
import java.nio.file.Files;
|
||||
import java.util.*;
|
||||
+import java.util.jar.JarFile;
|
||||
+import java.util.zip.ZipEntry;
|
||||
+import java.util.zip.ZipFile;
|
||||
import org.eclipse.equinox.internal.simpleconfigurator.Activator;
|
||||
-import org.osgi.framework.Version;
|
||||
+import org.eclipse.osgi.util.ManifestElement;
|
||||
+import org.osgi.framework.*;
|
||||
|
||||
public class SimpleConfiguratorUtils {
|
||||
|
||||
@@ -277,6 +281,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);
|
||||
+ // 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
|
||||
+ Dictionary<String, String> manifest = getOSGiManifest(absLoc);
|
||||
+ version = manifest.get(Constants.BUNDLE_VERSION);
|
||||
+ }
|
||||
+ }
|
||||
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 {
|
||||
}
|
||||
return regularTimestamp;
|
||||
}
|
||||
+
|
||||
+ private static Dictionary<String, String> getOSGiManifest(URI location) {
|
||||
+ if (location == null)
|
||||
+ return null;
|
||||
+ // if we have a file-based URL that doesn't end in ".jar" then...
|
||||
+ if (FILE_SCHEME.equals(location.getScheme()))
|
||||
+ return basicLoadManifest(URIUtil.toFile(location));
|
||||
+
|
||||
+ try {
|
||||
+ URL url = new URL("jar:" + location.toString() + "!/"); //$NON-NLS-1$//$NON-NLS-2$
|
||||
+ JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
|
||||
+ ZipFile jar = jarConnection.getJarFile();
|
||||
+
|
||||
+ try {
|
||||
+ ZipEntry entry = jar.getEntry(JarFile.MANIFEST_NAME);
|
||||
+ if (entry == null)
|
||||
+ return null;
|
||||
+
|
||||
+ Map<String, String> manifest = ManifestElement.parseBundleManifest(jar.getInputStream(entry), null);
|
||||
+ return manifestToProperties(manifest);
|
||||
+ } catch (BundleException e) {
|
||||
+ return null;
|
||||
+ } finally {
|
||||
+ jar.close();
|
||||
+ }
|
||||
+ } catch (IOException e) {
|
||||
+ if (System.getProperty("osgi.debug") != null) { //$NON-NLS-1$
|
||||
+ System.err.println("location=" + location); //$NON-NLS-1$
|
||||
+ e.printStackTrace();
|
||||
+ }
|
||||
+ }
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
+ private static Dictionary<String, String> basicLoadManifest(File bundleLocation) {
|
||||
+ InputStream manifestStream = null;
|
||||
+ ZipFile jarFile = null;
|
||||
+ try {
|
||||
+ try {
|
||||
+ // Handle a JAR'd bundle
|
||||
+ if (bundleLocation.isFile()) {
|
||||
+ jarFile = new ZipFile(bundleLocation, ZipFile.OPEN_READ);
|
||||
+ ZipEntry manifestEntry = jarFile.getEntry(JarFile.MANIFEST_NAME);
|
||||
+ if (manifestEntry != null) {
|
||||
+ manifestStream = jarFile.getInputStream(manifestEntry);
|
||||
+ }
|
||||
+ } else {
|
||||
+ // we have a directory-based bundle
|
||||
+ File bundleManifestFile = new File(bundleLocation, JarFile.MANIFEST_NAME);
|
||||
+ if (bundleManifestFile.exists())
|
||||
+ manifestStream = new BufferedInputStream(new FileInputStream(new File(bundleLocation, JarFile.MANIFEST_NAME)));
|
||||
+ }
|
||||
+ } catch (IOException e) {
|
||||
+ //ignore
|
||||
+ }
|
||||
+
|
||||
+ try {
|
||||
+ Map<String, String> manifest = ManifestElement.parseBundleManifest(manifestStream, null);
|
||||
+ return manifestToProperties(manifest);
|
||||
+ } catch (IOException ioe) {
|
||||
+ return null;
|
||||
+ } catch (BundleException e) {
|
||||
+ return null;
|
||||
+ }
|
||||
+ } finally {
|
||||
+ try {
|
||||
+ if (manifestStream != null)
|
||||
+ manifestStream.close();
|
||||
+ } catch (IOException e1) {
|
||||
+ //Ignore
|
||||
+ }
|
||||
+ try {
|
||||
+ if (jarFile != null)
|
||||
+ jarFile.close();
|
||||
+ } catch (IOException e2) {
|
||||
+ //Ignore
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ private static Dictionary<String, String> manifestToProperties(Map<String, String> d) {
|
||||
+ Iterator<String> iter = d.keySet().iterator();
|
||||
+ Dictionary<String, String> result = new Hashtable<String, String>();
|
||||
+ while (iter.hasNext()) {
|
||||
+ String key = iter.next();
|
||||
+ result.put(key, d.get(key));
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.5.0
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
--- 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">
|
|
@ -0,0 +1,320 @@
|
|||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2017-04-19 12:47:51.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2017-04-19 20:15:38.781348810 +0100
|
||||
@@ -39,21 +39,6 @@
|
||||
arg1="${testPlugin}"
|
||||
arg2="org.eclipse.equinox.p2.tests.discovery" />
|
||||
</condition>
|
||||
- <condition
|
||||
- property="extraIU"
|
||||
- value="org.eclipse.osgi.compatibility.plugins.feature.feature.group">
|
||||
- <or>
|
||||
- <equals
|
||||
- arg1="${testPlugin}"
|
||||
- arg2="org.eclipse.osgi.tests" />
|
||||
- <equals
|
||||
- arg1="${testPlugin}"
|
||||
- arg2="org.eclipse.pde.ui.tests" />
|
||||
- <equals
|
||||
- arg1="${testPlugin}"
|
||||
- arg2="org.eclipse.pde.api.tools.tests" />
|
||||
- </or>
|
||||
- </condition>
|
||||
|
||||
<antcall target="setupRepo" />
|
||||
<antcall target="${setupTarget}" />
|
||||
@@ -61,7 +46,7 @@
|
||||
<antcall target="installPreferences">
|
||||
<param
|
||||
name="eclipse-home"
|
||||
- value="${eclipse-home}/eclipse" />
|
||||
+ value="${eclipse-home}" />
|
||||
</antcall>
|
||||
<antcall target="installExtraPlugins" />
|
||||
<antcall target="installTestPlugins" />
|
||||
@@ -96,19 +81,6 @@
|
||||
name="setupRepo"
|
||||
depends="init"
|
||||
unless="testRepoCreated">
|
||||
- <mkdir dir="${repoLocation}" />
|
||||
- <exec
|
||||
- dir="${basedir}"
|
||||
- executable="unzip"
|
||||
- failonerror="false"
|
||||
- resultproperty="unzipResultCode">
|
||||
- <arg value="-o" />
|
||||
- <arg value="-qq" />
|
||||
- <arg value="${repoZip}" />
|
||||
- <arg value="-d" />
|
||||
- <arg value="${repoLocation}" />
|
||||
- </exec>
|
||||
- <echo message="unzip resultcode: ${unzipResultCode}" />
|
||||
<!-- TODO: can do more checking here, if successful, before we set to value -->
|
||||
<property
|
||||
name="testRepoCreated"
|
||||
@@ -128,8 +100,9 @@
|
||||
message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />
|
||||
<echo message="Deleting existing ${eclipse-home}, if any." />
|
||||
<delete
|
||||
- dir="${eclipse-home}"
|
||||
- verbose="false" />
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${eclipse-home}" followsymlinks="false" />
|
||||
+ </delete>
|
||||
<echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />
|
||||
<exec
|
||||
dir="${install}"
|
||||
@@ -155,9 +128,9 @@
|
||||
message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />
|
||||
<echo message="Deleting existing ${eclipse-home}, if any." />
|
||||
<delete
|
||||
- dir="${eclipse-home}"
|
||||
- verbose="false" />
|
||||
-
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${eclipse-home}" followsymlinks="false" />
|
||||
+ </delete>
|
||||
<echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />
|
||||
<exec
|
||||
dir="${install}"
|
||||
@@ -309,8 +282,9 @@
|
||||
message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />
|
||||
<!-- remove eclipse home directory, to be sure completely fresh -->
|
||||
<delete
|
||||
- verbose="false"
|
||||
- dir="${platformLocation}/eclipse" />
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />
|
||||
+ </delete>
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
executable="unzip">
|
||||
@@ -333,11 +307,10 @@
|
||||
<fail
|
||||
unless="platformArchiveExists"
|
||||
message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />
|
||||
-
|
||||
-
|
||||
<delete
|
||||
- verbose="false"
|
||||
- dir="${platformLocation}/eclipse" />
|
||||
+ removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
|
||||
+ <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />
|
||||
+ </delete>
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
executable="tar">
|
||||
@@ -561,7 +534,7 @@
|
||||
unless="currentUpdateSite">
|
||||
<property
|
||||
name="currentUpdateSite"
|
||||
- value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" />
|
||||
+ value="file:${repoLocation}" />
|
||||
</target>
|
||||
<target
|
||||
name="initStreamSpecificProperties"
|
||||
@@ -808,7 +781,7 @@
|
||||
|
||||
<target
|
||||
name="init"
|
||||
- depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive"
|
||||
+ depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initBasicDirectories, initCurrentUpdateSite, initOSes, initPlatformArhiveName, setRuntimeArchive"
|
||||
unless="testingIsInitialized">
|
||||
|
||||
<property environment="env" />
|
||||
@@ -823,7 +796,7 @@
|
||||
|
||||
<property
|
||||
name="current.build.repo"
|
||||
- value="http://${DOWNLOAD_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}" />
|
||||
+ value="file:${repoLocation}" />
|
||||
<echo message="current.build.repo: ${current.build.repo}" />
|
||||
|
||||
|
||||
@@ -1887,6 +1860,7 @@
|
||||
-->
|
||||
<antcall target="quickTests" />
|
||||
<antcall target="longRunningTests" />
|
||||
+ <antcall target="mergeAllTestResults" />
|
||||
|
||||
</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"/>
|
||||
+ <!-- Aggregate XML report files -->
|
||||
+ <junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">
|
||||
+ <fileset dir="${results}/split-xml" includes="*.xml" />
|
||||
+ </junitreport>
|
||||
+ <!-- Generate top-level HTML report -->
|
||||
+ <xslt style="${executionDir}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
|
||||
+ </target>
|
||||
+
|
||||
<!--
|
||||
admittedly, not quite all of 'platform', but for
|
||||
now serves dual purpose of a "short set" of tests, that area
|
||||
@@ -2065,8 +2055,6 @@
|
||||
<target
|
||||
name="platform"
|
||||
depends="init">
|
||||
- <!-- was removed, temporarily, see bug 400385 -->
|
||||
- <antcall target="relEng" />
|
||||
|
||||
<antcall target="ant" />
|
||||
<antcall target="antui" />
|
||||
@@ -2099,7 +2087,6 @@
|
||||
<antcall target="e4CssSwt" />
|
||||
<antcall target="e4UI" />
|
||||
<antcall target="equinoxds" />
|
||||
- <antcall target="equinoxp2discovery" />
|
||||
<antcall target="bidi" />
|
||||
<antcall target="ltkuirefactoringtests" />
|
||||
<antcall target="ltkcorerefactoringtests" />
|
||||
@@ -2115,7 +2102,6 @@
|
||||
<antcall target="osgi" />
|
||||
<antcall target="coreresources" />
|
||||
<antcall target="equinoxp2" />
|
||||
- <antcall target="teamcvs" />
|
||||
<antcall target="jface" />
|
||||
<antcall target="ui" />
|
||||
<antcall target="uiperformance" />
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig 2017-03-03 12:36:38.576140783 +0000
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2017-03-03 12:40:39.324608342 +0000
|
||||
@@ -6,6 +6,45 @@
|
||||
# version.
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=437069
|
||||
|
||||
+function findXvncAndSetDisplay() {
|
||||
+ # Try to find Xvnc
|
||||
+ xvnc=
|
||||
+ if [ -a /usr/bin/Xvnc ]
|
||||
+ then
|
||||
+ xvnc=/usr/bin/Xvnc
|
||||
+ setupXvnc
|
||||
+ else
|
||||
+ if [ -a /usr/X11/bin/Xvnc ]
|
||||
+ then
|
||||
+ xvnc=/usr/X11/bin/Xvnc
|
||||
+ setupXvnc
|
||||
+ else
|
||||
+ echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0"
|
||||
+ DISPLAY=$($HOST):0.0
|
||||
+ fi
|
||||
+ fi
|
||||
+ export DISPLAY
|
||||
+}
|
||||
+
|
||||
+function setupXvnc() {
|
||||
+ # Pick a high display number.
|
||||
+ port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
|
||||
+ echo localhost > Xvnc.cfg
|
||||
+ echo "Setting up Xvnc on port ${port} with password VNCpassword1"
|
||||
+ $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
|
||||
+ Xvncpid=$!
|
||||
+ DISPLAY=$($HOST):$port
|
||||
+}
|
||||
+
|
||||
+function cleanupXvnc() {
|
||||
+ # Clean up if we used Xvnc
|
||||
+ if [ -e Xvnc.cfg ]
|
||||
+ then
|
||||
+ kill $Xvncpid
|
||||
+ rm Xvnc.cfg
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
echo "command line as passed into $(basename ${0}): ${*}"
|
||||
echo "command line (quoted) as passed into $(basename ${0}): ${@}"
|
||||
|
||||
@@ -166,6 +205,8 @@
|
||||
if [[ "true" == "${START_WINDOW_MGT}" ]]
|
||||
then
|
||||
./startWindowManager.sh
|
||||
+else
|
||||
+ findXvncAndSetDisplay
|
||||
fi
|
||||
|
||||
# During production tests, we define 'testedPlatform' as a combination of
|
||||
@@ -199,6 +240,7 @@
|
||||
echo "platformString: ${platformString}"
|
||||
echo "testedPlatform: ${testedPlatform}"
|
||||
|
||||
+ANT_OPTS="${ANT_OPTS} -DtestedPlatform=${testedPlatform}"
|
||||
# -Dtimeout=300000 "${ANT_OPTS}"
|
||||
if [[ -n "${extdirproperty}" ]]
|
||||
then
|
||||
@@ -209,4 +251,4 @@
|
||||
$jvm ${ANT_OPTS} ${platformArgString} -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml ${ANT_OPTS} ${platformParmString} -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger $tests 2>&1 | tee $consolelogs
|
||||
fi
|
||||
|
||||
-
|
||||
+cleanupXvnc
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml.orig 2017-04-19 19:39:39.382960089 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml 2017-04-19 20:04:36.088575077 +0100
|
||||
@@ -137,6 +137,15 @@
|
||||
<property
|
||||
name="formatter"
|
||||
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
|
||||
+ <!-- default product/application to launch -->
|
||||
+ <condition property="testproduct.if.available" value="-product ${testProduct}">
|
||||
+ <isset property="testProduct" />
|
||||
+ </condition>
|
||||
+ <property name="testproduct.if.available" value="" />
|
||||
+ <condition property="testapplication.if.available" value="-testApplication ${testApplication}">
|
||||
+ <isset property="testApplication" />
|
||||
+ </condition>
|
||||
+ <property name="testapplication.if.available" value="" />
|
||||
|
||||
<tstamp prefix="NOW" />
|
||||
<property
|
||||
@@ -196,6 +205,17 @@
|
||||
</target>
|
||||
|
||||
<target
|
||||
+ name="swtbot-test"
|
||||
+ description="Eclipse application used to launch SWTBOT plugin tests."
|
||||
+ depends="init">
|
||||
+ <antcall target="${launchTarget}">
|
||||
+ <param
|
||||
+ name="application"
|
||||
+ value="org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication" />
|
||||
+ </antcall>
|
||||
+ </target>
|
||||
+
|
||||
+ <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}" />
|
1992
eclipse.spec
1992
eclipse.spec
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,161 @@
|
|||
--- eclipse.platform/ant/org.eclipse.ant.launching/build.properties.orig 2017-01-09 10:24:16.258243377 +0000
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.launching/build.properties 2017-01-09 10:25:08.302620557 +0000
|
||||
@@ -20,18 +20,14 @@
|
||||
about.html
|
||||
|
||||
jars.compile.order = .,\
|
||||
- lib/loggers.jar
|
||||
-# antdebug.jar and remote.jar are compiled locally using 1.6, see bug 495617:
|
||||
-# lib/antdebug.jar,\
|
||||
-# lib/remote.jar
|
||||
+ lib/antdebug.jar,\
|
||||
+ lib/loggers.jar,\
|
||||
+ lib/remote.jar
|
||||
source.lib/loggers.jar = loggers/
|
||||
output.lib/loggers.jar = loggers_bin/
|
||||
-extra.lib/loggers.jar = lib/antdebug.jar
|
||||
-#source.lib/antdebug.jar = common/
|
||||
-#output.lib/antdebug.jar = common_bin/
|
||||
-#source.lib/remote.jar = remote/
|
||||
-#output.lib/remote.jar = remote_bin/
|
||||
-src.includes = about.html,\
|
||||
- remote/,\
|
||||
- common/
|
||||
+source.lib/antdebug.jar = common/
|
||||
+output.lib/antdebug.jar = common_bin/
|
||||
+source.lib/remote.jar = remote/
|
||||
+output.lib/remote.jar = remote_bin/
|
||||
+src.includes = about.html
|
||||
javacWarnings..=-unavoidableGenericProblems
|
||||
--- eclipse.platform/ant/org.eclipse.ant.ui/build.properties.orig 2017-04-03 18:40:41.033489412 +0100
|
||||
+++ eclipse.platform/ant/org.eclipse.ant.ui/build.properties 2017-04-03 18:43:21.614928391 +0100
|
||||
@@ -14,8 +14,8 @@
|
||||
source.lib/antrunner.jar = Ant Runner Support/
|
||||
output.lib/antrunner.jar = ant_runner_support_bin/
|
||||
# Compiled with 1.6 locally, see bug 495617:
|
||||
-#source.lib/remoteAnt.jar = Remote Ant Support/
|
||||
-#output.lib/remoteAnt.jar = remote_support_bin/
|
||||
+source.lib/remoteAnt.jar = Remote Ant Support/
|
||||
+output.lib/remoteAnt.jar = remote_support_bin/
|
||||
src.includes = about.html,\
|
||||
about_files/,\
|
||||
Remote Ant Support/
|
||||
@@ -31,6 +31,5 @@
|
||||
lib/antrunner.jar,\
|
||||
lib/remoteAnt.jar,\
|
||||
css/
|
||||
-jars.compile.order=.,lib/antrunner.jar
|
||||
-# ,lib/remoteAnt.jar
|
||||
+jars.compile.order=.,lib/antrunner.jar,lib/remoteAnt.jar
|
||||
javacWarnings..=-unavoidableGenericProblems
|
||||
--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml.orig 2017-01-09 13:30:24.238066571 +0000
|
||||
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml 2017-01-09 13:31:19.228456113 +0000
|
||||
@@ -1,106 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<project name="org.eclipse.jdt.doc.user" default="build.jars" basedir=".">
|
||||
+<project name="org.eclipse.jdt.doc.user" default="build.index" basedir=".">
|
||||
|
||||
- <property name="version.suffix" value="3.3.0" />
|
||||
- <property name="full.name" value="org.eclipse.jdt.doc.user_${version.suffix}" />
|
||||
- <property name="bootclasspath" value="" />
|
||||
- <property name="basews" value="${ws}" />
|
||||
- <property name="baseos" value="${os}" />
|
||||
- <property name="basearch" value="${arch}" />
|
||||
- <property name="basenl" value="${nl}" />
|
||||
- <property name="javacFailOnError" value="false" />
|
||||
- <property name="javacDebugInfo" value="on" />
|
||||
- <property name="javacVerbose" value="true" />
|
||||
- <property name="javacSource" value="1.3" />
|
||||
- <property name="javacTarget" value="1.1" />
|
||||
-
|
||||
- <target name="init" depends="properties">
|
||||
- <property name="temp.folder" value="${basedir}/temp.folder" />
|
||||
- <property name="plugin.destination" value="${basedir}" />
|
||||
- <property name="build.result.folder" value="${basedir}" />
|
||||
- <available file="${basedir}/doc.zip" property="doc.zip.present" />
|
||||
- <condition property="p2.publish.parts" value="true">
|
||||
- <istrue value="${p2.gathering}" />
|
||||
- </condition>
|
||||
- </target>
|
||||
-
|
||||
- <target name="properties" if="eclipse.running">
|
||||
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jdt.doc.user for an update site.">
|
||||
- <delete dir="${temp.folder}" />
|
||||
- <mkdir dir="${temp.folder}" />
|
||||
- <antcall target="build.jars" />
|
||||
- <antcall target="gather.bin.parts">
|
||||
- <param name="destination.temp.folder" value="${temp.folder}/" />
|
||||
- </antcall>
|
||||
- <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" whenempty="skip" />
|
||||
- <delete dir="${temp.folder}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
|
||||
- <antcall target="gather.bin.parts">
|
||||
- <param name="destination.temp.folder" value="${build.result.folder}" />
|
||||
- </antcall>
|
||||
- <eclipse.gatherBundle metadataRepository="${p2.build.repo}" artifactRepository="${p2.build.repo}" buildResultFolder="${build.result.folder}" targetFolder="${build.result.folder}/${full.name}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
|
||||
- <antcall target="build.index" />
|
||||
- <mkdir dir="${destination.temp.folder}/${full.name}" />
|
||||
- <copy todir="${destination.temp.folder}/${full.name}">
|
||||
- <fileset dir="${basedir}" includes="*.properties,*.xml,*.zip,*.html,*.htm,*.png,*.css,META-INF/**,index/**,concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**" excludes="build.properties,build.xml" />
|
||||
- </copy>
|
||||
- <eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jdt.doc.user.">
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
|
||||
+ <target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
|
||||
<help.buildHelpIndex manifest="plugin.xml" destination="." />
|
||||
</target>
|
||||
|
||||
- <target name="build.sources" depends="init">
|
||||
- </target>
|
||||
-
|
||||
- <target name="build.zips" depends="init">
|
||||
- </target>
|
||||
-
|
||||
- <target name="gather.sources" depends="init" if="destination.temp.folder">
|
||||
- </target>
|
||||
-
|
||||
- <target name="gather.logs" depends="init" if="destination.temp.folder">
|
||||
- </target>
|
||||
-
|
||||
- <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jdt.doc.user of all the zips, jars and logs created.">
|
||||
- <delete file="${plugin.destination}/${full.name}.jar" />
|
||||
- <delete file="${plugin.destination}/${full.name}.zip" />
|
||||
- <delete dir="${temp.folder}" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
|
||||
- <eclipse.convertPath fileSystemPath="D:/30workspace/org.eclipse.jdt.doc.user/" property="resourcePath" />
|
||||
- <eclipse.refreshLocal resource="${resourcePath}" depth="infinite" />
|
||||
- </target>
|
||||
-
|
||||
- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
|
||||
- <delete dir="${temp.folder}" />
|
||||
- <mkdir dir="${temp.folder}" />
|
||||
- <antcall target="build.jars" />
|
||||
- <antcall target="build.sources" />
|
||||
- <antcall target="gather.bin.parts">
|
||||
- <param name="destination.temp.folder" value="${temp.folder}/" />
|
||||
- </antcall>
|
||||
- <antcall target="gather.sources">
|
||||
- <param name="destination.temp.folder" value="${temp.folder}/" />
|
||||
- </antcall>
|
||||
- <delete>
|
||||
- <fileset dir="${temp.folder}" includes="**/*.bin.log" />
|
||||
- </delete>
|
||||
- <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" />
|
||||
- <delete dir="${temp.folder}" />
|
||||
- </target>
|
||||
-
|
||||
</project>
|
|
@ -1,7 +0,0 @@
|
|||
# RPM macros for eclipse packages.
|
||||
#
|
||||
|
||||
# There is no guarantee that %%{_libdir} will resolve properly on
|
||||
# noarch so we use this macro.
|
||||
%_eclipse_bits %(rpm --eval %{__isa_bits} | sed 's/32//')
|
||||
%_eclipse_base %{_prefix}/lib%{_eclipse_bits}/eclipse
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xsi:noNamespaceSchemaLocation="http://maven.apache.org/POM/4.0.0">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.eclipse.jdt</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>3.8.0.v_C03</version>
|
||||
<description>OSGi System Bundle %systemBundle</description>
|
||||
<!-- See https://issues.sonatype.org/browse/OSSRH-739 -->
|
||||
</project>
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xsi:noNamespaceSchemaLocation="http://maven.apache.org/POM/4.0.0">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.eclipse.osgi</groupId>
|
||||
<artifactId>org.eclipse.osgi</artifactId>
|
||||
<version>3.6.0.v20100517</version>
|
||||
<description>OSGi System Bundle %systemBundle</description>
|
||||
<!-- See https://issues.sonatype.org/browse/OSSRH-739 -->
|
||||
</project>
|
|
@ -1,27 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xsi:noNamespaceSchemaLocation="http://maven.apache.org/POM/4.0.0">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.eclipse.osgi</groupId>
|
||||
<artifactId>org.eclipse.osgi.services</artifactId>
|
||||
<version>3.2.100.v20100503</version>
|
||||
<description>OSGi Release 4.2.0 Services
|
||||
OSGi Service Platform Release 4.2.0 Service Interfaces and Classes</description>
|
||||
<!-- See https://issues.sonatype.org/browse/OSSRH-739 -->
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.osgi</groupId>
|
||||
<artifactId>org.eclipse.osgi</artifactId>
|
||||
<version>3.6.0.v20100517</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>2.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>org.osgi.foundation</artifactId>
|
||||
<version>1.2.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/bash
|
||||
echo "pdebuild was renamed into eclipse-pdebuild and moved into _bindir"
|
||||
exit 1;
|
1836
pre360changelog.txt
1836
pre360changelog.txt
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +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
|
||||
|
||||
+ 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");
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.eclipse.equinox.http</groupId>
|
||||
<artifactId>servlet</artifactId>
|
||||
<name>Http Services Servlet</name>
|
||||
<version>1.0.0-v20070606</version>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Eclipse Public License - v 1.0</name>
|
||||
<url>http://www.eclipse.org/org/documents/epl-v10.html</url>
|
||||
</license>
|
||||
</licenses>
|
||||
</project>
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
|||
d93c53bfaa0a09b8f57e86a588db7ebd eclipse-4.2.0-I20120405-1114-src.tar.bz2
|
||||
9bbd7b12c404f2500a9097f94c51a6f1 eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
|
||||
SHA512 (eclipse-platform-sources-I20180822-0800.tar.xz) = c1158fa81c21a1fe9d09fd814062e55623b4ceca34be9b44c50f917f14bab8643e29ec6d20879c01b107fb93e68de4af553edea0fb606add870230d0498a03ef
|
||||
SHA512 (org.eclipse.linuxtools.eclipse-build-23577466b35eaf62bee3b00090f4fbedc555b4e6.tar.xz) = d268ea945c33b997c79b390f9592c1139f52dc39ebdb7ea7155d41301459827f576389e20080462ad22f2aef833857626df983bbb2abe30845e79ca74a194bea
|
||||
|
|
Loading…
Reference in New Issue