windows-build-environment-cleanup-20010906

clean up previous problems in the win2k build env

diff --git a/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep b/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep
index 7101cbd9e5bb195abb9c04aea498327c6787ba57..66661dabb9ebdb597eb1511c707467e8f8a4c68d 100644 (file)
--- a/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep
+++ b/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep
@@ -3,9 +3,3 @@
 .\GetWebDll.cpp : \
        ".\GetWebDll.h"\
        ".\GetWebDllFun.h"\
-       
-
-.\StdAfx.cpp : \
-       ".\StdAfx.h"\
-       "c:\program files\microsoft visual studio\vc98\include\basetsd.h"\
-       

diff --git a/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile b/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile
index f5b9cc6f705c6647187edd0d444e2b0f1417c6ef..27c76ba44362a593a209c48fc2f86533d4ff3763 100644 (file)
--- a/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile
+++ b/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile
@@ -11,12 +11,11 @@ INTDIR=.
 OutDir=.
 # End Custom Macros
 
-ALL : "$(OUTDIR)\GetWebDll.dll"
+INSTALL : "$(OUTDIR)\GetWebDll.dll"
 
 
 CLEAN :
        -@erase "$(INTDIR)\GetWebDll.pch"
-       -@erase "$(INTDIR)\GetWebDll.res"
        -@erase "$(INTDIR)\*.obj"
        -@erase "$(INTDIR)\vc60.idb"
        -@erase "$(OUTDIR)\GetWebDll.dll"
@@ -29,7 +28,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\GetWebDll.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_MBCS" /D "_USRDLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -68,14 +67,13 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\GetWebDll.res" /d "NDEBUG"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\GetWebDll.bsc" 
 BSC32_SBRS= \
-       
+
 LINK32=link.exe
 LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\GetWebDll.pdb" /machine:I386 /def:".\GetWebDll.def" /out:"$(OUTDIR)\GetWebDll.dll" /implib:"$(OUTDIR)\GetWebDll.lib" 
 DEF_FILE= \
        ".\GetWebDll.def"
 LINK32_OBJS= \
        "$(INTDIR)\GetWebDll.obj" \
-       "$(INTDIR)\StdAfx.obj" \
        "$(INTDIR)\GetWebDll.res"
 
 "$(OUTDIR)\GetWebDll.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -95,7 +93,7 @@ LINK32_OBJS= \
 
 SOURCE=.\GetWebDll.cpp
 
-"$(INTDIR)\GetWebDll.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\GetWebDll.pch"
+"$(INTDIR)\GetWebDll.obj" : $(SOURCE) "$(INTDIR)"
 
 
 SOURCE=.\GetWebDll.rc
@@ -103,13 +101,3 @@ SOURCE=.\GetWebDll.rc
 "$(INTDIR)\GetWebDll.res" : $(SOURCE) "$(INTDIR)"
        $(RSC) $(RSC_PROJ) $(SOURCE)
 
