View | Details | Raw Unified | Return to bug 244927
Collapse All | Expand All

(-)./Makefile (-6 / +6 lines)
Lines 2-13 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	eclipse
4
PORTNAME=	eclipse
5
PORTVERSION=	4.14
5
PORTVERSION=	4.15
6
CATEGORIES=	java devel
6
CATEGORIES=	java devel
7
7
8
# Update to git-tag on git.eclipse.org
8
# Update to eclipse.platform.releng.aggregator.git git-tag on git.eclipse.org
9
ECLIPSE_TAG=	R4_14
9
ECLIPSE_TAG=	R4_15
10
ECLIPSE_TSTAMP=	20191220-0429
10
ECLIPSE_TSTAMP=	20200318-1047
11
11
12
ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
12
ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
13
ECLIPSE_MODULES=jdt/eclipse.jdt \
13
ECLIPSE_MODULES=jdt/eclipse.jdt \
Lines 45-51 Link Here
45
DIST_SUBDIR=	${PORTNAME}
45
DIST_SUBDIR=	${PORTNAME}
46
46
47
MAINTAINER=	jonc@chen.org.nz
47
MAINTAINER=	jonc@chen.org.nz
48
COMMENT=	Eclipse IDE 2019-12
48
COMMENT=	Eclipse IDE 2020-03
49
49
50
LICENSE=	EPL
50
LICENSE=	EPL
51
51
Lines 62-68 Link Here
62
GH_ACCOUNT=	daemonblade
62
GH_ACCOUNT=	daemonblade
63
GH_PROJECT=	eclipse-maven-repo
63
GH_PROJECT=	eclipse-maven-repo
64
64
65
USE_JAVA=	8
65
USE_JAVA=	11+
66
66
67
DESKTOP_ENTRIES="Eclipse" \
67
DESKTOP_ENTRIES="Eclipse" \
68
		"${COMMENT}" \
68
		"${COMMENT}" \
