Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Zhilin2019-08-07 07:02:23 -0400
committerThomas Watson2019-08-07 09:15:26 -0400
commitd43eec5b6f7b407ba7ae5e83222d546234b196c1 (patch)
tree4dd7d116972f93a34c8dc060c75bcb9731575790
parent5af34cbde59d711f206e78233e8a21826b080cd0 (diff)
downloadrt.equinox.framework-d43eec5b6f7b407ba7ae5e83222d546234b196c1.tar.gz
rt.equinox.framework-d43eec5b6f7b407ba7ae5e83222d546234b196c1.tar.xz
rt.equinox.framework-d43eec5b6f7b407ba7ae5e83222d546234b196c1.zip
Bug 549840 - add support of FreeBSD platform for org.eclipse.osgi bundleY20190808-0900I20190807-1800
Bump version from 1.8.400 to 1.9.0 due to new API change (new constant) Change-Id: I71d74fbb4d0a11b804bf3c04c018e1d72892afea Signed-off-by: Michael Zhilin <mizhka@gmail.com> Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java5
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java2
-rw-r--r--bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.osgi/supplement/pom.xml2
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java7
6 files changed, 17 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 768511155..ee2449cc7 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -38,7 +38,7 @@ Export-Package: org.eclipse.core.runtime.adaptor;x-friends:="org.eclipse.core.ru
org.eclipse.osgi.report.resolution;version="1.0";uses:="org.osgi.service.resolver,org.osgi.resource",
org.eclipse.osgi.service.datalocation;version="1.3",
org.eclipse.osgi.service.debug;version="1.2",
- org.eclipse.osgi.service.environment;version="1.3",
+ org.eclipse.osgi.service.environment;version="1.4",
org.eclipse.osgi.service.localization;version="1.1";uses:="org.osgi.framework",
org.eclipse.osgi.service.pluginconversion;version="1.0",
org.eclipse.osgi.service.resolver;version="1.6";uses:="org.osgi.framework,org.osgi.framework.hooks.resolver,org.osgi.framework.wiring",
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
index 13382c882..c08e80025 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
@@ -85,6 +85,7 @@ public class EquinoxConfiguration implements EnvironmentInfo {
private static final String INTERNAL_OS_OS400 = "OS/400"; //$NON-NLS-1$
private static final String INTERNAL_OS_OS390 = "OS/390"; //$NON-NLS-1$
private static final String INTERNAL_OS_ZOS = "z/OS"; //$NON-NLS-1$
+ private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$
// While we recognize the i386 architecture, we change
// this internally to be x86.
private static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$
@@ -749,6 +750,8 @@ public class EquinoxConfiguration implements EnvironmentInfo {
return Constants.WS_WIN32;
if (osName.equals(Constants.OS_LINUX))
return Constants.WS_GTK;
+ if (osName.equals(Constants.OS_FREEBSD))
+ return Constants.WS_GTK;
if (osName.equals(Constants.OS_MACOSX))
return Constants.WS_COCOA;
if (osName.equals(Constants.OS_HPUX))
@@ -784,6 +787,8 @@ public class EquinoxConfiguration implements EnvironmentInfo {
return Constants.OS_OS390;
if (osName.equalsIgnoreCase(INTERNAL_OS_ZOS))
return Constants.OS_ZOS;
+ if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD))
+ return Constants.OS_FREEBSD;
// os.name on Mac OS can be either Mac OS or Mac OS X
if (osName.regionMatches(true, 0, INTERNAL_OS_MACOSX, 0, INTERNAL_OS_MACOSX.length()))
return Constants.OS_MACOSX;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java
index 4b6706597..4e6224e6f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/util/TextProcessor.java
@@ -80,7 +80,7 @@ public class TextProcessor {
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$
String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
- if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
IS_PROCESSING_NEEDED = true;
}
}
diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
index e32c05b10..d067299f4 100644
--- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.supplement
-Bundle-Version: 1.8.400.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.equinox.log;version="1.0",
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.equinox.log;version="1.0",
org.eclipse.osgi.report.resolution;version="1.0",
org.eclipse.osgi.service.datalocation;version="1.3",
org.eclipse.osgi.service.debug;version="1.2",
- org.eclipse.osgi.service.environment;version="1.3",
+ org.eclipse.osgi.service.environment;version="1.4",
org.eclipse.osgi.service.localization;version="1.1",
org.eclipse.osgi.service.runnable;version="1.1",
org.eclipse.osgi.service.urlconversion;version="1.0",
diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml
index e389d4f0f..b87d5f724 100644
--- a/bundles/org.eclipse.osgi/supplement/pom.xml
+++ b/bundles/org.eclipse.osgi/supplement/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.supplement</artifactId>
- <version>1.8.400-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
index 156e3a853..ba7496301 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
@@ -96,6 +96,13 @@ public interface Constants {
public static final String OS_ZOS = "z/os"; //$NON-NLS-1$
/**
+ * Constant string (value "freebsd") indicating the platform is running on a
+ * FreeBSD-based operating system.
+ * @since 3.15
+ */
+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$
+
+ /**
* Constant string (value "unknown") indicating the platform is running on a
* machine running an unknown operating system.
*/

Back to the top