-
-SOURCE=.\StdAfx.cpp
-
-CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_MBCS" /D "_USRDLL" /Fp"$(INTDIR)\GetWebDll.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\StdAfx.obj" "$(INTDIR)\GetWebDll.pch" : $(SOURCE) "$(INTDIR)"
-       $(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-

diff --git a/src/WINNT/afs_setup_utils/NTMakefile b/src/WINNT/afs_setup_utils/NTMakefile
index f5eed59bf5152e56a65eb40b40f60962d38701ee..0d03963892c6fb8937c1212c98e37196ffa9f786 100644 (file)
--- a/src/WINNT/afs_setup_utils/NTMakefile
+++ b/src/WINNT/afs_setup_utils/NTMakefile
@@ -90,10 +90,10 @@ install : $(INSTALL_UTILS_DLLFILE) $(SERVER_UNINST_DLLFILE) $(CLIENT_UNINST_DLLF
           $(CC_UNINST_DLLFILE) $(LIGHT_CLIENT_UNINST_DLLFILE) $(DOCS_UNINST_DLLFILE) \
           $(AFSRM_EXEFILE) lang
                  cd _isuser
-                 nmake -fntmakefile
+                 nmake -fntmakefile install
           $(CD) ..
                  cd getwebdll
-                 nmake -fntmakefile
+                 nmake -fntmakefile install
           $(CD) ..
                  echo 
 
@@ -171,6 +171,13 @@ clean::
    nmake -fntmakefile clean
    $(CD) ..
    echo done clean
+   cd _isuser
+   nmake -fntmakefile clean
+   $(CD) ..
+   cd getwebdll
+   nmake -fntmakefile clean
+   $(CD) ..
+   echo
 
 ############################################################################
 #

diff --git a/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC b/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC
index 3f3c6504d388f3a0edabe69b204c31f1f928e068..ce9d4c4bd08c31dae264e8e9514e88a7b0546434 100644 (file)
--- a/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC
+++ b/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC
@@ -10,7 +10,7 @@
 #define APSTUDIO_HIDDEN_SYMBOLS
 #include "windows.h"
 #undef APSTUDIO_HIDDEN_SYMBOLS
-#include "sdrc.h"
+#include <.\sdrc.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

diff --git a/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep b/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep
index b4a408398b61652664aec47b881d9ec4f242370b..c27f74d090a5e4535c7fb5fe3ec7d82ea16fbb1b 100644 (file)
--- a/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep
+++ b/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep
@@ -1,9 +1,5 @@
 # Microsoft Developer Studio Generated Dependency File, included by _IsUser.mak
 
-.\_isuser.c : \
-       "c:\program files\microsoft visual studio\vc98\include\basetsd.h"\
-       
-
 .\_Isuser.RC : \
-       ".\SDRC.H"\
+       ".\sdrc.h"\
        

diff --git a/src/WINNT/afs_setup_utils/_isuser/ntmakefile b/src/WINNT/afs_setup_utils/_isuser/ntmakefile
index 4bde69c6a04a4c90740a8730e293602c85882224..66050cdae2189988738fd7df90bba5d37a553746 100644 (file)
--- a/src/WINNT/afs_setup_utils/_isuser/ntmakefile
+++ b/src/WINNT/afs_setup_utils/_isuser/ntmakefile
@@ -1,3 +1,7 @@
+# include the primary makefile
+
+!INCLUDE ..\..\..\config\NTMakefile.$(SYS_NAME)
+
 # Microsoft Developer Studio Generated NMAKE File, Based on _IsUser.dsp
 !IF "$(OS)" == "Windows_NT"
 NULL=
@@ -11,21 +15,25 @@ INTDIR=.
 OutDir=.
 # End Custom Macros
 
-ALL : "$(OUTDIR)\_IsUser.dll"
+INSTALL : "$(OUTDIR)\_IsUser.dll"
 
 
-CLEAN :
+CLEAN ::
        -@erase "$(INTDIR)\_isuser.obj"
        -@erase "$(INTDIR)\_Isuser.res"
        -@erase "$(INTDIR)\vc60.idb"
        -@erase "$(OUTDIR)\_IsUser.dll"
        -@erase "$(OUTDIR)\_IsUser.exp"
        -@erase "$(OUTDIR)\_IsUser.lib"
-       -@erase "$(OUTDIR)\*.pch"
 
-"$(OUTDIR)" :
+"$(OUTDIR)" ::
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+HEADERS = ".\sdrc.h"
+
+".\sdrc.h" : $(IS5ROOT)\INCLUDE\sdrc.h
+    $(COPY) $(IS5ROOT)\INCLUDE\sdrc.h .
+
 CPP=cl.exe
 CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ISUSER_EXPORTS" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
@@ -66,14 +74,14 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\_Isuser.res" /d "NDEBUG"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\_IsUser.bsc" 
 BSC32_SBRS= \
-       
+
 LINK32=link.exe
 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\_IsUser.pdb" /machine:I386 /out:"$(OUTDIR)\_IsUser.dll" /implib:"$(OUTDIR)\_IsUser.lib" 
 LINK32_OBJS= \
        "$(INTDIR)\_isuser.obj" \
        "$(INTDIR)\_Isuser.res"
 
-"$(OUTDIR)\_IsUser.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\_IsUser.dll" : "$(OUTDIR)" $(HEADERS) $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -92,9 +100,7 @@ SOURCE=.\_isuser.c
 
 "$(INTDIR)\_isuser.obj" : $(SOURCE) "$(INTDIR)"
 
-
 SOURCE=.\_Isuser.RC
 
 "$(INTDIR)\_Isuser.res" : $(SOURCE) "$(INTDIR)"
        $(RSC) $(RSC_PROJ) $(SOURCE)
-

diff --git a/src/WINNT/afs_setup_utils/afs_setup_utils.cpp b/src/WINNT/afs_setup_utils/afs_setup_utils.cpp
index c391342d4f2c963e76e04adfa35797453e0aee1e..7a0aa8ef303312923fcb00bc0c254a5da1f27c25 100644 (file)
--- a/src/WINNT/afs_setup_utils/afs_setup_utils.cpp
+++ b/src/WINNT/afs_setup_utils/afs_setup_utils.cpp
@@ -195,8 +195,7 @@ struct REGVALUE clientRegValues[] = {
 
 struct REGVALUE clientWinNTRegValues[] = {
     { "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\File Manager\\AddOns", "AFS Client FME" },
-    { "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\NetBT\\Paramet
-ers", "SMBDeviceEnabled" },
+    { "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters", "SMBDeviceEnabled" },
     { 0, 0 }
 };
 

diff --git a/src/WINNT/install/InstallShield5/Default.txt b/src/WINNT/install/InstallShield5/Default.txt
index f7c08821de4e3b1e9ea97371510fb0a0045107ac..f0f68c94d495ab10414f78e17d0a321f6009fbab 100644 (file)
--- a/src/WINNT/install/InstallShield5/Default.txt
+++ b/src/WINNT/install/InstallShield5/Default.txt
@@ -1,8 +1,3 @@
-[Client:HKLM:SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]
-Cell=S,CELLNAME_DEFAULT
-(Default)=S,
----Comment---=
-
 [Client:HKCR:CLSID\{DC515C27-6CAC-11D1-BAE7-00C04FD140D2}\InprocServer32]
 (Default)=S,<TARGETDIR>\Client\Program\afs_shl_ext.dll
 ---Comment---=

diff --git a/src/WINNT/install/InstallShield5/GenFileGroups.bat b/src/WINNT/install/InstallShield5/GenFileGroups.bat
index 06b4fe2b1c106869c77e86256d8f71ff32c71577..6978f6685d4859cb7f1c936757f6535680678088 100644 (file)
--- a/src/WINNT/install/InstallShield5/GenFileGroups.bat
+++ b/src/WINNT/install/InstallShield5/GenFileGroups.bat
@@ -69,7 +69,7 @@ echo Version=1.00.000 >> Client_Common_Files.fgl
 rem -------------- Client_WinDir_Files.fgl -----------------------------
 
 echo [TopDir] > Client_WinDir_Files.fgl
-echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Client_WinDir_Files.fgl
+rem echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Client_WinDir_Files.fgl
 echo.  >> Client_WinDir_Files.fgl
 echo [General] >> Client_WinDir_Files.fgl
 echo Type=FILELIST >> Client_WinDir_Files.fgl
@@ -145,7 +145,7 @@ echo Version=1.00.000 >> Light_Client_Common_Files.fgl
 rem -------------- Light_Client_WinDir_Files.fgl -----------------------
 
 echo [TopDir] > Light_Client_WinDir_Files.fgl
-echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Light_Client_WinDir_Files.fgl
+rem echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Light_Client_WinDir_Files.fgl
 echo.  >> Light_Client_WinDir_Files.fgl
 echo [General] >> Light_Client_WinDir_Files.fgl
 echo Type=FILELIST >> Light_Client_WinDir_Files.fgl
@@ -201,7 +201,7 @@ echo Version=1.00.000 >> Light95_Client_Common_Files.fgl
 rem -------------- Light95_Client_WinDir_Files.fgl -----------------------
 
 echo [TopDir] > Light95_Client_WinDir_Files.fgl
-echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Light95_Client_WinDir_Files.fgl
+rem echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Light95_Client_WinDir_Files.fgl
 echo.  >> Light95_Client_WinDir_Files.fgl
 echo [General] >> Light95_Client_WinDir_Files.fgl
 echo Type=FILELIST >> Light95_Client_WinDir_Files.fgl
@@ -324,7 +324,7 @@ echo Version=1.00.000 >> Control_Center_Common_Files.fgl
 rem -------------- Control_Center_WinDir_Files.fgl ---------------------
 
 echo [TopDir] > Control_Center_WinDir_Files.fgl
-echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Control_Center_Windir_Files.fgl
+rem echo file0=%IS5_DEST%\root.client\usr\vice\etc\afsdcell.ini >> Control_Center_Windir_Files.fgl
 echo.  >> Control_Center_WinDir_Files.fgl
 echo [General] >> Control_Center_WinDir_Files.fgl
 echo Type=FILELIST >> Control_Center_WinDir_Files.fgl

diff --git a/src/WINNT/install/InstallShield5/NTMakefile b/src/WINNT/install/InstallShield5/NTMakefile
index 3bfe5ae0f8586741f0c3e9e06abe352c041f85f6..96d30aa211efe4b03a745c293c8a621ddd407a71 100644 (file)
--- a/src/WINNT/install/InstallShield5/NTMakefile
+++ b/src/WINNT/install/InstallShield5/NTMakefile
@@ -21,7 +21,7 @@ AFSBUILDCOMMENTS=Build:*DatE* *TimE* CellServDB:$(CELLSERVDB_INSTALL)
 ############################################################################
 
 prep: AFS_component_version_number.txt
-       $(DESTDIR)\bin\util_cr.exe } "$(AFSPRODUCT_VERSION)" ".\lang\en_US\valuee.shl"
+       $(DESTDIR)\bin\util_cr.exe } "$(AFSPRODUCT_VERSION)" ".\lang\en_US\value.txt" ".\lang\en_US\value.shl"
        $(DESTDIR)\bin\util_cr.exe } "$(AFSPRODUCT_VERSION)" "default.txt" "default.rge"
        $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\lang\en_US\value.shl" "[DATA] CELLSERVDB_CONFIGNAME=$(CELLSERVDB_CONFIGNAME)"
        $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\lang\en_US\value.shl" "[DATA] CELLNAME_DEFAULT=$(CELLNAME_DEFAULT)"
@@ -35,7 +35,8 @@ prep: AFS_component_version_number.txt
        $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\packageweb.pfw" "[Options] Comments=$(AFSBUILDCOMMENTS)"
        $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\packageweb.pfw" "[Options] ApplicationName=AFSforWindows"
        $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\packageweb.pfw" "[Options] Company=Open AFS"
-      
+       $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\packageweb.pfw" "[Options] Title=AFS for Windows"
+       $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\packageweb.pfw" "[Options] OutputSpec="$(DESTDIR)\WinInstall\PackageWeb\AFSforWindows.exe"
 !     ENDIF
     CreateISDirTree.bat
     ScatterFiles.bat
@@ -46,7 +47,7 @@ prep: AFS_component_version_number.txt
        $(COPY) ..\..\afs_setup_utils\_isuser\_isuser.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\."
        $(COPY) ..\..\afs_setup_utils\getwebdll\getwebdll.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\."
        $(COPY) $(DESTDIR)\WinInstall\Config\$(CELLSERVDB_INSTALL) ".\Setup Files\Compressed Files\0009-English\Intel 32\$(CELLSERVDB_CONFIGNAME)"
-       $(DESTDIR)\bin\util_cr.exe ~ "$(DESTDIR)\root.client\usr\vice\etc\$(CELLSERVDB_CONFIGNAME)"
+       $(DESTDIR)\bin\util_cr.exe ~ ".\Setup Files\Compressed Files\0009-English\Intel 32\$(CELLSERVDB_CONFIGNAME)"
        $(DESTDIR)\bin\util_cr.exe ~ ".\Setup Files\Compressed Files\0009-English\Intel 32\_ISUSER.DLL"
        $(DESTDIR)\bin\util_cr.exe ~ ".\Setup Files\Compressed Files\0009-English\Intel 32\shlwapi.DLL"
        $(DESTDIR)\bin\util_cr.exe ~ ".\Setup Files\Compressed Files\0009-English\Intel 32\wininet.DLL"

diff --git a/src/WINNT/install/InstallShield5/PackageWeb.pfw b/src/WINNT/install/InstallShield5/PackageWeb.pfw
new file mode 100644 (file)
index 0000000..8db507b
--- /dev/null
+++ b/src/WINNT/install/InstallShield5/PackageWeb.pfw
@@ -0,0 +1,267 @@
+[PackageForTheWeb]
+Version=2.0
+
+[Options]
+Title=AFS for Windows
+Company=Open AFS
+CompanyEMail=
+BasePath=.\Media\Transarc AFS\Disk Images
+ImportPath=.\Media\Transarc AFS
+UseRTF=0
+SaveFiles=0
+SubFolders=1
+ApplicationName=AFSforWindows
+Description=
+Comments=Build:09/05/01 09:41 CellServDB:CellServDB.IBM_Internal
+Notice=
+Version=1.1.1 a
+OutputSpec=W:\DEST\WinInstall\PackageWeb\AFSforWindows.exe
+GUIDs=0
+Type=2
+Compress=1
+Sign=0
+Transfer=0
+Files=33
+
+[Engine]
+Setup=Disk1\Setup.exe
+
+[Web Page]
+Generate=1
+Template=
+MSClient=
+NClient=
+
+[Runtime]
+Welcome=
+License=
+Prompt=
+Password=
+DefaultPath=
+Language=English
+WindowStyle=0
+Options=19
+Execute=Disk1\Setup.exe
+CmdLine=/SMS
+
+[Extension]
+Server=
+Calls=0
+
+[Code Signing]
+CompanyURL=
+SpecFile=
+KeyFile=
+Method=0
+
+; ~~~~~~~~~~ File Section ~~~~~~~~~~~
+[SubFolders]
+Count=10
+Folder1=Disk1
+Folder2=Disk1\setupdir\0009
+Folder3=Disk1\setupdir\0416
+Folder4=Disk1\setupdir\0804
+Folder5=Disk1\setupdir\0404
+Folder6=Disk1\setupdir\0007
+Folder7=Disk1\setupdir\0011
+Folder8=Disk1\setupdir\0012
+Folder9=Disk1\setupdir\000a
+Folder10=Disk1\License
+
+[File 1]
+Name=_ISDel.exe
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=589825
+Disk=0
+
+[File 2]
+Name=Setup.exe
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=589825
+Disk=0
+
+[File 3]
+Name=_inst32i.ex_
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=524289
+Disk=0
+
+[File 4]
+Name=os.dat
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 5]
+Name=lang.dat
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 6]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\0009\
+Flags=655377
+Disk=0
+
+[File 7]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\0416\
+Flags=655377
+Disk=0
+
+[File 8]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\0804\
+Flags=655377
+Disk=0
+
+[File 9]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\0404\
+Flags=655377
+Disk=0
+
+[File 10]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\0007\
+Flags=655377
+Disk=0
+
+[File 11]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\0011\
+Flags=655377
+Disk=0
+
+[File 12]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\0012\
+Flags=655377
+Disk=0
+
+[File 13]
+Name=_Setup.dll
+Path=.\Media\Transarc AFS\Disk Images\Disk1\setupdir\000a\
+Flags=655377
+Disk=0
+
+[File 14]
+Name=setup.ins
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 15]
+Name=_sys1.hdr
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=2097153
+Disk=0
+
+[File 16]
+Name=_sys1.cab
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=2097153
+Disk=0
+
+[File 17]
+Name=_user1.hdr
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=2097153
+Disk=0
+
+[File 18]
+Name=_user1.cab
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=2097153
+Disk=0
+
+[File 19]
+Name=DATA.TAG
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 20]
+Name=SETUP.INI
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 21]
+Name=setup.lid
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 22]
+Name=setup.bmp
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 23]
+Name=data1.hdr
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=2097153
+Disk=0
+
+[File 24]
+Name=data1.cab
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=2097153
+Disk=0
+
+[File 25]
+Name=layout.bin
+Path=.\Media\Transarc AFS\Disk Images\Disk1\
+Flags=1
+Disk=0
+
+[File 26]
+Name=en_US.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0
+
+[File 27]
+Name=ja_JP.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0
+
+[File 28]
+Name=ko_KR.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0
+
+[File 29]
+Name=zh_CN.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0
+
+[File 30]
+Name=zh_TW.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0
+
+[File 31]
+Name=pt_BR.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0
+
+[File 32]
+Name=es_ES.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0
+
+[File 33]
+Name=de_DE.rtf
+Path=.\Media\Transarc AFS\Disk Images\Disk1\License\
+Flags=1
+Disk=0