(-)./distinfo (-53 / +53 lines)
Lines 1-53 Link Here
1
TIMESTAMP = 1577767743
1
TIMESTAMP = 1584679339
2
SHA256 (eclipse/eclipse.jdt-R4_14.tar.xz) = 5f577c57eb8cb4994a5d0e1e084d0bbb2f4e7277f6660e55281a5cb5c4f49fe3
2
SHA256 (eclipse/eclipse.jdt-R4_15.tar.xz) = e19048ee90c06306567f1cd676dd6eb39bc962c944b1f0252d042284f1908d88
3
SIZE (eclipse/eclipse.jdt-R4_14.tar.xz) = 37472
3
SIZE (eclipse/eclipse.jdt-R4_15.tar.xz) = 37572
4
SHA256 (eclipse/eclipse.jdt.core-R4_14.tar.xz) = 650cb2292e0be904ca8cea6658e598289e2c0f71a130e15bca742674d7f8db8e
4
SHA256 (eclipse/eclipse.jdt.core-R4_15.tar.xz) = b663e63962eff041615c13a06e28ed6e3e0afcc9e8560306f0e70d63f1009ca0
5
SIZE (eclipse/eclipse.jdt.core-R4_14.tar.xz) = 8532944
5
SIZE (eclipse/eclipse.jdt.core-R4_15.tar.xz) = 8551616
6
SHA256 (eclipse/eclipse.jdt.core.binaries-R4_14.tar.xz) = 14c823ee07fbf8fb8dfc7c597640da66d05c205753c0ceca80fafa63d1844c79
6
SHA256 (eclipse/eclipse.jdt.core.binaries-R4_15.tar.xz) = cdc2430eaedd9d140db2f20239c33aad3b74f5206106f40050947e0889f41e50
7
SIZE (eclipse/eclipse.jdt.core.binaries-R4_14.tar.xz) = 34417384
7
SIZE (eclipse/eclipse.jdt.core.binaries-R4_15.tar.xz) = 34416588
8
SHA256 (eclipse/eclipse.jdt.debug-R4_14.tar.xz) = ae5901055a7e4fec14d4a01e4825ef68c0abd449e79c146bce89d33a6324fa05
8
SHA256 (eclipse/eclipse.jdt.debug-R4_15.tar.xz) = f184afa9c033fdfc96ac3e3d97dc25257919d2de709adf646f2a9df7d53231cb
9
SIZE (eclipse/eclipse.jdt.debug-R4_14.tar.xz) = 1435944
9
SIZE (eclipse/eclipse.jdt.debug-R4_15.tar.xz) = 1449716
10
SHA256 (eclipse/eclipse.jdt.ui-R4_14.tar.xz) = 135bad844a43bf60c11d22ef4adf691445b35b06e24ad01304ae17d357b93325
10
SHA256 (eclipse/eclipse.jdt.ui-R4_15.tar.xz) = 1a5bd4c6b99ff55a3bac9d34cb2627a207240a90599d9aeb744e5066026949ec
11
SIZE (eclipse/eclipse.jdt.ui-R4_14.tar.xz) = 15020316
11
SIZE (eclipse/eclipse.jdt.ui-R4_15.tar.xz) = 15131660
12
SHA256 (eclipse/eclipse.pde.build-R4_14.tar.xz) = 9a62bed3f0def46d1bb22cd0e59ee6e2827d7c74ef0b35576e14dea81efedd85
12
SHA256 (eclipse/eclipse.pde.build-R4_15.tar.xz) = daf47aed01e96b92b2c102c5a036f337c9f6408a2e653d342a6cf24571270548
13
SIZE (eclipse/eclipse.pde.build-R4_14.tar.xz) = 868360
13
SIZE (eclipse/eclipse.pde.build-R4_15.tar.xz) = 868656
14
SHA256 (eclipse/eclipse.pde.ui-R4_14.tar.xz) = 8e6566eb0d6176e3ca7d1faef1b36504c450a7d894d9483597319b7b2bb1774c
14
SHA256 (eclipse/eclipse.pde.ui-R4_15.tar.xz) = b980c295042d96b93161e138d7a6f682a30882d1b4b73b6827286c154d4d7c3a
15
SIZE (eclipse/eclipse.pde.ui-R4_14.tar.xz) = 29827820
15
SIZE (eclipse/eclipse.pde.ui-R4_15.tar.xz) = 29829076
16
SHA256 (eclipse/eclipse.platform-R4_14.tar.xz) = fccccc8818ce8d43fff0e1e089df29cf6a31d23f5b1234e398eb1f34c83f5724
16
SHA256 (eclipse/eclipse.platform-R4_15.tar.xz) = be0586f49b875766dca009b227f412af799b316c856e1c1d9d674f9b3906d81a
17
SIZE (eclipse/eclipse.platform-R4_14.tar.xz) = 1369868
17
SIZE (eclipse/eclipse.platform-R4_15.tar.xz) = 1363244
18
SHA256 (eclipse/eclipse.platform.common-R4_14.tar.xz) = d0ed5aa143f81c22f4a031a96179c70790a43239717a4a8f1543d91f9a33ed05
18
SHA256 (eclipse/eclipse.platform.common-R4_15.tar.xz) = eea2d2f96d19a79401e64b279688d0ad6cca89a4d1ca2031609c4be2650e69d1
19
SIZE (eclipse/eclipse.platform.common-R4_14.tar.xz) = 34297556
19
SIZE (eclipse/eclipse.platform.common-R4_15.tar.xz) = 34958196
20
SHA256 (eclipse/eclipse.platform.debug-R4_14.tar.xz) = f1b1447ffa05bd13a448d2c1fc127d20e54a0662a0ba62f539a12b15d4b59e47
20
SHA256 (eclipse/eclipse.platform.debug-R4_15.tar.xz) = b5a853bc08970411db4c389d3f3ff23e229f0200d292d00323eb97986b94c869
21
SIZE (eclipse/eclipse.platform.debug-R4_14.tar.xz) = 1367732
21
SIZE (eclipse/eclipse.platform.debug-R4_15.tar.xz) = 1369696
22
SHA256 (eclipse/eclipse.platform.releng-R4_14.tar.xz) = d4802b92df3c4a303741e8b31edb010464cba8eae5ff39ce502cb198921592be
22
SHA256 (eclipse/eclipse.platform.releng-R4_15.tar.xz) = 29b4e8b0d2289bc052be8ae3162ffbcfa6bac6749f6a3b24ab78c9db731277ff
23
SIZE (eclipse/eclipse.platform.releng-R4_14.tar.xz) = 408388
23
SIZE (eclipse/eclipse.platform.releng-R4_15.tar.xz) = 408380
24
SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_14.tar.xz) = 1192f7fd4746d6083dd9a3bdfb49fa52703e8fa848096a73fe7d0ee3ddc1dbdd
24
SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_15.tar.xz) = 383e5f9a6267e1d478dfbe7f3b909f8a63d9518465d552bddf9a8d338d2c1b9f
25
SIZE (eclipse/eclipse.platform.releng.aggregator-R4_14.tar.xz) = 689936
25
SIZE (eclipse/eclipse.platform.releng.aggregator-R4_15.tar.xz) = 693064
26
SHA256 (eclipse/eclipse.platform.resources-R4_14.tar.xz) = cbd69d80478aca49d61f5c676a09f8098310c10833f69612699bc8b3d757f0af
26
SHA256 (eclipse/eclipse.platform.resources-R4_15.tar.xz) = 12846615fcc84abb7df669b674065ebf5698a848cf3391d912803f2045364a7e
27
SIZE (eclipse/eclipse.platform.resources-R4_14.tar.xz) = 818836
27
SIZE (eclipse/eclipse.platform.resources-R4_15.tar.xz) = 813408
28
SHA256 (eclipse/eclipse.platform.runtime-R4_14.tar.xz) = a3487152397f997cb47a403bc64e270b5db17a08a5ce3b3223c5d77ae7057745
28
SHA256 (eclipse/eclipse.platform.runtime-R4_15.tar.xz) = d6364d57cafcb6c386dfbb59b4f3aa445d0fe0e6abe4c7986d2336acd50fcffb
29
SIZE (eclipse/eclipse.platform.runtime-R4_14.tar.xz) = 433100
29
SIZE (eclipse/eclipse.platform.runtime-R4_15.tar.xz) = 431232
30
SHA256 (eclipse/eclipse.platform.swt-R4_14.tar.xz) = 1078174b76ea8d02f879956daa88c9d55805d51b3c02fe34ddf4e2239c4f2eb8
30
SHA256 (eclipse/eclipse.platform.swt-R4_15.tar.xz) = 2d836da78db0dcebd315f98dc3bff8ad1df8ddd81adad381d8ad9ffb22efdc6f
31
SIZE (eclipse/eclipse.platform.swt-R4_14.tar.xz) = 6142300
31
SIZE (eclipse/eclipse.platform.swt-R4_15.tar.xz) = 6089636
32
SHA256 (eclipse/eclipse.platform.swt.binaries-R4_14.tar.xz) = b030736e2a9e8e8c40affcd75e9bd78b76f379dbb8d406b51294e8f66ea5e386
32
SHA256 (eclipse/eclipse.platform.swt.binaries-R4_15.tar.xz) = ddf35a6902924b2a3351edba52a5b28ab744da9fe539a4b2d64dcaffa1164d00
33
SIZE (eclipse/eclipse.platform.swt.binaries-R4_14.tar.xz) = 606164
33
SIZE (eclipse/eclipse.platform.swt.binaries-R4_15.tar.xz) = 613600
34
SHA256 (eclipse/eclipse.platform.team-R4_14.tar.xz) = 1753b5cd9df8dd47f167ee0d33cf63f6737389296f8ece95b0790d68890273b3
34
SHA256 (eclipse/eclipse.platform.team-R4_15.tar.xz) = abcdc28136d81f2f9a53fc9c88eef1ec9dd71fb08e774b6cb1e3996d07b0586c
35
SIZE (eclipse/eclipse.platform.team-R4_14.tar.xz) = 4633852
35
SIZE (eclipse/eclipse.platform.team-R4_15.tar.xz) = 4634640
36
SHA256 (eclipse/eclipse.platform.text-R4_14.tar.xz) = 2d48c1d855e520227d3a08cc54dad70dafab4563cacafa331d5cddcb36280325
36
SHA256 (eclipse/eclipse.platform.text-R4_15.tar.xz) = ed5f134436b202096f6873e8cda6fe7a264b1942d575c9cc7f0ea4f4c132ec68
37
SIZE (eclipse/eclipse.platform.text-R4_14.tar.xz) = 1304152
37
SIZE (eclipse/eclipse.platform.text-R4_15.tar.xz) = 1306572
38
SHA256 (eclipse/eclipse.platform.ua-R4_14.tar.xz) = f5f97ad6797a4fa66457a36ec11dc27d09fa9d22c735d44cd4735f39acbbd714
38
SHA256 (eclipse/eclipse.platform.ua-R4_15.tar.xz) = 19af7c2ab16776779170405db0d732044119343bb6a59e0ecd63cfc809111d2d
39
SIZE (eclipse/eclipse.platform.ua-R4_14.tar.xz) = 4532772
39
SIZE (eclipse/eclipse.platform.ua-R4_15.tar.xz) = 4619436
40
SHA256 (eclipse/eclipse.platform.ui-R4_14.tar.xz) = 594c8fe38ba6eeb3c6844a460e7bbc406a633030b192fea40887d2190ebdea08
40
SHA256 (eclipse/eclipse.platform.ui-R4_15.tar.xz) = 47c81e6245c49867837e71cd5f15b67846ac421c644251737d8210a974e8f4ae
41
SIZE (eclipse/eclipse.platform.ui-R4_14.tar.xz) = 5949320
41
SIZE (eclipse/eclipse.platform.ui-R4_15.tar.xz) = 5960144
42
SHA256 (eclipse/eclipse.platform.ui.tools-R4_14.tar.xz) = 112ab40eb5db342c6948dd36c94fc8637b4d01f9470068e6bf1aa06563c2cc59
42
SHA256 (eclipse/eclipse.platform.ui.tools-R4_15.tar.xz) = 7b90c081376125df0c3029121b3c05dda39e18375df4deba9c01b73da3cae100
43
SIZE (eclipse/eclipse.platform.ui.tools-R4_14.tar.xz) = 319832
43
SIZE (eclipse/eclipse.platform.ui.tools-R4_15.tar.xz) = 319124
44
SHA256 (eclipse/rt.equinox.binaries-R4_14.tar.xz) = 2e419d56e2b5ed4d9a85bfc47e752061c5efffb9042db5b76b96b8777d55b73a
44
SHA256 (eclipse/rt.equinox.binaries-R4_15.tar.xz) = 3e5e0ec55eb3c1933e47c637c8b75db85821e705aaa672d1848c5442fd67b937
45
SIZE (eclipse/rt.equinox.binaries-R4_14.tar.xz) = 298664
45
SIZE (eclipse/rt.equinox.binaries-R4_15.tar.xz) = 298624
46
SHA256 (eclipse/rt.equinox.bundles-R4_14.tar.xz) = 74dab60a8c1a3e788b07423e9eb0adc3ff1fd937e68c148dc31f7b0fbf7142bf
46
SHA256 (eclipse/rt.equinox.bundles-R4_15.tar.xz) = f4b02d3c5f516a2630a77db7b4e181d1d893aa3a80461479a5693709825e649b
47
SIZE (eclipse/rt.equinox.bundles-R4_14.tar.xz) = 1152024
47
SIZE (eclipse/rt.equinox.bundles-R4_15.tar.xz) = 1152256
48
SHA256 (eclipse/rt.equinox.framework-R4_14.tar.xz) = 014150fd8d9552e9664ef7a1e29e760388cf592d4b0b52574566e96da0fa0ad4
48
SHA256 (eclipse/rt.equinox.framework-R4_15.tar.xz) = a834e4bfd80b3c5ea483dcdc584b0adde4bb447214d153f4d4c3f519177b76ec
49
SIZE (eclipse/rt.equinox.framework-R4_14.tar.xz) = 2820048
49
SIZE (eclipse/rt.equinox.framework-R4_15.tar.xz) = 2822776
50
SHA256 (eclipse/rt.equinox.p2-R4_14.tar.xz) = 36dc7555430277635627d214cea650c13db703fa26302bb47dc3719f68feff67
50
SHA256 (eclipse/rt.equinox.p2-R4_15.tar.xz) = c90e988c186186f0f3cd174e1e1b15829c6d6e2fefcc2df71687205b1c3e3920
51
SIZE (eclipse/rt.equinox.p2-R4_14.tar.xz) = 48492172
51
SIZE (eclipse/rt.equinox.p2-R4_15.tar.xz) = 48486692
52
SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.14_GH0.tar.gz) = c9c2045ee30995765d6a64d53258289aa413ecaf4a81dafe19ab204329aabe89
52
SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.15_GH0.tar.gz) = 666ba1ed30bf3b2d51c7b62c092c93fc3a6abf049c11eded2de9bc7e43564ef1
53
SIZE (eclipse/daemonblade-eclipse-maven-repo-4.14_GH0.tar.gz) = 188740301
53
SIZE (eclipse/daemonblade-eclipse-maven-repo-4.15_GH0.tar.gz) = 185792514
(-)./files/eclipse.in (-1 / +1 lines)
Lines 6-9 Link Here
6
#
6
#
7
# $FreeBSD$
7
# $FreeBSD$
8
#
8
#
9
exec %%DATADIR%%/eclipse "$@"
9
JAVA_VERSION="%%JAVA_VERSION%%" exec %%DATADIR%%/eclipse "$@"
(-)./files/patch-eclipse-platform-parent (-6 / +6 lines)
Lines 5-15 Link Here
5
       'eclipiserun-repo' repository, such as for computing .api-descriptions and
