View | Details | Raw Unified | Return to bug 240480 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-6 / +6 lines)
Lines 2-14 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	eclipse
4
PORTNAME=	eclipse
5
PORTVERSION=	4.12
5
PORTVERSION=	4.13
6
PORTREVISION=	1
7
CATEGORIES=	java devel
6
CATEGORIES=	java devel
8
7
9
# Update to git-tag on git.eclipse.org
8
# Update to git-tag on git.eclipse.org
10
ECLIPSE_TAG=	R4_12
9
ECLIPSE_TAG=	R4_13
11
ECLIPSE_TSTAMP=	20190617-0403
10
ECLIPSE_TSTAMP=	20190908-2345
12
11
13
ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
12
ECLIPSE_SUFX=	${ECLIPSE_TAG}.tar.xz
14
ECLIPSE_MODULES=jdt/eclipse.jdt \
13
ECLIPSE_MODULES=jdt/eclipse.jdt \
Lines 46-52 Link Here
46
DIST_SUBDIR=	${PORTNAME}
45
DIST_SUBDIR=	${PORTNAME}
47
46
48
MAINTAINER=	jonc@chen.org.nz
47
MAINTAINER=	jonc@chen.org.nz
49
COMMENT=	Eclipse IDE 2019-06
48
COMMENT=	Eclipse IDE 2019-09
50
49
51
LICENSE=	EPL
50
LICENSE=	EPL
52
51
Lines 74-82 Link Here
74
73
75
SUB_FILES=	${PORTNAME}
74
SUB_FILES=	${PORTNAME}
76
75
76
LOCAL_P2=	file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/${PORTVERSION}
77
MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME}
77
MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME}
78
MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
78
MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
79
MAVEN_ECLIPSE=	-Dnative=gtk.freebsd.${ARCH} -Dcomparator.repo=file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/p2-stub -DforceContextQualifier=v${ECLIPSE_TSTAMP}
79
MAVEN_ECLIPSE=	-Dnative=gtk.freebsd.${ARCH} -Dcomparator.repo=${LOCAL_P2} -Declipserun-repo=${LOCAL_P2}/ -DforceContextQualifier=v${ECLIPSE_TSTAMP}
80
80
81
ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz
81
ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz
82
82
(-)./distinfo (-53 / +53 lines)
Lines 1-53 Link Here
1
TIMESTAMP = 1564954773
1
TIMESTAMP = 1569023688
2
SHA256 (eclipse/eclipse.jdt-R4_12.tar.xz) = 45ae25fb2da5f0dabb0a3e661cd7c0bdb7e64c11ef022ef69634b78b7c0d53e2
2
SHA256 (eclipse/eclipse.jdt-R4_13.tar.xz) = e68d1929eb945696c12cd50106f4210a605a46a57c1e49127253530ee48b4261
3
SIZE (eclipse/eclipse.jdt-R4_12.tar.xz) = 37540
3
SIZE (eclipse/eclipse.jdt-R4_13.tar.xz) = 37508
4
SHA256 (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 5e2397a22ac6b4c8c4335da21c51c53f391b7aa22287e8c2a0a51d32ca56a735
4
SHA256 (eclipse/eclipse.jdt.core-R4_13.tar.xz) = 41d6127baeea34eaf50d407f9aa4e10cf910a13b171281b0d8caa0a6e159f072
5
SIZE (eclipse/eclipse.jdt.core-R4_12.tar.xz) = 8454552
5
SIZE (eclipse/eclipse.jdt.core-R4_13.tar.xz) = 8479784
6
SHA256 (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = e7ff8a3148707694b14140abdaa40feca610694f3b729c0851abaab321063b7d
6
SHA256 (eclipse/eclipse.jdt.core.binaries-R4_13.tar.xz) = e930edf167b0170af3620ae7aefff3d1b7ac511de0021b65f6b3c5947d1aebc0
7
SIZE (eclipse/eclipse.jdt.core.binaries-R4_12.tar.xz) = 34416416
7
SIZE (eclipse/eclipse.jdt.core.binaries-R4_13.tar.xz) = 34416724
8
SHA256 (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = a111fc4ff7f054a691cd27ae8999eac08d9a840a7dc44d09568573442ae1471a
8
SHA256 (eclipse/eclipse.jdt.debug-R4_13.tar.xz) = 701ae772f632b846185f8c97c2cf64d5fb279d05d582703b940d940b70f297b7
9
SIZE (eclipse/eclipse.jdt.debug-R4_12.tar.xz) = 1431080
9
SIZE (eclipse/eclipse.jdt.debug-R4_13.tar.xz) = 1434836
10
SHA256 (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 375bce94a24c56a9ae23d3c0029b169abc3281feb4217678fdab0903684f4762
10
SHA256 (eclipse/eclipse.jdt.ui-R4_13.tar.xz) = 68723a5c2a84f64c40f1f3a086d15a6f824e79b9b1b9f9cca5946c7d6cef854f
11
SIZE (eclipse/eclipse.jdt.ui-R4_12.tar.xz) = 14583880
11
SIZE (eclipse/eclipse.jdt.ui-R4_13.tar.xz) = 14613568
12
SHA256 (eclipse/eclipse.pde.build-R4_12.tar.xz) = 891a4bcc90cd96514f318eee9eaf96fc15159d77d1fc409ed249906acb68022e
12
SHA256 (eclipse/eclipse.pde.build-R4_13.tar.xz) = 10918ef4c5ad21d2c872b27774e6f3ea0221dbc1d951a35d7ef71f3774768162
13
SIZE (eclipse/eclipse.pde.build-R4_12.tar.xz) = 868404
13
SIZE (eclipse/eclipse.pde.build-R4_13.tar.xz) = 868664
14
SHA256 (eclipse/eclipse.pde.ui-R4_12.tar.xz) = cd075169014eaa1869c961bd1d5142289963639cbc7ba6d77807f94db660bea0
14
SHA256 (eclipse/eclipse.pde.ui-R4_13.tar.xz) = 2dca727a9469893c59add9d949b988d6ba933009d487028e961b84112f20f8a7
15
SIZE (eclipse/eclipse.pde.ui-R4_12.tar.xz) = 29767800
15
SIZE (eclipse/eclipse.pde.ui-R4_13.tar.xz) = 29833816
16
SHA256 (eclipse/eclipse.platform-R4_12.tar.xz) = ddf3a506a37cf8d9a3710075b3317e672e6be3c7b862d4040fdfbec79dd4ea8e
16
SHA256 (eclipse/eclipse.platform-R4_13.tar.xz) = ae85e3190daec8f7ebf3b1db8026eb0a53e0fc86dbf5c7997b91a43c90a317f7
17
SIZE (eclipse/eclipse.platform-R4_12.tar.xz) = 1371240
17
SIZE (eclipse/eclipse.platform-R4_13.tar.xz) = 1370960
18
SHA256 (eclipse/eclipse.platform.common-R4_12.tar.xz) = 135bae9bde971e0d554baef0f7d5490856d328872aba4cbd6f4de6dd9ec45716
18
SHA256 (eclipse/eclipse.platform.common-R4_13.tar.xz) = a3434a1412448d2c0af92e33b5df2fd40b7dfb195f122e209dfb0d5fc72f1cda
19
SIZE (eclipse/eclipse.platform.common-R4_12.tar.xz) = 34509332
19
SIZE (eclipse/eclipse.platform.common-R4_13.tar.xz) = 36277272
20
SHA256 (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 73794b36665ff3d5e91a9192580b0d13adf7465c84ecb348968ca1b442102b7e
20
SHA256 (eclipse/eclipse.platform.debug-R4_13.tar.xz) = 448ce89b26b0ed5fcdacf945951fc836ab9a421d0fe10e188fdeccf28ee50e30
21
SIZE (eclipse/eclipse.platform.debug-R4_12.tar.xz) = 1372736
21
SIZE (eclipse/eclipse.platform.debug-R4_13.tar.xz) = 1356036
22
SHA256 (eclipse/eclipse.platform.releng-R4_12.tar.xz) = b881cdf06b04a8b540a4eb78284f6bdbf0dc6609558a4ab47ab985f0b806bece
22
SHA256 (eclipse/eclipse.platform.releng-R4_13.tar.xz) = e190780ad2bab7ab80bc062cc8ed9d2d0830349670552e581f3f643ebd7c8027
23
SIZE (eclipse/eclipse.platform.releng-R4_12.tar.xz) = 410360
23
SIZE (eclipse/eclipse.platform.releng-R4_13.tar.xz) = 410608
24
SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = c7fe65208ca7e534305ea02b9121af7f1610aeb06d2699ccadd1df7aa0326d65
24
SHA256 (eclipse/eclipse.platform.releng.aggregator-R4_13.tar.xz) = 3ce8c942f339e9248edab9c983da06938462a62cb2ff093ede1b588c633c5ad7
25
SIZE (eclipse/eclipse.platform.releng.aggregator-R4_12.tar.xz) = 693384
25
SIZE (eclipse/eclipse.platform.releng.aggregator-R4_13.tar.xz) = 688764
26
SHA256 (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 5f52c24383d93097e4afbe4e7bd6219a503d3fb53d5753bef1e6788459f81790
26
SHA256 (eclipse/eclipse.platform.resources-R4_13.tar.xz) = 1f74ae4452c797a612cf30c0577d79f42b4d451a4fbaabc36b3b407ff3ab11e3
27
SIZE (eclipse/eclipse.platform.resources-R4_12.tar.xz) = 856912
27
SIZE (eclipse/eclipse.platform.resources-R4_13.tar.xz) = 819092
28
SHA256 (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 249076673934470080f0978561f88bce094e0c5d020e9e310925f8cd0a0d79ee
28
SHA256 (eclipse/eclipse.platform.runtime-R4_13.tar.xz) = 455158f9a32e0f026b81ea8c8aa99f1c7eb98b845aad9d4478c7cedead23c155
29
SIZE (eclipse/eclipse.platform.runtime-R4_12.tar.xz) = 432824
29
SIZE (eclipse/eclipse.platform.runtime-R4_13.tar.xz) = 434852
30
SHA256 (eclipse/eclipse.platform.swt-R4_12.tar.xz) = e32661c3d7d1593fb38a3d0c19d015cf0e257cd25c80c74acbd95e2c5e7c0a29
30
SHA256 (eclipse/eclipse.platform.swt-R4_13.tar.xz) = 37b08ac37b3ca64fdf6637a3de6f737696cb367462997a10dedf26c0037e7614
31
SIZE (eclipse/eclipse.platform.swt-R4_12.tar.xz) = 3526948
31
SIZE (eclipse/eclipse.platform.swt-R4_13.tar.xz) = 6100732
32
SHA256 (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 29959c650f57cc6fa93f301a3d4a3e4648ecfeeedcb9ad665f7bb35672f44d5d
32
SHA256 (eclipse/eclipse.platform.swt.binaries-R4_13.tar.xz) = 6c770190a67075792236f12243010476f2e86fa2969ae9e94a5a9f67c2252cdf
33
SIZE (eclipse/eclipse.platform.swt.binaries-R4_12.tar.xz) = 579236
33
SIZE (eclipse/eclipse.platform.swt.binaries-R4_13.tar.xz) = 599884
34
SHA256 (eclipse/eclipse.platform.team-R4_12.tar.xz) = a4dae95b11dcdfec3f7481582be72ce5145e91096d6f2b654958a0afea601bab
34
SHA256 (eclipse/eclipse.platform.team-R4_13.tar.xz) = 540d6cd0fe05dbca4a1d397f914a3a7cc4108bf56e0d92d2a4f2161879fbd088
35
SIZE (eclipse/eclipse.platform.team-R4_12.tar.xz) = 4633400
35
SIZE (eclipse/eclipse.platform.team-R4_13.tar.xz) = 4636172
36
SHA256 (eclipse/eclipse.platform.text-R4_12.tar.xz) = 5ce41cb1f01f4fd1960f6f12e8e4e78dd8140b45657ac911be8deedfc6ce9953
36
SHA256 (eclipse/eclipse.platform.text-R4_13.tar.xz) = 1a71f72b085a7417c5c47c33239a01966fca4d9e164c0f4a36602758dc08430c
37
SIZE (eclipse/eclipse.platform.text-R4_12.tar.xz) = 1248060
37
SIZE (eclipse/eclipse.platform.text-R4_13.tar.xz) = 1290156
38
SHA256 (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 28a705e7ea2a0bb9739bfba031373215601c61e75f7d99e0635b5f08f30f8d98
38
SHA256 (eclipse/eclipse.platform.ua-R4_13.tar.xz) = 7c37cdd767c55abaeb6f4f85abef0e875a7e650eaf67d3b936de61f78662db66
39
SIZE (eclipse/eclipse.platform.ua-R4_12.tar.xz) = 4510416
39
SIZE (eclipse/eclipse.platform.ua-R4_13.tar.xz) = 4530684
40
SHA256 (eclipse/eclipse.platform.ui-R4_12.tar.xz) = dbd4e45afe474d149cc5a5bfd767a68caa3a24fe106004a55fca18e412a7f92a
40
SHA256 (eclipse/eclipse.platform.ui-R4_13.tar.xz) = bae93710b1291f1611f6122a9e6917266c3c122ebb9fa5d82a2b078731faf1bc
41
SIZE (eclipse/eclipse.platform.ui-R4_12.tar.xz) = 5937024
41
SIZE (eclipse/eclipse.platform.ui-R4_13.tar.xz) = 5939952
42
SHA256 (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 610cfc9ac0e57114ddd6985a5a1ce0179f54397d2a2295de29166ece08af2daf
42
SHA256 (eclipse/eclipse.platform.ui.tools-R4_13.tar.xz) = 76a784adeb0a08cd3e9833e4e845faa3fc4571d2c57aee5b78f4d94b19f628f5
43
SIZE (eclipse/eclipse.platform.ui.tools-R4_12.tar.xz) = 318476
43
SIZE (eclipse/eclipse.platform.ui.tools-R4_13.tar.xz) = 318792
44
SHA256 (eclipse/rt.equinox.binaries-R4_12.tar.xz) = b439a66d4a28aad2bb4ea6ae5adddf39a95c9d1c348923c258f42c683f1ffb7f
44
SHA256 (eclipse/rt.equinox.binaries-R4_13.tar.xz) = d5c4e1cb13b1fc13df7ac7f05f3cf7600d72ac580b0e41563322157fb7fc849f
45
SIZE (eclipse/rt.equinox.binaries-R4_12.tar.xz) = 624016
45
SIZE (eclipse/rt.equinox.binaries-R4_13.tar.xz) = 298540
46
SHA256 (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 4e0a2c72e0f459231fc51607b03598274902e04b308d3028ba9d30b57cb8a81d
46
SHA256 (eclipse/rt.equinox.bundles-R4_13.tar.xz) = 6dba61f1f687ec94315bb203028df72d11c3ede3e37fe60786e8d791ca1152c2
47
SIZE (eclipse/rt.equinox.bundles-R4_12.tar.xz) = 1141852
47
SIZE (eclipse/rt.equinox.bundles-R4_13.tar.xz) = 1152516
48
SHA256 (eclipse/rt.equinox.framework-R4_12.tar.xz) = 8d154acf89d503cdd6ee8a83854a4a69d14f15430089a71f80bcb3a603d32b55
48
SHA256 (eclipse/rt.equinox.framework-R4_13.tar.xz) = 5855906a8f72fb9f9c4fad469c4eed1aeea34669bc756b1fa73a55ba048d6e6c
49
SIZE (eclipse/rt.equinox.framework-R4_12.tar.xz) = 2813400
49
SIZE (eclipse/rt.equinox.framework-R4_13.tar.xz) = 2817028
50
SHA256 (eclipse/rt.equinox.p2-R4_12.tar.xz) = c3972cb745756fbea87ca0098803c538d1fc300637bbc1062fe359f0ca72dbc8
50
SHA256 (eclipse/rt.equinox.p2-R4_13.tar.xz) = 31e9e6d05acfac3c1e75c29c26b2709f4bad226132897791c3dac86bdb7a3435
51
SIZE (eclipse/rt.equinox.p2-R4_12.tar.xz) = 48502480
51
SIZE (eclipse/rt.equinox.p2-R4_13.tar.xz) = 48508540
52
SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 43093df29b4ecbbabe8806ca24f1dcc4fa53b2b0d85a59d2664fc8f3fe8d8e90
52
SHA256 (eclipse/daemonblade-eclipse-maven-repo-4.13_GH0.tar.gz) = eda9570d073262a3c1f1435a85975b1f9c01b2b82cdd8b8561afcfb5bf69a18a
53
SIZE (eclipse/daemonblade-eclipse-maven-repo-4.12_GH0.tar.gz) = 182037029
53
SIZE (eclipse/daemonblade-eclipse-maven-repo-4.13_GH0.tar.gz) = 925519556
(-)./files/patch-eclipse-platform-parent (-7 / +7 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.12-I-builds/</eclipserun-repo>
8
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.13-I-builds/</eclipserun-repo>
9
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.12/</eclipserun-repo>
9
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.13/</eclipserun-repo>
10
     
10
     
11
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12-I-builds</comparator.repo>
11
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.13-I-builds</comparator.repo>
12
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.12</comparator.repo>
12
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.13</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 17-28 Link Here
17
       it).
17
       it).
18
       And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable.
18
       And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable.
19
     -->
19
     -->
20
-    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646</emf-repo.url>
20
-    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201907100440/</emf-repo.url>
21
+    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.18</emf-repo.url>
21
+    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.19/</emf-repo.url>
22
 
22
 
23
     <ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.5/site.p2/</ecf-repo.url>
23
     <ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.5/site.p2/</ecf-repo.url>
24
 
24
 
25
@@ -262,14 +262,14 @@
25
@@ -263,14 +263,14 @@
26
           </target>
26
           </target>
27
           <environments>
27
           <environments>
28
             <environment>
28
             <environment>
(-)./files/patch-eclipse.pde.ui (-1 / +1 lines)
Lines 1-7 Link Here
1
diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product
1
diff -ru eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product
2
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
2
--- eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
3
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
3
+++ eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/templates_3.5/E4Application/$pluginId$.product	0000-00-00 00:00:00.000000000 +0000
4
@@ -80,8 +80,8 @@
4
@@ -81,8 +81,8 @@
5
       <plugin id="org.eclipse.osgi.util"/>
5
       <plugin id="org.eclipse.osgi.util"/>
6
       <plugin id="org.eclipse.swt"/>
6
       <plugin id="org.eclipse.swt"/>
7
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
7
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
(-)./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
@@ -348,9 +348,9 @@
17
@@ -355,9 +355,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
@@ -387,9 +387,9 @@
30
@@ -394,9 +394,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
@@ -451,9 +451,9 @@
43
@@ -458,9 +458,9 @@
44
          unpack="false"/>
44
          unpack="false"/>
45
 
45
 
46
    <plugin
46
    <plugin
(-)./files/patch-eclipse.platform.releng.prereqs.sdk (-12 lines)
Lines 1-12 Link Here
1
diff -ru eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
2
--- eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target	0000-00-00 00:00:00.000000000 +0000
3
+++ eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target	0000-00-00 00:00:00.000000000 +0000
4
@@ -167,7 +167,7 @@
5
       <unit id="org.eclipse.emf.edit" version="2.15.0.v20190528-0725"/>
6
       <unit id="org.eclipse.emf.databinding" version="1.5.0.v20180706-1146"/>
7
       <unit id="org.eclipse.emf.databinding.edit" version="1.6.0.v20190323-1031"/>
8
-      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201905280646"/>
9
+      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.18"/>
10
     </location>
11
 
12
     <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
(-)./files/patch-eclipse.platform.releng.tychoeclipsebuilder (-20 / +20 lines)
Lines 98-117 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.11-linux-gtk-x86_64.tar.gz
101
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.12-linux-gtk-x86_64.tar.gz
102
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz
102
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.freebsd-amd64=\${basedir}/eclipse-platform-4.12-freebsd-gtk-amd64.tar.gz
103
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.11-win32-x86_64.zip
103
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.12-win32-x86_64.zip
104
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.11-macosx-cocoa-x86_64.tar.gz
104
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.12-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
108
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
108
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh	0000-00-00 00:00:00.000000000 +0000
109
@@ -8,9 +8,9 @@
109
@@ -7,9 +7,9 @@
110
 
110
 
111
 
111
 mkdir -p workarea/${buildId}/eclipse-testing
112
 mkdir -p workarea/${buildId}/eclipse-testing
112
 #cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-SDK-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
113
-cp /home/files/buildzips/oxygen/R/R-4.12-201906051800/eclipse-platform-4.12-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
113
-cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
114
+cp /home/files/buildzips/oxygen/R/R-4.12-201906051800/eclipse-platform-4.12-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
114
+cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-freebsd-gtk-amd64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
115
 
115
 
116
-cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/
116
-cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/
117
+cp ../../eclipse-SDK-${buildId}-freebsd-gtk-amd64.tar.gz workarea/${buildId}/eclipse-testing/
117
+cp ../../eclipse-SDK-${buildId}-freebsd-gtk-amd64.tar.gz workarea/${buildId}/eclipse-testing/
Lines 142-149 Link Here
142
-      <linux icon="icon.xpm"/>
142
-      <linux icon="icon.xpm"/>
143
+      <freebsd icon="icon.xpm"/>
143
+      <freebsd icon="icon.xpm"/>
144
       <macosx icon="rt.icns"/>
144
       <macosx icon="rt.icns"/>
145
       <win useIco="true">
145
       <win useIco="false">
146
          <ico path="rt.ico"/>
146
          <bmp/>
147
diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
147
diff -ru eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
148
--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
148
--- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
149
+++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
149
+++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml	0000-00-00 00:00:00.000000000 +0000
Lines 178-185 Link Here
178
-      <linux icon="icons/icon.xpm"/>
178
-      <linux icon="icons/icon.xpm"/>
179
+      <freebsd icon="icons/icon.xpm"/>
179
+      <freebsd icon="icons/icon.xpm"/>
180
       <macosx icon="icons/Eclipse.icns"/>
180
       <macosx icon="icons/Eclipse.icns"/>
181
       <win useIco="true">
181
       <win useIco="false">
182
          <ico path="icons/eclipse.ico"/>
182
          <bmp/>
183
diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
183
diff -ru eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
184
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	0000-00-00 00:00:00.000000000 +0000
184
--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	0000-00-00 00:00:00.000000000 +0000
185
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	0000-00-00 00:00:00.000000000 +0000
185
+++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	0000-00-00 00:00:00.000000000 +0000
Lines 202-209 Link Here
202
-      <linux icon="icons/icon.xpm"/>
202
-      <linux icon="icons/icon.xpm"/>
203
+      <freebsd icon="icons/icon.xpm"/>
203
+      <freebsd icon="icons/icon.xpm"/>
204
       <macosx icon="icons/Eclipse.icns"/>
204
       <macosx icon="icons/Eclipse.icns"/>
205
       <win useIco="true">
205
       <win useIco="false">
206
          <ico path="icons/eclipse.ico"/>
206
          <bmp/>
207
diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.releng.tychoeclipsebuilder/pom.xml
207
diff -ru eclipse.platform.releng.tychoeclipsebuilder/pom.xml eclipse.platform.releng.tychoeclipsebuilder/pom.xml
208
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
208
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
209
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
209
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml	0000-00-00 00:00:00.000000000 +0000
Lines 227-234 Link Here
227
-      <linux icon="icons/icon.xpm"/>
227
-      <linux icon="icons/icon.xpm"/>
228
+      <freebsd icon="icons/icon.xpm"/>
228
+      <freebsd icon="icons/icon.xpm"/>
229
       <macosx icon="icons/Eclipse.icns"/>
229
       <macosx icon="icons/Eclipse.icns"/>
230
       <win useIco="true">
230
       <win useIco="false">
231
          <ico path="icons/eclipse.ico"/>
231
          <bmp/>
232
diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
232
diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
233
--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
233
--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
234
+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
234
+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties	0000-00-00 00:00:00.000000000 +0000
Lines 258-265 Link Here
258
-      <linux icon="icons/icon.xpm"/>
258
-      <linux icon="icons/icon.xpm"/>
259
+      <freebsd icon="icons/icon.xpm"/>
259
+      <freebsd icon="icons/icon.xpm"/>
260
       <macosx icon="icons/Eclipse.icns"/>
260
       <macosx icon="icons/Eclipse.icns"/>
261
       <win useIco="true">
261
       <win useIco="false">
262
          <ico path="icons/eclipse.ico"/>
262
          <bmp/>
263
diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
263
diff -ru eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
264
--- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml	0000-00-00 00:00:00.000000000 +0000
264
--- eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml	0000-00-00 00:00:00.000000000 +0000
265
+++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml	0000-00-00 00:00:00.000000000 +0000
265
+++ eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml	0000-00-00 00:00:00.000000000 +0000
Lines 282-286 Link Here
282
-      <linux icon="icons/icon.xpm"/>
282
-      <linux icon="icons/icon.xpm"/>
283
+      <freebsd icon="icons/icon.xpm"/>
283
+      <freebsd icon="icons/icon.xpm"/>
284
       <macosx icon="icons/Eclipse.icns"/>
284
       <macosx icon="icons/Eclipse.icns"/>
285
       <win useIco="true">
285
       <win useIco="false">
286
          <ico path="icons/eclipse.ico"/>
286
          <bmp/>
(-)./files/patch-eclipse.platform.resources (-65 / +4 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
@@ -33,9 +33,9 @@
70
@@ -37,9 +37,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
@@ -50,7 +50,7 @@
82
@@ -54,7 +54,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
@@ -63,10 +63,10 @@
91
@@ -67,10 +67,10 @@
92
                 <phase>process-resources</phase>
92
                 <phase>process-resources</phase>
93
                 <configuration>
93
                 <configuration>
94
                   <target>
94
                   <target>
Lines 103-169 Link Here
103
                <include name="libunixfile_*.so"/>
103
                <include name="libunixfile_*.so"/>
104
            </fileset>
104
            </fileset>
105
            </copy>
105
            </copy>
106
diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF
107
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
108
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
109
@@ -1,9 +1,9 @@
110
 Manifest-Version: 1.0
111
 Bundle-ManifestVersion: 2
112
 Bundle-Name: %fragmentName
113
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true
114
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.i386; singleton:=true
115
 Bundle-Version: 1.4.300.qualifier
116
 Bundle-Vendor: %providerName
117
 Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.7.200,2.0.0)"
118
 Bundle-Localization: fragment
119
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
120
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=i386))
121
diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml
122
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
123
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
124
@@ -18,7 +18,7 @@
125
     <relativePath>../../</relativePath>
126
   </parent>
127
   <groupId>org.eclipse.core</groupId>
128
-  <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId>
129
+  <artifactId>org.eclipse.core.filesystem.freebsd.i386</artifactId>
130
   <version>1.4.300-SNAPSHOT</version>
131
   <packaging>eclipse-plugin</packaging>
132
 
133
@@ -33,9 +33,9 @@
134
           <resolver>p2</resolver>
135
           <environments>
136
             <environment>
137
-              <os>linux</os>
138
+              <os>freebsd</os>
139
               <ws>gtk</ws>
140
-              <arch>x86</arch>
141
+              <arch>i386</arch>
142
             </environment>
143
           </environments>
144
         </configuration>
145
@@ -50,7 +50,7 @@
146
         <property>
147
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
148
           <name>native</name>
149
-          <value>gtk.linux.x86</value>
150
+          <value>gtk.freebsd.i386</value>
151
         </property>
152
       </activation>
153
       <build>
154
@@ -63,9 +63,9 @@
155
                 <phase>process-resources</phase>
156
                 <configuration>
157
                   <target>
158
-                    <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
159
-           <copy todir="os/linux/x86">
160
-           <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
161
+                    <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/>
162
+           <copy todir="os/freebsd/i386">
163
+           <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/">
164
                <include name="libunixfile_*.so"/>
165
            </fileset>
166
            </copy>
167
diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF
106
diff -ru eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF
168
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
107
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
169
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
108
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.powerpc64/META-INF/MANIFEST.MF	0000-00-00 00:00:00.000000000 +0000
Lines 191-197 Link Here
191
   <version>1.4.100-SNAPSHOT</version>
130
   <version>1.4.100-SNAPSHOT</version>
192
   <packaging>eclipse-plugin</packaging>
131
   <packaging>eclipse-plugin</packaging>
193
 
132
 
194
@@ -33,9 +33,9 @@
133
@@ -37,9 +37,9 @@
195
           <resolver>p2</resolver>
134
           <resolver>p2</resolver>
196
           <environments>
135
           <environments>
197
             <environment>
136
             <environment>
(-)./files/patch-eclipse.platform.runtime (-2 / +2 lines)
Lines 1-7 Link Here
1
diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
1
diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
2
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	0000-00-00 00:00:00.000000000 +0000
2
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	0000-00-00 00:00:00.000000000 +0000
3
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	0000-00-00 00:00:00.000000000 +0000
3
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	0000-00-00 00:00:00.000000000 +0000
4
@@ -63,7 +63,7 @@
4
@@ -62,7 +62,7 @@
5
 	//XXX This is not synchronized
5
 	//XXX This is not synchronized
6
 	private Map<Bundle,Log> logs = new HashMap<>(5);
6
 	private Map<Bundle,Log> logs = new HashMap<>(5);
7
 
7
 
Lines 13-19 Link Here
13
diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
13
diff -ru eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
14
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
14
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
15
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
15
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java	0000-00-00 00:00:00.000000000 +0000
16
@@ -207,6 +207,8 @@
16
@@ -208,6 +208,8 @@
17
 	 */
17
 	 */
18
 	public static final String OS_LINUX = "linux";//$NON-NLS-1$
18
 	public static final String OS_LINUX = "linux";//$NON-NLS-1$
19
 
19
 
(-)./files/patch-eclipse.platform.swt (-2 / +2 lines)
Lines 148-154 Link Here
148
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
148
diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
149
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
149
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
150
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
150
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	0000-00-00 00:00:00.000000000 +0000
151
@@ -58,8 +58,8 @@
151
@@ -60,8 +60,8 @@
152
 
152
 
153
 		/* Initialize the OS flags and locale constants */
153
 		/* Initialize the OS flags and locale constants */
154
 		String osName = System.getProperty ("os.name");
154
 		String osName = System.getProperty ("os.name");
Lines 162-168 Link Here
162
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
162
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
163
--- 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
163
--- 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
164
+++ 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
164
+++ 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
165
@@ -155,7 +155,7 @@
165
@@ -157,7 +157,7 @@
166
 	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
166
 	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
167
 	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
167
 	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
168
 	 */
168
 	 */
(-)./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.111.0.qualifier
86
 Bundle-Version: 3.112.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.111.0-SNAPSHOT</version>
144
   <version>3.112.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.111.0.qualifier
174
 Bundle-Version: 3.112.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.111.0-SNAPSHOT</version>
215
   <version>3.112.0-SNAPSHOT</version>
216
   <packaging>eclipse-plugin</packaging>
216
   <packaging>eclipse-plugin</packaging>
217
 
217
 
218
   <properties>
218
   <properties>
(-)./files/patch-eclipse.platform.team (-3 / +3 lines)
Lines 87-93 Link Here
87
   <version>1.2.300-SNAPSHOT</version>
87
   <version>1.2.300-SNAPSHOT</version>
88
   <packaging>eclipse-plugin</packaging>
88
   <packaging>eclipse-plugin</packaging>
89
 
89
 
90
@@ -30,9 +30,9 @@
90
@@ -34,9 +34,9 @@
91
         <configuration>
91
         <configuration>
92
           <environments>
92
           <environments>
93
             <environment>
93
             <environment>
Lines 99-105 Link Here
99
             </environment>
99
             </environment>
100
           </environments>
100
           </environments>
101
         </configuration>
101
         </configuration>
102
@@ -47,7 +47,7 @@
102
@@ -51,7 +51,7 @@
103
         <property>
103
         <property>
104
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
104
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
105
           <name>native</name>
105
           <name>native</name>
Lines 108-114 Link Here
108
         </property>
108
         </property>
109
       </activation>
109
       </activation>
110
       <build>
110
       <build>
111
@@ -60,9 +60,9 @@
111
@@ -64,9 +64,9 @@
112
                 <phase>process-resources</phase>
112
                 <phase>process-resources</phase>
113
                 <configuration>
113
                 <configuration>
114
                   <target>
114
                   <target>
(-)./files/patch-eclipse.platform.ua (-2 / +2 lines)
Lines 35-42 Link Here
35
 			prefs
35
 			prefs
36
 					.put("custom_browser_path", //$NON-NLS-1$
36
 					.put("custom_browser_path", //$NON-NLS-1$
37
 							"\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$
37
 							"\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$
38
-		} else if (os.indexOf("linux") != -1) { //$NON-NLS-1$
38
-		} else if (os.contains("linux")) { //$NON-NLS-1$
39
+		} else if (os.indexOf("linux") != -1 || os.indexOf("freebsd") != -1) { //$NON-NLS-1$
39
+		} else if (os.contains("linux") || os.contains("freebsd")) { //$NON-NLS-1$
40
 			prefs.put("custom_browser_path", //$NON-NLS-1$
40
 			prefs.put("custom_browser_path", //$NON-NLS-1$
41
 					"konqueror %1"); //$NON-NLS-1$
41
 					"konqueror %1"); //$NON-NLS-1$
42
 		} else {
42
 		} else {
(-)./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
@@ -32,9 +32,9 @@
4
@@ -37,9 +37,9 @@
5
           <resolver>p2</resolver>
5
           <resolver>p2</resolver>
6
           <environments>
6
           <environments>
7
             <environment>
7
             <environment>
(-)./files/patch-rt.equinox.bundles (-18 / +14 lines)
Lines 30-36 Link Here
30
 Bundle-Name: %fragmentName
30
 Bundle-Name: %fragmentName
31
-Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true
31
-Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true
32
+Bundle-SymbolicName: org.eclipse.equinox.security.freebsd.amd64;singleton:=true
32
+Bundle-SymbolicName: org.eclipse.equinox.security.freebsd.amd64;singleton:=true
33
 Bundle-Version: 1.1.200.qualifier
33
 Bundle-Version: 1.1.300.qualifier
34
 Bundle-Vendor: %providerName
34
 Bundle-Vendor: %providerName
35
 Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
35
 Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
36
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
36
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Lines 49-72 Link Here
49
 LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1`
49
 LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1`
50
 LIBSECRET_LIBS = `pkg-config --libs libsecret-1`
50
 LIBSECRET_LIBS = `pkg-config --libs libsecret-1`
51
 
51
 
52
-CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux"
52
-CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS)
53
+CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd"
53
+CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd" $(LIBSECRET_CFLAGS)
54
 LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS)
54
 
55
 
55
 all: ../libkeystorelinuxnative.so
56
 all: ../libkeystorelinuxnative.so
56
 
57
@@ -10,7 +10,7 @@
57
@@ -9,10 +9,10 @@
58
 	rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o
58
 	rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o
59
 	
59
 
60
 ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
60
 ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
61
-	$(CC) $(CFLAGS) -o $@ $< $(LIBSECRET_LIBS)
61
-	$(CC) $(LDFLAGS) -o $@ $<
62
+	$(CC) $(CFLAGS) -s -o $@ $< $(LIBSECRET_LIBS)
62
+	$(CC) $(LDFLAGS) -s -o $@ $<
63
 	
64
 ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
65
-	$(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c
66
+	$(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/freebsd" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c
67
 
63
 
68
 ../target: 
64
 ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
69
 	mkdir -p ../target
65
 	$(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c
70
diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml
66
diff -ru rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml
71
--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
67
--- rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
72
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
68
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
Lines 76-85 Link Here
76
   <groupId>org.eclipse.equinox</groupId>
72
   <groupId>org.eclipse.equinox</groupId>
77
-  <artifactId>org.eclipse.equinox.security.linux.x86_64</artifactId>
73
-  <artifactId>org.eclipse.equinox.security.linux.x86_64</artifactId>
78
+  <artifactId>org.eclipse.equinox.security.freebsd.amd64</artifactId>
74
+  <artifactId>org.eclipse.equinox.security.freebsd.amd64</artifactId>
79
   <version>1.1.200-SNAPSHOT</version>
75
   <version>1.1.300-SNAPSHOT</version>
80
   <packaging>eclipse-plugin</packaging>
76
   <packaging>eclipse-plugin</packaging>
81
 
77
 
82
@@ -31,9 +31,9 @@
78
@@ -35,9 +35,9 @@
83
           <resolver>p2</resolver>
79
           <resolver>p2</resolver>
84
           <environments>
80
           <environments>
85
             <environment>
81
             <environment>
Lines 91-97 Link Here
91
             </environment>
87
             </environment>
92
           </environments>
88
           </environments>
93
         </configuration>
89
         </configuration>
94
@@ -47,7 +47,7 @@
90
@@ -51,7 +51,7 @@
95
         <property>
91
         <property>
96
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
92
           <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
97
           <name>native</name>
93
           <name>native</name>
Lines 100-106 Link Here
100
         </property>
96
         </property>
101
       </activation>
97
       </activation>
102
       <build>
98
       <build>
103
@@ -60,7 +60,7 @@
99
@@ -64,7 +64,7 @@
104
                 <phase>process-resources</phase>
100
                 <phase>process-resources</phase>
105
                 <configuration>
101
                 <configuration>
106
                   <target>
102
                   <target>
(-)./files/patch-rt.equinox.framework (-82 / +19 lines)
Lines 7-13 Link Here
7
 Bundle-Vendor: %providerName
7
 Bundle-Vendor: %providerName
8
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true
8
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true
9
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true
9
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.aarch64;singleton:=true
10
 Bundle-Version: 1.1.1000.qualifier
10
 Bundle-Version: 1.1.1100.qualifier
11
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
11
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
12
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
12
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64))
13
-Bundle-Localization: launcher.gtk.linux.aarch64
13
-Bundle-Localization: launcher.gtk.linux.aarch64
Lines 23-29 Link Here
23
   <groupId>org.eclipse.equinox</groupId>
23
   <groupId>org.eclipse.equinox</groupId>
24
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId>
24
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId>
25
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId>
25
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.aarch64</artifactId>
26
   <version>1.1.1000-SNAPSHOT</version>
26
   <version>1.1.1100-SNAPSHOT</version>
27
   <packaging>eclipse-plugin</packaging>
27
   <packaging>eclipse-plugin</packaging>
28
 
28
 
29
   <properties>
29
   <properties>
Lines 31-37 Link Here
31
+    <os>freebsd</os>
31
+    <os>freebsd</os>
32
     <ws>gtk</ws>
32
     <ws>gtk</ws>
33
     <arch>aarch64</arch>
33
     <arch>aarch64</arch>
34
   </properties>
34
     <skipAPIAnalysis>true</skipAPIAnalysis>
35
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project
35
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project
36
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
36
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
37
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
37
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/.project	0000-00-00 00:00:00.000000000 +0000
Lines 52-58 Link Here
52
 Bundle-Vendor: %providerName
52
 Bundle-Vendor: %providerName
53
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
53
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
54
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true
54
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.amd64;singleton:=true
55
 Bundle-Version: 1.1.1000.qualifier
55
 Bundle-Version: 1.1.1100.qualifier
56
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
56
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
57
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
57
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
58
-Bundle-Localization: launcher.gtk.linux.x86_64
58
-Bundle-Localization: launcher.gtk.linux.x86_64
Lines 72-84 Link Here
72
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml
72
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml
73
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
73
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
74
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
74
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.amd64/pom.xml	0000-00-00 00:00:00.000000000 +0000
75
@@ -18,13 +18,13 @@
75
@@ -18,14 +18,14 @@
76
     <relativePath>../../launcher-binary-parent</relativePath>
76
     <relativePath>../../launcher-binary-parent</relativePath>
77
   </parent>
77
   </parent>
78
   <groupId>org.eclipse.equinox</groupId>
78
   <groupId>org.eclipse.equinox</groupId>
79
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
79
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
80
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId>
80
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.amd64</artifactId>
81
   <version>1.1.1000-SNAPSHOT</version>
81
   <version>1.1.1100-SNAPSHOT</version>
82
   <packaging>eclipse-plugin</packaging>
82
   <packaging>eclipse-plugin</packaging>
83
 
83
 
84
   <properties>
84
   <properties>
Lines 87-92 Link Here
87
     <ws>gtk</ws>
87
     <ws>gtk</ws>
88
-    <arch>x86_64</arch>
88
-    <arch>x86_64</arch>
89
+    <arch>amd64</arch>
89
+    <arch>amd64</arch>
90
     <skipAPIAnalysis>true</skipAPIAnalysis>
90
   </properties>
91
   </properties>
91
 </project>
92
 </project>
92
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF
93
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/META-INF/MANIFEST.MF
Lines 98-104 Link Here
98
 Bundle-Vendor: %providerName
99
 Bundle-Vendor: %providerName
99
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.arm;singleton:=true
100
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.arm;singleton:=true
100
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.armv7;singleton:=true
101
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.armv7;singleton:=true
101
 Bundle-Version: 1.1.1000.qualifier
102
 Bundle-Version: 1.1.1100.qualifier
102
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
103
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.5.0)"
103
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm))
104
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm))
104
-Bundle-Localization: launcher.gtk.linux.arm
105
-Bundle-Localization: launcher.gtk.linux.arm
Lines 108-120 Link Here
108
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml
109
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml
109
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
110
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
110
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
111
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.armv7/pom.xml	0000-00-00 00:00:00.000000000 +0000
111
@@ -18,13 +18,13 @@
112
@@ -18,14 +18,14 @@
112
     <relativePath>../../launcher-binary-parent</relativePath>
113
     <relativePath>../../launcher-binary-parent</relativePath>
113
   </parent>
114
   </parent>
114
   <groupId>org.eclipse.equinox</groupId>
115
   <groupId>org.eclipse.equinox</groupId>
115
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.arm</artifactId>
116
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.arm</artifactId>
116
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.armv7</artifactId>
117
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.armv7</artifactId>
117
   <version>1.1.1000-SNAPSHOT</version>
118
   <version>1.1.1100-SNAPSHOT</version>
118
   <packaging>eclipse-plugin</packaging>
119
   <packaging>eclipse-plugin</packaging>
119
 
120
 
120
   <properties>
121
   <properties>
Lines 123-128 Link Here
123
     <ws>gtk</ws>
124
     <ws>gtk</ws>
124
-    <arch>arm</arch>
125
-    <arch>arm</arch>
125
+    <arch>armv7</arch>
126
+    <arch>armv7</arch>
127
     <skipAPIAnalysis>true</skipAPIAnalysis>
126
   </properties>
128
   </properties>
127
 </project>
129
 </project>
128
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF
130
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/META-INF/MANIFEST.MF
Lines 134-166 Link Here
134
 Bundle-Vendor: %providerName
136
 Bundle-Vendor: %providerName
135
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true
137
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true
136
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.i386;singleton:=true
138
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.i386;singleton:=true
137
 Bundle-Version: 1.1.1000.qualifier
139
 Bundle-Version: 1.1.1100.qualifier
138
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
140
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
139
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
141
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
140
-Bundle-Localization: launcher.gtk.linux.x86
142
-Bundle-Localization: launcher.gtk.linux.x86
141
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386))
143
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=i386))
142
+Bundle-Localization: launcher.gtk.freebsd.i386
144
+Bundle-Localization: launcher.gtk.freebsd.i386
143
 Eclipse-BundleShape: dir
