From a4950863fc0528df9f12ba2dafc3ac7329e5d740 Mon Sep 17 00:00:00 2001 From: Asanka Herath Date: Tue, 22 Jun 2004 05:00:13 +0000 Subject: [PATCH] wix-changes-20040621 1. Fix choice for logon options to include only 'not integrated', 'integrated' and 'integrated with high security'. 2. Add configuration page to select whether or not to run afscreds.exe when logging in and also choose the command line options for afscreds.exe. 3. Assert that all dependencies are satisfied at install time when installing the server component. 4. If running in full UI mode and installing the server component, the user is notified about dependencies and given a choice to review selections or just let the installer add the required components. --- src/WINNT/install/wix/config.wxi | 2 + src/WINNT/install/wix/feature.wxi | 4 + src/WINNT/install/wix/files.wxi | 7 +- src/WINNT/install/wix/lang/en_US/ui.wxi | 110 +++++++++++++++++++++--- src/WINNT/install/wix/openafs.wxs | 15 +++- src/WINNT/install/wix/property.wxi | 9 ++ 6 files changed, 129 insertions(+), 18 deletions(-) diff --git a/src/WINNT/install/wix/config.wxi b/src/WINNT/install/wix/config.wxi index 61875656c..9529478fc 100644 --- a/src/WINNT/install/wix/config.wxi +++ b/src/WINNT/install/wix/config.wxi @@ -16,6 +16,8 @@ CellName : Default cell name CellDbFile : Path to default CellServDB file + RemoveLoopback : Defined if we want to remove the loopback adapter + Directory specs: (all dir. specs end in a '\') MediaBinDir : Installer binaries (instloop.exe etc.) diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi index 73412d658..aa6918a3c 100644 --- a/src/WINNT/install/wix/feature.wxi +++ b/src/WINNT/install/wix/feature.wxi @@ -16,6 +16,10 @@ VersionNT = 500 And ServicePackLevel < 3 + + + + diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi index fa6a77fdd..c6c9b4f78 100644 --- a/src/WINNT/install/wix/files.wxi +++ b/src/WINNT/install/wix/files.wxi @@ -701,10 +701,13 @@ - - + + + + + diff --git a/src/WINNT/install/wix/lang/en_US/ui.wxi b/src/WINNT/install/wix/lang/en_US/ui.wxi index c73a1b36b..49696b025 100644 --- a/src/WINNT/install/wix/lang/en_US/ui.wxi +++ b/src/WINNT/install/wix/lang/en_US/ui.wxi @@ -227,8 +227,15 @@ InstallMode = "Custom" - &feaClient = 3 - &feaClient <> 3 + + 3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) ))]]> + + + 3 AND NOT ((&feaServer=3 OR (!feaServer=3 AND &feaServer<1)) AND (&feaClient=2 OR (&feaClient<>3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) ))]]> + + + 3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) )) ]]> + @@ -247,11 +254,11 @@ [DlgTitleFont]Custom Setup - + Multiline description of the currently selected item. - + The size of the currently selected item. @@ -266,6 +273,53 @@ Installed + + + + 1 + + + 3 AND !feaClient<>3)]]> + 3 AND !feaControlCenter<>3)]]> + + + + + 3 ]]> + + + + + + 1 + + + Dependencies of the OpenAFS Server + + + The OpenAFS Server component requires the following component(s) which are currently not set to be installed. Click Next to add these components or click Back to review your selections. + + + + + + + + + [DlgTitleFont]Server Dependencies + + + 1 @@ -677,7 +731,7 @@ 1 - 1 + 1 1 @@ -694,11 +748,11 @@ - - - - - + + + + + 0 @@ -711,10 +765,40 @@ 0 1 - 2 - 3 + 3 + + + 1 + + + CREDSSTARTUP = "1" + CREDSSTARTUP <> "1" + 1 + + + 1 + + + + Choose the configuration options for AFS credentials. + + + + + [DlgTitleFont]Options for AFS Credentials + + + + + + + + + + + 1 @@ -778,7 +862,7 @@ InstallMode = "Server Image" (InstallMode = "Custom" OR InstallMode = "Change") AND &feaClient <> 3 - (InstallMode = "Custom" OR InstallMode = "Change") AND &feaClient = 3 + (InstallMode = "Custom" OR InstallMode = "Change") AND &feaClient = 3 InstallMode = "Repair" InstallMode = "Typical" OR InstallMode = "Complete" diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs index d2e48c615..871ba41fe 100644 --- a/src/WINNT/install/wix/openafs.wxs +++ b/src/WINNT/install/wix/openafs.wxs @@ -124,7 +124,12 @@ DllEntry="UninstallNsisInstallation" Execute="immediate" /> + @@ -134,8 +139,12 @@ IBMAFS_UPGRADE OR OPENAFS_UPGRADE - NSISUNINSTALL <> "" AND UILevel >= 4 - NSISUNINSTALL <> "" AND UILevel < 4 + NSISUNINSTALL <> "" AND UILevel >= 4 + NSISUNINSTALL <> "" AND UILevel < 4 + + + 3 AND !feaClient<>3) OR &feaControlCenter=2 OR (&feaControlCenter<>3 AND !feaControlCenter<>3) ))]]> + &feaLoopback=2 OR &feaLoopback=3 &feaLoopback=3 diff --git a/src/WINNT/install/wix/property.wxi b/src/WINNT/install/wix/property.wxi index 1938f965f..90b25e19e 100644 --- a/src/WINNT/install/wix/property.wxi +++ b/src/WINNT/install/wix/property.wxi @@ -11,6 +11,15 @@ $(var.RxMaxMTU) $(var.HideDotFiles) + 1 + -a + -m + -n + -q + + $(var.ProductComments) openafs-info@openafs.org -- 2.39.5