5
       'eclipiserun-repo' repository, such as for computing .api-descriptions and
6
       generating API Tools reports.
6
       generating API Tools reports.
7
     -->
7
     -->
8
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds/</eclipserun-repo>
8
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds/</eclipserun-repo>
9
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.14/</eclipserun-repo>
9
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.15/</eclipserun-repo>
10
     
10
     
11
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14-I-builds</comparator.repo>
11
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15-I-builds</comparator.repo>
12
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.14</comparator.repo>
12
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15</comparator.repo>
13
 
13
 
14
     <!--
14
     <!--
15
       NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
15
       NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
Lines 36-43 Link Here
36
           For maintenance streams should always be "M-builds".
36
           For maintenance streams should always be "M-builds".
37
           Ideally, this value would be provided by the environment, see bug 489789.
37
           Ideally, this value would be provided by the environment, see bug 489789.
38
         -->
38
         -->
39
-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14-I-builds</eclipse-p2-repo.url>
39
-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15-I-builds</eclipse-p2-repo.url>
40
+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.14</eclipse-p2-repo.url>
40
+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.15</eclipse-p2-repo.url>
41
       </properties>
41
       </properties>
42
       <repositories>
42
       <repositories>
43
         <repository>
43
         <repository>
(-)./files/patch-eclipse.platform.releng (-3 / +3 lines)
Lines 14-20 Link Here
14
          download-size="0"