diff --git a/src/WINNT/install/InstallShield5/setup.rul b/src/WINNT/install/InstallShield5/setup.rul
index b75bf971d124572cc11d2ea3d79a05f137ce1489..4be378da313e939ee01785f81dc0055f98993394 100644 (file)
--- a/src/WINNT/install/InstallShield5/setup.rul
+++ b/src/WINNT/install/InstallShield5/setup.rul
@@ -331,7 +331,7 @@ end;
 ////////////////////////////////////////////////////////////////////////////////
 
 number nvSection,nFileIsLocked;
-STRING szTemp;
+STRING szTemp,szCellName;
 
 #define IDC_HOMEPATH                    301
 #define IDC_ROOTPATH                    302
@@ -771,7 +771,6 @@ function SetDriveMaps(szPath,szRootDrive,szRootPath,szHomeDrive,szHomePath)
 HWND   handle;
 begin
        VarSave(SRCTARGETDIR);
-       TARGETDIR=WINDIR;
        DeleteFile("afsdsbmt.ini");
        VarRestore(SRCTARGETDIR);
     CreateFile(handle, szPath, "afsdsbmt.ini");
@@ -1154,11 +1153,13 @@ program
                        MessageBox ("RegDBCreateKeyEx failed.", SEVERE);
                    abort;
                endif;