145
 Eclipse-BundleShape: dir
144
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties
145
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties	0000-00-00 00:00:00.000000000 +0000
146
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/launcher.gtk.linux.x86.properties	0000-00-00 00:00:00.000000000 +0000
147
@@ -11,5 +11,5 @@
148
 # Contributors:
149
 #     IBM Corporation - initial API and implementation
150
 ###############################################################################
151
-pluginName = Equinox Launcher Linux X86 Fragment
152
+pluginName = Equinox Launcher FreeBSD/i386 Fragment
153
 providerName = Eclipse.org - Equinox
154
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml
146
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml
155
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
147
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
156
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
148
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.i386/pom.xml	0000-00-00 00:00:00.000000000 +0000
157
@@ -18,13 +18,13 @@
149
@@ -18,14 +18,14 @@
158
     <relativePath>../../launcher-binary-parent</relativePath>
150
     <relativePath>../../launcher-binary-parent</relativePath>
159
   </parent>
151
   </parent>
160
   <groupId>org.eclipse.equinox</groupId>
152
   <groupId>org.eclipse.equinox</groupId>
161
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
153
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
162
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.i386</artifactId>
154
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.i386</artifactId>
163
   <version>1.1.1000-SNAPSHOT</version>
155
   <version>1.1.1100-SNAPSHOT</version>
