[OpenAFS-devel] Win2k Build 1.1.1a
James Peterson
jimpeter@us.ibm.com
Thu, 6 Sep 2001 11:47:25 -0700
Version 1.1.1a had several problems with its building environment. I've
separated them into two areas:
1. Building Windows 2000 client and server
2. Building Windows 2000 installaiton packages
********************************Building Windows 2000 client and
server**********************************************
diff -Nur --exclude-from=exclude org/src/config/NTMakefile
upd/src/config/NTMakefile
--- org/src/config/NTMakefile Wed Aug 22 22:31:52 2001
+++ upd/src/config/NTMakefile Fri Aug 31 08:50:06 2001
@@ -92,7 +92,7 @@
! 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 \
diff -Nur --exclude-from=exclude org/src/WINNT/afsd/smb.c
upd/src/WINNT/afsd/smb.c
--- org/src/WINNT/afsd/smb.c Sat Jun 23 10:26:06 2001
+++ upd/src/WINNT/afsd/smb.c Fri Aug 31 09:31:54 2001
@@ -6562,7 +6562,7 @@
for (i = 0; i < lana_list.length; i++) {
if (lana_list.lana[i] == 255) continue;
ncbp->ncb_command = NCBDELNAME;
- ncbp->ncb_lana_num = lana_list.lan`[i];
+ ncbp->ncb_lana_num = lana_list.lana[i];
memcpy(ncbp->ncb_name,smb_sharename,NCBNAMSZ);
code = Netbios(ncbp, dos_ncb);
if (code == 0) code = ncbp->ncb_retcode;
*************************Building Windows 2000 installaiton
packages**********************************************************
Remove the following file: src\winnt\Install\InstallShield5\default.rge
diff -Nur --exclude-from=exclude
org/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep
upd/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep
--- org/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep Wed Aug 22
22:31:50 2001
+++ upd/src/WINNT/afs_setup_utils/GetWebDll/GetWebDll.dep Fri Aug 31
13:29:52 2001
@@ -3,9 +3,4 @@
.\GetWebDll.cpp : \
".\GetWebDll.h"\
".\GetWebDllFun.h"\
-
-
-.\StdAfx.cpp : \
- ".\StdAfx.h"\
- "c:\program files\microsoft visual studio\vc98\include\basetsd.h"\
-
+ ".\StdAfx.h"
diff -Nur --exclude-from=exclude
org/src/WINNT/afs_setup_utils/GetWebDll/StdAfx.cpp
upd/src/WINNT/afs_setup_utils/GetWebDll/StdAfx.cpp
--- org/src/WINNT/afs_setup_utils/GetWebDll/StdAfx.cpp Wed Dec 31 16:00:00
1969
+++ upd/src/WINNT/afs_setup_utils/GetWebDll/StdAfx.cpp Tue Apr 24 14:07:40
2001
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// GetWebDll.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+
+
diff -Nur --exclude-from=exclude
org/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile
upd/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile
--- org/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/afs_setup_utils/GetWebDll/ntmakefile Fri Aug 31 15:56:10
2001
@@ -11,11 +11,10 @@
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"
@@ -29,7 +28,7 @@
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) @<<
@@ -75,7 +74,6 @@
".\GetWebDll.def"
LINK32_OBJS= \
"$(INTDIR)\GetWebDll.obj" \
- "$(INTDIR)\StdAfx.obj" \
"$(INTDIR)\GetWebDll.res"
"$(OUTDIR)\GetWebDll.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -95,21 +93,10 @@
SOURCE=.\GetWebDll.cpp
-"$(INTDIR)\GetWebDll.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)
\GetWebDll.pch"
+"$(INTDIR)\GetWebDll.obj" : $(SOURCE) "$(INTDIR)"
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 -Nur --exclude-from=exclude org/src/WINNT/afs_setup_utils/NTMakefile
upd/src/WINNT/afs_setup_utils/NTMakefile
--- org/src/WINNT/afs_setup_utils/NTMakefile Wed Aug 22 22:31:50 2001
+++ upd/src/WINNT/afs_setup_utils/NTMakefile Fri Aug 31 12:44:10 2001
@@ -90,10 +90,10 @@
$(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 @@
nmake -fntmakefile clean
$(CD) ..
echo done clean
+ cd _isuser
+ nmake -fntmakefile clean
+ $(CD) ..
+ cd getwebdll
+ nmake -fntmakefile clean
+ $(CD) ..
+ echo
############################################################################
#
diff -Nur --exclude-from=exclude
org/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC
upd/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC
--- org/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC Fri Aug 31 12:55:28
2001
@@ -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 -Nur --exclude-from=exclude
org/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep
upd/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep
--- org/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep Fri Aug 31 12:53:28
2001
@@ -1,9 +1,6 @@
# 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 -Nur --exclude-from=exclude
org/src/WINNT/afs_setup_utils/_isuser/ntmakefile
upd/src/WINNT/afs_setup_utils/_isuser/ntmakefile
--- org/src/WINNT/afs_setup_utils/_isuser/ntmakefile Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/afs_setup_utils/_isuser/ntmakefile Fri Aug 31 13:32:34
2001
@@ -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,20 +15,23 @@
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
@@ -73,7 +80,7 @@
"$(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 +99,9 @@
"$(INTDIR)\_isuser.obj" : $(SOURCE) "$(INTDIR)"
-
SOURCE=.\_Isuser.RC
-"$(INTDIR)\_Isuser.res" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\_Isuser.res" : $(SOURCE) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
-
+
+
diff -Nur --exclude-from=exclude
org/src/WINNT/afs_setup_utils/afs_setup_utils.cpp
upd/src/WINNT/afs_setup_utils/afs_setup_utils.cpp
--- org/src/WINNT/afs_setup_utils/afs_setup_utils.cpp Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/afs_setup_utils/afs_setup_utils.cpp Fri Aug 31 09:31:02
2001
@@ -195,8 +195,7 @@
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 -Nur --exclude-from=exclude
org/src/WINNT/install/InstallShield5/Default.txt
upd/src/WINNT/install/InstallShield5/Default.txt
--- org/src/WINNT/install/InstallShield5/Default.txt Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/install/InstallShield5/Default.txt Fri Aug 31 09:35:12
2001
@@ -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 -Nur --exclude-from=exclude
org/src/WINNT/install/InstallShield5/GenFileGroups.bat
upd/src/WINNT/install/InstallShield5/GenFileGroups.bat
--- org/src/WINNT/install/InstallShield5/GenFileGroups.bat Sat Jun 23
10:26:08 2001
+++ upd/src/WINNT/install/InstallShield5/GenFileGroups.bat Fri Aug 31
16:13:14 2001
@@ -68,8 +68,8 @@
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
+echo [TopDir] > 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 @@
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 @@
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 @@
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 -Nur --exclude-from=exclude
org/src/WINNT/install/InstallShield5/NTMakefile
upd/src/WINNT/install/InstallShield5/NTMakefile
--- org/src/WINNT/install/InstallShield5/NTMakefile Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/install/InstallShield5/NTMakefile Tue Sep 4 16:38:44
2001
@@ -21,7 +21,7 @@
############################################################################
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 @@
$(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,17 +47,14 @@
$(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"
$(DESTDIR)\bin\util_cr.exe ~ ".\Setup Files\Compressed
Files\0009-English\Intel 32\GETWEBDLL.DLL"
-
+
build:
BuildSetup.bat
- xcopy/s/e/y "Media\Transarc AFS\Disk Images\disk1\*.*" $(DESTDIR)
\WinInstall
- copy AFS_component_version_number.txt $(DESTDIR)
\WinInstall\Version.txt
- $(DEL) /q "Media\Transarc AFS\Disk Images\disk1\*.*"
!IF ((EXIST("$(ISWEB)")) &&("$(ISWEB)"!=""))
! IF (!EXIST($(DESTDIR)\Wininstall\PackageWeb))
$(MKDIR) $(DESTDIR)\Wininstall\PackageWeb
@@ -64,5 +62,8 @@
$(DEL) /q $(DESTDIR)\Wininstall\PackageWeb\*.*
$(ISWEB)\Pftwwiz.exe $(AFSROOT)
\src\winnt\install\InstallShield5\PackageWeb.pfw -s -a
!ENDIF
+ xcopy/s/e/y "Media\Transarc AFS\Disk Images\disk1\*.*" $(DESTDIR)
\WinInstall
+ copy AFS_component_version_number.txt $(DESTDIR)
\WinInstall\Version.txt
+ $(DEL) /q "Media\Transarc AFS\Disk Images\disk1\*.*"
install: prep build
diff -Nur --exclude-from=exclude
org/src/WINNT/install/InstallShield5/PackageWeb.pfw
upd/src/WINNT/install/InstallShield5/PackageWeb.pfw
--- org/src/WINNT/install/InstallShield5/PackageWeb.pfw Wed Dec 31
16:00:00 1969
+++ upd/src/WINNT/install/InstallShield5/PackageWeb.pfw Wed Sep 5
09:42:44 2001
@@ -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 -Nur --exclude-from=exclude
org/src/WINNT/install/InstallShield5/setup.rul
upd/src/WINNT/install/InstallShield5/setup.rul
--- org/src/WINNT/install/InstallShield5/setup.rul Wed Aug 22 22:31:50
2001
+++ upd/src/WINNT/install/InstallShield5/setup.rul Wed Sep 5 17:05:08
2001
@@ -331,7 +331,7 @@
////////////////////////////////////////////////////////////////////////////////
number nvSection,nFileIsLocked;
-STRING szTemp;
+STRING szTemp,szCellName;
#define IDC_HOMEPATH 301
#define IDC_ROOTPATH 302
@@ -771,7 +771,6 @@
HWND handle;
begin
VarSave(SRCTARGETDIR);
- TARGETDIR=WINDIR;
DeleteFile("afsdsbmt.ini");
VarRestore(SRCTARGETDIR);
CreateFile(handle, szPath, "afsdsbmt.ini");
@@ -1154,11 +1153,14 @@
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 +1305,9 @@
,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 +1319,7 @@
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;
@@ -1335,9 +1340,9 @@
function NotUpgradable(pApp)
begin
// The 3.5 beta is not upgradable
- if ((pApp->iVer.nMajorVersion = 3) && (pApp->iVer.nMinorVersion = 5)
&& (pApp->iVer.nPatchLevel = 0) && (pApp->iVer.szReleaseType =
RELEASE_TYPE_BETA)) then
- return TRUE;
- endif;
+// if ((pApp->iVer.nMajorVersion = 3) && (pApp->iVer.nMinorVersion = 5)
&& (pApp->iVer.nPatchLevel = 0) && (pApp->iVer.szReleaseType =
RELEASE_TYPE_BETA)) then
+// return TRUE;
+// endif;
return FALSE;
end;
@@ -2229,7 +2234,8 @@
begin
Enable( CORECOMPONENTHANDLING );
- bInstallAborted = FALSE;
+ szCellName=@CELLNAME_DEFAULT;
+ bInstallAborted = FALSE;
// Create list of end user selections to be displayed by
DialogShowSdStartCopy()
@@ -3570,3 +3576,11 @@
// --- include script file section ---
#include "sddialog.rul"
+
James Peterson
"Integrity is the base of excellence."