You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by bo...@apache.org on 2015/08/28 14:47:30 UTC
svn commit: r1698324 - in /felix/trunk/framework/src/main:
java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
resources/default.properties
Author: bob
Date: Fri Aug 28 12:47:30 2015
New Revision: 1698324
URL: http://svn.apache.org/r1698324
Log:
FELIX-5014 - Support Windows 10 for Bundle-NativeCode Thanks Yang,BongYeol!
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
felix/trunk/framework/src/main/resources/default.properties
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java?rev=1698324&r1=1698323&r2=1698324&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java Fri Aug 28 12:47:30 2015
@@ -63,6 +63,7 @@ public class NativeLibraryClause
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 @@ public class NativeLibraryClause
{
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))
Modified: felix/trunk/framework/src/main/resources/default.properties
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/resources/default.properties?rev=1698324&r1=1698323&r2=1698324&view=diff
==============================================================================
--- felix/trunk/framework/src/main/resources/default.properties (original)
+++ felix/trunk/framework/src/main/resources/default.properties Fri Aug 28 12:47:30 2015
@@ -65,6 +65,7 @@ felix.native.osname.alias.windowsvista=w
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=