-
                pApp = &appFullClient;
                if (InstallApp(pApp) < 0) goto end_install;
        endif;
-
+        if RegDBSetKeyValueEx("SYSTEM\\CurrentControlSet\\Services\\TransarcAFSDaemon\\Parameters","Cell", REGDB_STRING, szCellName, -1) < 0 then
+             MessageBox ("RegDBCreateKeyEx failed.", SEVERE);
+             abort;
+        endif;
        // Install the Light Client
        if (bLightClientSel) then
                pApp = &appLightClient;
@@ -1303,6 +1304,9 @@ begin
                        ,szDefaultInstall);
                Logit("SetCellServDB");
            if (nResult=BACK) goto Dlg_SdSelectFolder;
+            Dlg_SdSelectCellName:
+            nResult=SdShowDlgEdit1 ("Select AFS Cell Name","A valid cell name should be entered here.\nIf you don't know your cell name, you may enter one after installation using the AFS Control Center.","Enter Cell Name:", szCellName);
+            if (nResult = BACK) goto Dlg_SdSelectCellName;
                if (Is(FILE_EXISTS, WINDIR^"afsdsbmt.ini")) then
                        Logit("AskYesNo next");
                        if (AskYesNo("Previous Drive Mapping Configuration already exist.\n\nPress Yes to keep previous configuration\nPress No to change previous configuration.",YES)=YES) then