14
          download-size="0"
15
          install-size="0"
15
          install-size="0"
16
          version="0.0.0"
16
          version="0.0.0"
17
@@ -355,9 +355,9 @@
17
@@ -362,9 +362,9 @@
18
          unpack="false"/>
18
          unpack="false"/>
19
 
19
 
20
    <plugin
20
    <plugin
Lines 27-33 Link Here
27
          download-size="0"
27
          download-size="0"
28
          install-size="0"
28
          install-size="0"
29
          version="0.0.0"
29
          version="0.0.0"
30
@@ -394,9 +394,9 @@
30
@@ -401,9 +401,9 @@
31
          unpack="false"/>
31
          unpack="false"/>
32
 
32
 
33
    <plugin
33
    <plugin
Lines 40-46 Link Here
40
          download-size="0"
40
          download-size="0"
41
          install-size="0"
41
          install-size="0"
42
          version="0.0.0"
42
          version="0.0.0"
43
@@ -458,9 +458,9 @@
43
@@ -465,9 +465,9 @@
44
          unpack="false"/>
44
          unpack="false"/>
45
 
45
 
46
    <plugin
46
    <plugin
(-)./files/patch-eclipse.platform.releng.tychoeclipsebuilder (-8 / +8 lines)
Lines 98-107 Link Here
98
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
98
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
99
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
99
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
100
 
