diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/windows/installer/wix/Makefile | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/windows/installer/wix/kfw.wxs | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/windows/installer/wix/Makefile b/src/windows/installer/wix/Makefile index 7b66b1211..3c2bfd691 100644 --- a/src/windows/installer/wix/Makefile +++ b/src/windows/installer/wix/Makefile @@ -45,7 +45,7 @@ $(OBJFILE): kfw.wxs $(WIXINCLUDES) $(MSIFILE): $(OBJFILE) $(CUSTOMDLL) $(LIGHT) -out $@ $(OBJFILE) \ - -loc lang\strings_$(LANG).wxl + -loc lang\strings_$(LANG).wxl -ext WixUtilExtension.dll $(CUSTOMDLL): custom\custom.cpp $(CD) custom diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs index c0394ee0c..74ef8ac0c 100644..100755 --- a/src/windows/installer/wix/kfw.wxs +++ b/src/windows/installer/wix/kfw.wxs @@ -146,6 +146,18 @@ Return="ignore" Execute="deferred" /> + <CustomAction Id="RenameKrb5Ini_Cmd" + Property="RenameKrb5Ini" + Value=""cmd.exe" /c rename "[WindowsFolder]\krb5.ini" krb5-ini-pre-kfw4" + Execute="immediate" /> + <CustomAction + Id="RenameKrb5Ini" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Execute="deferred" + Impersonate="no" + Return="ignore" /> + <CustomAction Id="RollbackNetProvider" BinaryKey="binCustom" @@ -158,6 +170,8 @@ <InstallExecuteSequence> <Custom Action="KillRunningProcesses" After="InstallValidate"/> <RemoveExistingProducts After="KillRunningProcesses">(Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW)</RemoveExistingProducts> + <Custom Action="RenameKrb5Ini_Cmd" Before="RenameKrb5Ini"/> + <Custom Action="RenameKrb5Ini" Before="InstallFinalize">SYSTEMKRB5INI <> ""</Custom> <!-- When running with a UI, CCP_Success property is not passed down to the server. --> <Custom Action="AbortNoIE" Before="RemoveNsisInstallation">UILevel = 0 And (Not Installed) And (CCP_Success <> 1)</Custom> <Custom Action="RemoveNsisInstallation" Before="AbortCantRemoveNSIS">UPGRADENSIS <> "" And UILevel >= 4</Custom> |