DEVEL15-windows-wix-install-idn-redist-20080626

LICENSE MIT

Install the Microsoft IDN Redistributables which are required for
Unicode Normalization on XP and 2003.

(cherry picked from commit 0e04d01891eb2269653a84f86b066ebe10eb8a54)

diff --git a/src/WINNT/install/wix/NTMakefile b/src/WINNT/install/wix/NTMakefile
index 690f109ffda4c5db6a1e2b02197e7cf2badb6344..af5ba38e8c08d8c2265dcdb9d131115954b6201c 100644 (file)
--- a/src/WINNT/install/wix/NTMakefile
+++ b/src/WINNT/install/wix/NTMakefile
@@ -17,6 +17,11 @@ MSIFILE = $(MEDIADIR)\openafs-$(LANG).msi
 BINMSIFILE = $(MEDIADIR)\openafs-32bit-tools-$(LANG).msi
 !ENDIF
 
+!IFNDEF MSIDNNLS
+!ERROR Please set MSIDNNLS to the directory where Microsoft IDN Mitigation APIs are installed.
+# $(MSIDNNLS)\REDIST\idndl.(platform).exe should exist.
+!ENDIF
+
 WIXINCLUDES = \
        config.wxi \
        feature.wxi \
@@ -74,6 +79,7 @@ $(WIXOBJ): openafs.wxs $(WIXINCLUDES)
                -dVersionPatch=$(AFSPRODUCT_VER_PATCH)  \
                "-dDestDir=$(DESTDIR)\\" \
                -dCellDbFile=CellServDB \
+               -dIDNMRedistDir=$(MSIDNNLS)\\REDIST     \
                -v0 \
                -w0 \
         $(AFSDEV_AUXWIXDEFINES)        openafs.wxs

diff --git a/src/WINNT/install/wix/config.wxi b/src/WINNT/install/wix/config.wxi
index 4c5b3e0fbf75bbdb4cee59f387ba21c14ce02393..83796d39116ef386a4ac36315bc4b5fe8d1d2fb7 100644 (file)
--- a/src/WINNT/install/wix/config.wxi
+++ b/src/WINNT/install/wix/config.wxi
@@ -125,10 +125,12 @@
        <?define InstallerVersion="110"?>
        <?define Platform="Intel"?>
        <?define Win64="no"?>
+        <?define Arch="x86"?>
     <?elseif $(env.CPU) = "AMD64"?>
        <?define InstallerVersion="200"?>
        <?define Platform="x64"?>
        <?define Win64="yes"?>
+        <?define Arch="amd64"?>
     <?else?>
         <?error Unknown build type?>
     <?endif?>

diff --git a/src/WINNT/install/wix/lang/en_US/strings.wxl b/src/WINNT/install/wix/lang/en_US/strings.wxl
index 9552cfcf2a6c531f9b3bbdfa175e128f9d9ca372..2efd1c25d64156aa5ffbff2395a3ac3be52e1c1a 100644 (file)
--- a/src/WINNT/install/wix/lang/en_US/strings.wxl
+++ b/src/WINNT/install/wix/lang/en_US/strings.wxl
@@ -61,6 +61,7 @@
        <String Id="ActConfigureClient">Configuring the AFS client service</String>
        <String Id="ActConfigureServer">Configuring the AFS server service</String>
        <String Id="ActRemoveNsisInstallation">Removing existing installation of OpenAFS</String>
+        <String Id="ActInstallIDNMRedistributable">Installing Microsoft Internationalized Domain Name Mitigation APIs</String>
        
        <String Id="StrNsisAbortReason">Installation of OpenAFS for Windows was prematurely terminated because OpenAFS [NSISVERSION] was already installed.</String>
        <String Id="StrUninstallDesc">Uninstall OpenAFS from the local machine.</String>

diff --git a/src/WINNT/install/wix/lang/en_US/ui.wxi b/src/WINNT/install/wix/lang/en_US/ui.wxi
index 342da26db0c7681b8d640008608cc33e82edf4f4..1b18559abd310b906365bf4e4a38633b30728af2 100644 (file)
--- a/src/WINNT/install/wix/lang/en_US/ui.wxi
+++ b/src/WINNT/install/wix/lang/en_US/ui.wxi
@@ -1046,7 +1046,7 @@
          <ProgressText Action="ConfigureClient">$(loc.ActConfigureClient)</ProgressText>
          <ProgressText Action="ConfigureServer">$(loc.ActConfigureServer)</ProgressText>
          <ProgressText Action="RemoveNsisInstallation">$(loc.ActRemoveNsisInstallation)</ProgressText>
-         
+         <ProgressText Action="InstallIDNMRedistributable">$(loc.ActInstallIDNMRedistributable)</ProgressText>
          
       <AdminUISequence>
         <Show Dialog="FatalError" OnExit="error" />

diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index a1f72348e577ee355a9b274a48a6b2c0d87a3570..0b65b5a16fccba5006f978dedc60c92d656aaf1d 100644 (file)
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -87,6 +87,17 @@
         <Binary
                 Id="BIN_afsCustom"
                 src="$(var.MediaDllDir)afscustom.dll"/>
+    <Binary
+       Id="BIN_idndl.exe"
+       src="$(var.IDNMRedistDir)\idndl.$(var.Arch).exe" />
+    <CustomAction
+       Id="InstallIDNMRedistributable"
+       BinaryKey="BIN_idndl.exe"
+       ExeCommand="/quiet /norestart"
+       Execute="deferred"
+       Impersonate="no"
+       />
+
        <?ifdef UseDllLoopbackInstaller?>
         <CustomAction
          Id="InstallLoopback"
@@ -224,6 +235,7 @@
             <Custom Action="RollbackNetProvider" After="WriteRegistryValues">&amp;feaClient=3</Custom>
                        <Custom Action="InstallNetProvider" After="RollbackNetProvider">&amp;feaClient=3</Custom>
                        <Custom Action="RemoveNetProvider" After="InstallNetProvider">&amp;feaClient=2</Custom>
+      <Custom Action="InstallIDNMRedistributable" After="WriteRegistryValues">&amp;feaClient=3</Custom>
                        <Custom Action="ConfigureClient" After="InstallServices">&amp;feaClient=3</Custom>
                        <Custom Action="ConfigureServer" After="ConfigureClient">&amp;feaServer=3</Custom>
                        <!-- <Custom Action="RemoveAFSAdminGroup" Before="">&amp;feaClient=2</Custom> -->

diff --git a/src/WINNT/install/wix/runtime.wxi b/src/WINNT/install/wix/runtime.wxi
index 51d8ae9110812f59b3acd946405e8bc6c0e1e3c4..a4068c92a9b6a8ff93072dc7522ad8fc4762d24f 100644 (file)
--- a/src/WINNT/install/wix/runtime.wxi
+++ b/src/WINNT/install/wix/runtime.wxi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?> 
 <Include>
     <?if $(env.AFSVER_CL) = "1400" ?>
                <MergeRef Id="MSVCRT8MEM"/>