@@ -1314,7 +1318,7 @@ begin
                sRootDrive="Z:";
                sHomeDrive="U:";
                rootPath="/";
-           homePath = "/afs/" + @CELLNAME_DEFAULT + "/u/" + userID;
+           homePath = "/afs/" + szCellName + "/u/" + userID;
            nResult=SetHomeRoot( "Home and Root Drive Assignment\nThese drives will be mapped each time AFS is connected!",sRootDrive,rootPath,sHomeDrive,homePath );
                Logit("SetHomeRoot");
                if (nResult = BACK) goto Dlg_SdSelectCellServDB;
@@ -2229,6 +2233,7 @@ function SetupInstall()
 begin
     Enable( CORECOMPONENTHANDLING );
 
+    szCellName=@CELLNAME_DEFAULT;
     bInstallAborted = FALSE;
 
     //  Create list of end user selections to be displayed by DialogShowSdStartCopy()

diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index 6068ec5dd40b7dce12e4a0c10560248c76b6a48c..65667c7d1014b9a9f88645f5cc85420d84baf9de 100644 (file)
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -26,7 +26,7 @@ INCFILES =\
        $(INCFILEDIR)\afs_sysnames.h \
        $(INCFILEDIR)\stds.h \
        $(INCFILEDIR)\icl.h 