164
   <packaging>eclipse-plugin</packaging>
156
   <packaging>eclipse-plugin</packaging>
165
 
157
 
166
   <properties>
158
   <properties>
Lines 169-174 Link Here
169
     <ws>gtk</ws>
161
     <ws>gtk</ws>
170
-    <arch>x86</arch>
162
-    <arch>x86</arch>
171
+    <arch>i386</arch>
163
+    <arch>i386</arch>
164
     <skipAPIAnalysis>true</skipAPIAnalysis>
172
   </properties>
165
   </properties>
173
 </project>
166
 </project>
174
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project
167
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/.project
Lines 191-197 Link Here
191
 Bundle-Vendor: %providerName
184
 Bundle-Vendor: %providerName
192
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
185
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
193
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true
186
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.powerpc64;singleton:=true
194
 Bundle-Version: 1.1.1000.qualifier
187
 Bundle-Version: 1.1.1100.qualifier
195
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
188
 Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.6.0)"
196
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
189
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
197
-Bundle-Localization: launcher.gtk.linux.ppc64le
190
-Bundle-Localization: launcher.gtk.linux.ppc64le
Lines 201-213 Link Here
201
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml
194
diff -ru rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml
202
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
195
--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
203
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
196
+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64/pom.xml	0000-00-00 00:00:00.000000000 +0000
204
@@ -18,13 +18,13 @@
197
@@ -18,14 +18,14 @@
205
     <relativePath>../../launcher-binary-parent</relativePath>