100
 
101
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz
101
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz
102
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz
102
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz
103
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13-win32-x86_64.zip
103
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14-win32-x86_64.zip
104
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13-macosx-cocoa-x86_64.tar.gz
104
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14-macosx-cocoa-x86_64.tar.gz
105
 
105
 
106
diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
106
diff -ru eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
107
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
107
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
Lines 110-120 Link Here
110
 
110
 
111
 
111
 
112
 mkdir -p workarea/${buildId}/eclipse-testing
112
 mkdir -p workarea/${buildId}/eclipse-testing
113
-cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
113
-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
114
+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
114
+cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
115
 
115
 
116
-cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
116
-cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
117
+cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
117
+cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/
118
 
118
 
119
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
119
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
120
 
120
 
(-)./files/patch-eclipse.platform.resources (-3 / +3 lines)
Lines 67-73 Link Here
67
   <version>1.2.300-SNAPSHOT</version>
67
   <version>1.2.300-SNAPSHOT</version>
68
   <packaging>eclipse-plugin</packaging>
68
   <packaging>eclipse-plugin</packaging>
69
 
69
 
70
@@ -37,9 +37,9 @@
70
@@ -33,9 +33,9 @@
71
           <resolver>p2</resolver>
71
           <resolver>p2</resolver>
72
           <environments>