-\r
+
 
 $(INCFILEDIR)\param.h: param.$(SYS_NAME).h
        $(COPY) $? $@
@@ -92,31 +92,31 @@ idirs: doclink
 !      IF (!EXIST($(DESTDIR)\root.client\usr\vice\etc))
                $(MKDIR) $(DESTDIR)\root.client\usr\vice\etc
 !      ENDIF
-       $(COPY) AFSCONFIG-WINDOWS.H $(DESTDIR)\include\afs\.
+       $(COPY) AFSCONFIG-WINDOWS.H $(DESTDIR)\include\afs\afsconfig.h
+
+INCCOPY = \
+       $(DESTDIR)\bin\rmbat.bat \
+       $(DESTDIR)\bin\rmbat.rsp \
+       $(DESTDIR)\bin\NTBUILD.bat
 
-INCCOPY = \\r
-       $(DESTDIR)\bin\rmbat.bat \\r
-       $(DESTDIR)\bin\rmbat.rsp \\r
-       $(DESTDIR)\bin\NTBUILD.bat\r
-\r
-$(DESTDIR)\bin\rmbat.bat:..\rmbat.bat\r
+$(DESTDIR)\bin\rmbat.bat:..\rmbat.bat
        $(COPY) $? $@
        util_cr + $@