198
     <relativePath>../../launcher-binary-parent</relativePath>
206
   </parent>
199
   </parent>
207
   <groupId>org.eclipse.equinox</groupId>
200
   <groupId>org.eclipse.equinox</groupId>
208
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
201
-  <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
209
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId>
202
+  <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.powerpc64</artifactId>
210
   <version>1.1.1000-SNAPSHOT</version>
203
   <version>1.1.1100-SNAPSHOT</version>
211
   <packaging>eclipse-plugin</packaging>
204
   <packaging>eclipse-plugin</packaging>
212
 
205
 
213
   <properties>
206
   <properties>
Lines 216-280 Link Here
216
     <ws>gtk</ws>
209
     <ws>gtk</ws>
217
-    <arch>ppc64le</arch>
210
-    <arch>ppc64le</arch>
218
+    <arch>powerpc64</arch>
211
+    <arch>powerpc64</arch>
212
     <skipAPIAnalysis>true</skipAPIAnalysis>
219
   </properties>
213
   </properties>
220
 </project>
214
 </project>
221
diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
222
--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java	0000-00-00 00:00:00.000000000 +0000
223
+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java	0000-00-00 00:00:00.000000000 +0000
224
@@ -78,6 +78,7 @@
225
 	// this internally to be Solaris.