72
           <environments>
73
             <environment>
73
             <environment>
Lines 79-85 Link Here
79
             </environment>
79
             </environment>
80
           </environments>
80
           </environments>
81
         </configuration>
81
         </configuration>
82
@@ -54,7 +54,7 @@
82
@@ -50,7 +50,7 @@
83
         <property>
83
         <property>
84
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
84
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
85
           <name>native</name>
85
           <name>native</name>
Lines 88-94 Link Here
88
         </property>
88
         </property>
89
       </activation>
89
       </activation>
90
       <build>
90
       <build>
91
@@ -67,10 +67,10 @@
91
@@ -63,10 +63,10 @@
92
                 <phase>process-resources</phase>
92
                 <phase>process-resources</phase>
93
                 <configuration>
93
                 <configuration>
94
                   <target>
94
                   <target>
(-)./files/patch-eclipse.platform.swt (-6 / +6 lines)
Lines 124-130 Link Here
124
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
124
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
125
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
125
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
126
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
126
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	0000-00-00 00:00:00.000000000 +0000
127
@@ -101,16 +101,18 @@
127
@@ -103,16 +103,18 @@
128
 WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
128
 WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
129
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
129
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
130
 
130
 
Lines 146-152 Link Here
146
 
146
 
147
 ifndef NO_STRIP
147
 ifndef NO_STRIP
148
 	# -s = Remove all symbol table and relocation information from the executable.
148
 	# -s = Remove all symbol table and relocation information from the executable.
149
@@ -253,10 +255,6 @@
149
@@ -255,10 +257,6 @@
150
 	cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
150
 	cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
151
 ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
151
 ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
152
 	@# Copy webextension into it's own folder, but create folder first.
152
 	@# Copy webextension into it's own folder, but create folder first.
Lines 174-188 Link Here
174
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
174
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
175
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
175
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
176
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
176
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
177
@@ -157,7 +157,7 @@
177
@@ -120,7 +120,7 @@
178
 	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
178
 	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
179
 	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
179
 	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
180
 	 */
180
 	 */
181
-	static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2.
181
-	static final int ASYNC_EXEC_TIMEOUT_MS = 10000;
182
+	static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
182
+	static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
183
 
