From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Thu, 4 Mar 2021 09:43:15 +0000 (+0700)
Subject: Support Windows 10 and Windows Server 2016/2019 in installer
X-Git-Tag: java16-add-opens~37^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F32%2Fhead;p=aspectj.git

Support Windows 10 and Windows Server 2016/2019 in installer

Those versions were not detected until now, which lead to bogus Windows
batch files forwarding only 9 Ajc parameters to the Java process via
"%1 %2 %3 %4 %5 %6 %7 %8 %9" instead of "%*".

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---

diff --git a/build/src/main/java/$installer$/org/aspectj/Main.java b/build/src/main/java/$installer$/org/aspectj/Main.java
index 2ffc8b889..f75f28a6e 100644
--- a/build/src/main/java/$installer$/org/aspectj/Main.java
+++ b/build/src/main/java/$installer$/org/aspectj/Main.java
@@ -690,8 +690,10 @@ class InstallContext {
 	}
 
 	public boolean onWindowsPro() {
-		return getOS().equals("Windows NT") || getOS().equals("Windows 2000") || getOS().equals("Windows XP")
-				|| getOS().equals("Windows Vista") || getOS().equals("Windows 7") || getOS().startsWith("Windows 8");
+		// TODO: Think about a more future-proof solution also checking 'os.version' system property. See also this table:
+		//       https://github.com/openjdk/jdk/blob/9604ee82690f89320614b37bfef4178abc869777/src/java.base/windows/native/libjava/java_props_md.c#L446
+		//       Alternatively, explicitly exclude unsupported versions because those won't change in the future.
+		return getOS().matches("^Windows (NT|2000|XP|Vista|Server|7|8|10).*");
 	}
 
 	public boolean onMacintosh() {