226
 	private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$
227
 	private static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$
228
+	private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$
229
 	private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$
230
 	private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$
231
 	private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$
232
@@ -746,7 +747,7 @@
233
 		// setup default values for known OSes if nothing was specified
234
 		if (osName.equals(Constants.OS_WIN32))
235
 			return Constants.WS_WIN32;
236
-		if (osName.equals(Constants.OS_LINUX))
237
+		if (osName.equals(Constants.OS_LINUX) || osName.equals(Constants.OS_FREEBSD))
238
 			return Constants.WS_GTK;
239
 		if (osName.equals(Constants.OS_MACOSX))
240
 			return Constants.WS_COCOA;
241
@@ -769,6 +770,8 @@
242
 		// EXCEPTION: All mappings of SunOS convert to Solaris
243
 		if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS))
244
 			return Constants.OS_SOLARIS;
245
+		if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD))
246
+			return Constants.OS_FREEBSD;
247
 		if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX))
248
 			return Constants.OS_LINUX;
249
 		if (osName.equalsIgnoreCase(INTERNAL_OS_QNX))
250
diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java
251
--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java	0000-00-00 00:00:00.000000000 +0000
252
+++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java	0000-00-00 00:00:00.000000000 +0000
253
@@ -80,7 +80,7 @@
254
 
255
 		if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
256
 			String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
257
-			if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$	//$NON-NLS-2$ //$NON-NLS-3$
258
+			if (osName.startsWith("freebsd") || osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$	//$NON-NLS-2$ //$NON-NLS-3$
259
 				IS_PROCESSING_NEEDED = true;
260
 			}
261
 		}
262
diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
263
--- rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java	0000-00-00 00:00:00.000000000 +0000
264
+++ rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java	0000-00-00 00:00:00.000000000 +0000
265
@@ -26,6 +26,12 @@
266
 	//TODO These constants need to be aligned with the OSGi ones. See page 64-588 of the spec
267
 
268
 	/**
269
+	 * Constant string (value "freebsd") indicating the platform is running on a
270
+	 * FreeBSD-based operating system.
271
+	 */
272
+	public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
273
+
274
+	/**
275
 	 * Constant string (value "win32") indicating the platform is running on a
276
 	 * Window 32-bit operating system (e.g., Windows 98, NT, 2000).
277
 	 */
278
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
215
diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
279
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
216
--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
280
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000
217
+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	0000-00-00 00:00:00.000000000 +0000

Return to bug 240480