183
 
184
 	static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733
184
 	/** Workaround for bug 522733 */
185
 
185
 	static boolean bug522733FirstInstanceCreated = false;
186
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
186
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
187
--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
187
--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
188
+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
188
+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
(-)./files/patch-eclipse.platform.swt.binaries (-4 / +4 lines)
Lines 83-89 Link Here
83
 Bundle-Vendor: %providerName
83
 Bundle-Vendor: %providerName
84
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
84
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
85
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
85
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64; singleton:=true
86
 Bundle-Version: 3.113.0.qualifier
86
 Bundle-Version: 3.114.0.qualifier
87
 Bundle-ManifestVersion: 2
87
 Bundle-ManifestVersion: 2
88
 Bundle-Localization: fragment
88
 Bundle-Localization: fragment
89
@@ -26,8 +26,8 @@
89
@@ -26,8 +26,8 @@
Lines 141-147 Link Here
141
   <groupId>org.eclipse.swt</groupId>
141
   <groupId>org.eclipse.swt</groupId>
142
-  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
142
-  <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
143
+  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
143
+  <artifactId>org.eclipse.swt.gtk.freebsd.amd64</artifactId>
144
   <version>3.113.0-SNAPSHOT</version>
144
   <version>3.114.0-SNAPSHOT</version>
145
   <packaging>eclipse-plugin</packaging>
145
   <packaging>eclipse-plugin</packaging>
146
 
146
 
147
   <properties>
147
   <properties>
Lines 171-177 Link Here
171
 Bundle-Vendor: %providerName
171
 Bundle-Vendor: %providerName
172
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
172
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
173
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
173
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.powerpc64;singleton:=true
174
 Bundle-Version: 3.113.0.qualifier
174
 Bundle-Version: 3.114.0.qualifier
175
 Bundle-ManifestVersion: 2
175
 Bundle-ManifestVersion: 2
176
 Bundle-Localization: fragment
176
 Bundle-Localization: fragment
177
@@ -26,8 +26,8 @@
177
@@ -26,8 +26,8 @@
Lines 212-218 Link Here
212
   <groupId>org.eclipse.swt</groupId>
212
   <groupId>org.eclipse.swt</groupId>
213
-  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
213
-  <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
214
+  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
214
+  <artifactId>org.eclipse.swt.gtk.freebsd.powerpc64</artifactId>
215
   <version>3.113.0-SNAPSHOT</version>
215
   <version>3.114.0-SNAPSHOT</version>
216
   <packaging>eclipse-plugin</packaging>
216
   <packaging>eclipse-plugin</packaging>
217
 
217
 
218
   <properties>
218
   <properties>
(-)./files/patch-eclipse.platform.ui (-1 / +1 lines)
Lines 1-7 Link Here
1
diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml
1
diff -ru eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml
2
--- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
2
--- eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
3
+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
3
+++ eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/pom.xml	0000-00-00 00:00:00.000000000 +0000
4
@@ -37,9 +37,9 @@
4
@@ -33,9 +33,9 @@
5
           <resolver>p2</resolver>
5
           <resolver>p2</resolver>
6
           <environments>
6
           <environments>
7
             <environment>
7
             <environment>
(-)./files/patch-production (-14 lines)
Lines 1-14 Link Here
1
diff -ru production/checkConfigIIUs.sh production/checkConfigIIUs.sh
2
--- production/checkConfigIIUs.sh	0000-00-00 00:00:00.000000000 +0000
3
+++ production/checkConfigIIUs.sh	0000-00-00 00:00:00.000000000 +0000
4
@@ -39,8 +39,8 @@
5
 
6
 declare -a PLATFORMS=( \
7
 cocoa.macosx.x86_64 \
8
-gtk.linux.ppc64le \
9
-gtk.linux.x86_64 \
10
+gtk.freebsd.powerpc64 \
11
+gtk.freebsd.amd64 \
12
 win32.win32.x86_64 \
13
 )
14
 NPLATFORMS=${#PLATFORMS[@]}

Return to bug 244927