You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2007/12/17 23:46:59 UTC
svn commit: r605027 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
Author: pauls
Date: Mon Dec 17 14:46:58 2007
New Revision: 605027
URL: http://svn.apache.org/viewvc?rev=605027&view=rev
Log:
Make the win32 alias match any version of windows for native clauses (FELIX-438).
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java?rev=605027&r1=605026&r2=605027&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4LibraryClause.java Mon Dec 17 14:46:58 2007
@@ -134,9 +134,19 @@
private boolean checkOSNames(String currentOSName, String[] osnames)
{
+ boolean win32 = currentOSName.startsWith("win") &&
+ (currentOSName.equals("windows95") ||
+ currentOSName.equals("windows98") ||
+ currentOSName.equals("windowsnt") ||
+ currentOSName.equals("windows2000") ||
+ currentOSName.equals("windowsxp") ||
+ currentOSName.equals("windowsce") ||
+ currentOSName.equals("windowsvista"));
+
for (int i = 0; (osnames != null) && (i < osnames.length); i++)
{
- if (osnames[i].equals(currentOSName))
+ if (osnames[i].equals(currentOSName) ||
+ ("win32".equals(osnames[i]) && win32))
{
return true;
}
@@ -369,6 +379,10 @@
else if (value.indexOf("ce") >= 0)
{
os = "windowsce";
+ }
+ else if (value.indexOf("vista") >= 0)
+ {
+ os = "windowsvista";
}
return os;
}