diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework')
2 files changed, 8 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java index 67be8107b..b6fd06b3c 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java @@ -65,7 +65,13 @@ public class AliasMapper { } public String getCanonicalOSName(String osname) { - String result = osnameCanonicalTable.get(osname.toLowerCase()); + String lowerName = osname.toLowerCase(); + String result = osnameCanonicalTable.get(lowerName); + if (result == null) { + if (lowerName.startsWith("windows")) { //$NON-NLS-1$ + return "win32"; //$NON-NLS-1$ + } + } return result == null ? osname : result; } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases index 513730b80..729762a6c 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases @@ -46,6 +46,7 @@ WindowsServer2012 "Windows 2012" "Windows Server 2012" Win2012 Win32 # Microsoft WindowsServer2012R2 "Windows 2012 R2" "Windows Server 2012 R2" Win2012R2 Win32 # Microsoft WindowsServer2015 "Windows 2015" "Windows Server 2015" Win2015 Win32 # Microsoft WindowsServer2015R2 "Windows 2015 R2" "Windows Server 2015 R2" Win2015R2 Win32 # Microsoft +WindowsServer2016 "Windows 2016" "Windows Server 2016" Win2016 Win32 # Microsoft Windows7 "Windows 7" Win7 Win32 # Microsoft Windows8 "Windows 8" "Windows 8.1" "Windows 8.2" "Windows 8.3" Win8 Win32 # Microsoft Windows10 "Windows 10" Win10 Win32 # Microsoft |