FELIX-5014 - Support Windows 10 for Bundle-NativeCode Thanks Yang,BongYeol!
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1698324 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
index 92b30dd..a9ac0b7 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
@@ -63,6 +63,7 @@
private static final String OS_WINDOWS_7 = "windows7";
private static final String OS_WINDOWS_8 = "windows8";
private static final String OS_WINDOWS_9 = "windows9";
+ private static final String OS_WINDOWS_10 = "windows10";
private static final String OS_WINDOWS_95 = "windows95";
private static final String OS_WINDOWS_98 = "windows98";
private static final String OS_WINDOWS_CE = "windowsce";
@@ -613,6 +614,11 @@
{
os = OS_WINDOWS_9;
}
+ else if ((value.indexOf(" 10") >= 0) || value.equals("win10"))
+ {
+ os = OS_WINDOWS_10;
+ }
+
return os;
}
else if (value.startsWith(OS_LINUX))
diff --git a/framework/src/main/resources/default.properties b/framework/src/main/resources/default.properties
index 9d25843..fecc91b 100644
--- a/framework/src/main/resources/default.properties
+++ b/framework/src/main/resources/default.properties
@@ -65,6 +65,7 @@
felix.native.osname.alias.windows7=windows 7,win32
felix.native.osname.alias.windows8=windows 8,win32
felix.native.osname.alias.windows9=windows 9,win32
+felix.native.osname.alias.windows10=windows 10,win32
felix.native.osname.alias.windowsserver2008=windows server 2008,win32
felix.native.osname.alias.win32=