-\r
-$(DESTDIR)\bin\rmbat.rsp:..\rmbat.rsp\r
+
+$(DESTDIR)\bin\rmbat.rsp:..\rmbat.rsp
        $(COPY) $? $@
-\r
-$(DESTDIR)\bin\NTBUILD.bat:..\NTBUILD.bat\r
+
+$(DESTDIR)\bin\NTBUILD.bat:..\NTBUILD.bat
        $(COPY) $? $@
        util_cr + $@
-\r
+
 $(DESTDIR)\bin\NTLang.bat: NTLang.bat util_cr.exe
        $(COPY) NTLang.bat $(DESTDIR)\bin
        util_cr + $(DESTDIR)\bin\NTLang.bat
-\r
-$(DESTDIR)\NTDllmap.txt:NTDllmap.txt\r
+
+$(DESTDIR)\NTDllmap.txt:NTDllmap.txt
        $(COPY) $? $@
-\r
+
 # Create link to docs needed for media build; allow to fail in case
 # symlink not available, e.g. if using a 3.4a client, since most builds
 # aren't media builds.
@@ -137,24 +137,24 @@ NTMakefile.version: NTMakefile.version-CML NTMakefile.version-NOCML
                $(COPY) NTMakefile.version-NOCML NTMakefile.version
 !      ENDIF
 
-INCTOOLS = \\r
-       $(DESTDIR)\bin\mkvers.exe \\r
-       $(DESTDIR)\bin\util_cr.exe \\r
-       $(DESTDIR)\bin\touch.exe\r
-\r
+INCTOOLS = \
+       $(DESTDIR)\bin\mkvers.exe \
+       $(DESTDIR)\bin\util_cr.exe \
+       $(DESTDIR)\bin\touch.exe
+
 #mkvers.exe : mkvers.obj
 #      $(EXECONLINK)
-\r
-$(DESTDIR)\bin\mkvers.exe:mkvers.exe\r
+
+$(DESTDIR)\bin\mkvers.exe:mkvers.exe
        $(COPY) mkvers.exe $(DESTDIR)\bin\.
 
-$(DESTDIR)\bin\util_cr.exe:util_cr.exe\r
+$(DESTDIR)\bin\util_cr.exe:util_cr.exe
        $(COPY) util_cr.exe $(DESTDIR)\bin\.
-\r
+
 util_cr.exe : util_cr.obj
        $(EXECONLINK)
-\r
-$(DESTDIR)\bin\touch.exe:touch.exe\r
+
+$(DESTDIR)\bin\touch.exe:touch.exe
        $(COPY) touch.exe $(DESTDIR)\bin\.
 
 langsetup: $(DESTDIR)\bin\NTLang.bat
@@ -170,9 +170,9 @@ clean_version:
 
 clean::
        $(DEL) $(DESTDIR)\LIB\*.DLL
-       $(DEL) $(DESTDIR)\bin\mkver.exe\r
-       $(DEL) $(DESTDIR)\bin\touch.exe\r
-       $(DEL) $(DESTDIR)\bin\util_cr.exe\r
-       $(DEL) mkver.exe\r
-       $(DEL) touch.exe\r
+       $(DEL) $(DESTDIR)\bin\mkver.exe
+       $(DEL) $(DESTDIR)\bin\touch.exe
+       $(DEL) $(DESTDIR)\bin\util_cr.exe
+       $(DEL) mkver.exe
+       $(DEL) touch.exe
        $(DEL) util_cr.exe
\ No newline at end of file