Windows: Wix disable integrated logon by default

[openafs.git] / src / WINNT / install / wix / config.wxi

diff --git a/src/WINNT/install/wix/config.wxi b/src/WINNT/install/wix/config.wxi
index e2d8b81..3441a31 100644 (file)
--- a/src/WINNT/install/wix/config.wxi
+++ b/src/WINNT/install/wix/config.wxi
@@ -23,6 +23,7 @@
        MediaDllDir    : Installer Dlls
        MediaBinDir    : Installer Exes
        SrcDir         : openafs\src\
+       DocDir         : openafs\doc\
        DestDir        : $(DEST)\
        BinDir         : $(DEST)\bin\
        LibDir         : $(DEST)\lib\
@@ -36,10 +37,10 @@
 
        <!-- Configuration options, allow for commandline specification -->
     <?ifndef CellName?>
-        <?define CellName="openafs.org"?>
+        <?define CellName="<enter.your.cell>"?>
     <?endif?>
     <?ifndef LogonOptions?>
-               <?define LogonOptions="1"?>
+               <?define LogonOptions="0"?>
     <?endif?>
     <?ifndef FreelanceMode?>
                <?define FreelanceMode="1"?>
@@ -57,13 +58,16 @@
                <?define NetbiosName="AFS"?>
     <?endif?>
     <?ifndef RxMaxMTU?>
-               <?define RxMaxMTU="1260"?>
+               <?define RxMaxMTU="0"?>
     <?endif?>
     <?ifndef HideDotFiles?>
                <?define HideDotFiles="1"?>
     <?endif?>
     <?ifndef SecurityLevel?>
-               <?define SecurityLevel="0"?>
+               <?define SecurityLevel="1"?>
+    <?endif?>
+    <?ifndef SMBAuthType?>
+               <?define SMBAuthType="2"?>
     <?endif?>
 
     <?define InstallTimestamp="[Date] [Time]"?>
@@ -90,7 +94,7 @@
         <?define PackageCode="6086552D-3EFA-436C-A0BD-25668849F0DB"?>
     <?endif?>
     <?if $(env.AFSDEV_BUILDTYPE) = "CHECKED"?>
-        <?define Debug?>
+        <?define Debug = "yes"?>
         <?define ReleaseType="DT"?>
     <?elseif $(env.AFSDEV_BUILDTYPE) = "FREE"?>
         <?define ReleaseType="GA"?>
@@ -98,11 +102,50 @@
         <?error AFSDEV_BUILDTYPE is not set in the environment.?>
     <?endif?>
 
-    <!-- We are including debug symbols anyway.  Undefine this for a leaner installer witout debug syms. -->
-    <?define DebugSyms?>
-    
+    <!-- Are we building a lite installer? then don't include debug symbols -->
+    <?ifdef LiteClient ?>
+        <?define NoDebugSyms ?>
+    <?endif?>
+
+    <!-- Default to including debug symbols unless someone defines
+         NoDebugSyms. -->
+    <?ifndef NoDebugSyms ?>
+        <?define DebugSyms = "yes"?>
+    <?endif?>
+
+    <!-- Parameters for the features containing debug symbols -->
+    <?ifdef DebugSyms?>
+         <?ifdef Debug?>
+             <?define DebugSymInstallDefault="followParent"?>
+             <?define DebugSymLowLevel="30"?>
+             <?define DebugSymHighLevel="130"?>
+         <?else?>
+             <?define DebugSymInstallDefault="followParent"?>
+             <?define DebugSymLowLevel="130"?>
+             <?define DebugSymHighLevel="130"?>
+         <?endif?>
+    <?endif?>
+
+    <!-- Build type specifications -->
+    <?ifndef env.CPU?>
+       <?error CPU is not set ?>
+    <?endif?>
+    <?if $(env.CPU) = "i386"?>
+       <?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?>
+
     <!-- Use the afsloopback.dll instead of instloop.exe -->
-    <?define UseDllLoopbackInstaller?>
+    <?define UseDllLoopbackInstaller = "yes"?>
 
     <!-- Note that if the follwing file does not exist, the build will fail -->
     <?ifndef CellDbFile?>
@@ -117,6 +160,9 @@
     <?ifndef SrcDir?>
         <?define SrcDir="$(env.AFSROOT)\src\"?>
     <?endif?>
+    <?ifndef DocDir?>
+        <?define DocDir="$(env.AFSROOT)\doc\"?>
+    <?endif?>
     <?ifndef MediaDllDir?>
         <?define MediaDllDir="$(var.DestDir)WinInstall\Dll\"?>
     <?endif?>
@@ -147,4 +193,6 @@
                <?error AFSVER_CL needs to be set to the compiler version?>
     <?endif?>
     <?define SystemDir="$(env.SystemRoot)\System32\"?>
+
+
 </Include>