diff options
| author | Dominik Picheta <dominikpicheta@googlemail.com> | 2014-12-30 13:14:26 +0000 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2014-12-30 13:14:26 +0000 |
| commit | 3f7eca19ec5cb0225407f7b2f4beb5d563c8746a (patch) | |
| tree | f08acc4230f56ffd8b25c05e2d79fc37cdcac0b7 /lib | |
| parent | d01eb14a3997b53fca5ed6628d0ebbf6f91d8b43 (diff) | |
| parent | c77176e0c7cd1d0f5f2d7ccf4fe0281b02e7c079 (diff) | |
| download | Nim-3f7eca19ec5cb0225407f7b2f4beb5d563c8746a.tar.gz | |
Merge pull request #1792 from astrolantique/devel
Update OS version detections.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/impure/osinfo_posix.nim | 10 | ||||
| -rw-r--r-- | lib/impure/osinfo_win.nim | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/impure/osinfo_posix.nim b/lib/impure/osinfo_posix.nim index 1baff8c55..0ed4289c4 100644 --- a/lib/impure/osinfo_posix.nim +++ b/lib/impure/osinfo_posix.nim @@ -35,7 +35,15 @@ proc getSystemVersion*(): string = elif $unix_info.sysname == "Darwin": # Darwin result.add("Mac OS X ") - if "10" in $unix_info.release: + if "14" in $unix_info.release: + result.add("v10.10 Yosemite") + elif "13" in $unix_info.release: + result.add("v10.9 Mavericks") + elif "12" in $unix_info.release: + result.add("v10.8 Mountian Lion") + elif "11" in $unix_info.release: + result.add("v10.7 Lion") + elif "10" in $unix_info.release: result.add("v10.6 Snow Leopard") elif "9" in $unix_info.release: result.add("v10.5 Leopard") diff --git a/lib/impure/osinfo_win.nim b/lib/impure/osinfo_win.nim index f423a34a3..becec928e 100644 --- a/lib/impure/osinfo_win.nim +++ b/lib/impure/osinfo_win.nim @@ -245,6 +245,14 @@ proc `$`*(osvi: TVersionInfo): string = if osvi.ProductType == VER_NT_WORKSTATION: result.add("Windows 7 ") else: result.add("Windows Server 2008 R2 ") + elif osvi.minorVersion == 2: + if osvi.ProductType == VER_NT_WORKSTATION: + result.add("Windows 8 ") + else: result.add("Windows Server 2012 ") + elif osvi.minorVersion == 3: + if osvi.ProductType == VER_NT_WORKSTATION: + result.add("Windows 8.1 ") + else: result.add("Windows Server 2012 R2 ") var dwType = getProductInfo(osvi.majorVersion, osvi.minorVersion, 0, 0) case dwType |