DEVEL15-windows-nsis-install-idn-redist-20080629

LICENSE MIT

Install IDN on XP and 2003 only

(cherry picked from commit fed6593bf343425807f425aeb8315886feeb8670)

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 2b3b220..6cd6108 100644 (file)
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -532,10 +532,16 @@ Section "!AFS Client" secClient
   nsExec::Exec "net stop TransarcAFSServer"
   
   ; Install the Microsoft IDNM Redistributable
+  Call GetWindowsVersion
+  Pop $R1
+  StrCmp $R1 "XP" installIDN +1
+  StrCmp $R1 "2003" installIDN skipIDN
+  installIDN:
   GetTempFileName $R0
   File /oname=$R0 "${IDNMREDIST}"
   nsExec::Exec '$R0 /quiet /norestart'
-  
+  skipIDN:  
+
    ; Do client components
   SetOutPath "$INSTDIR\Client\Program"
   File "${AFS_CLIENT_BUILDDIR}\afsshare.exe"
@@ -3628,7 +3634,7 @@ FunctionEnd
 ;
 ; Returns on top of stack
 ;
-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista)
+; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista/2008)
 ; or
 ; '' (Unknown Windows Version)
 ;