more-vc-net-installer-fixes-20031206

Make sure we get the included libraries correct for install

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index 67a19a2..34b54d9 100644 (file)
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -20,25 +20,31 @@ prebuild:
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 !IF ("$(AFSVER_CL)"=="1310")
    $(COPY) %SystemRoot%\System32\Msvcr71.dll $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MSVCRT.DLL $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC71.DLL $(EXEDIR)
 !ELSE IF ("$(AFSVER_CL)"=="1300")
    $(COPY) %SystemRoot%\System32\Msvcp70.dll $(EXEDIR)
-   $(COPY) %SystemRoot%\System32\MFC71.DLL $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MSVCRT.DLL $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MFC70.DLL $(EXEDIR)
 !ELSE IF ("$(AFSVER_CL)"=="1200")
    $(COPY) %SystemRoot%\System32\MSVCRT.DLL $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC42.DLL $(EXEDIR)
 !ELSE
 !ERROR Unknown Compiler Version
 !ENDIF
-!ELSE
+!ELSE # NOT FREE - CHECKED
 !IF ("$(AFSVER_CL)"=="1310")
    $(COPY) %SystemRoot%\System32\Msvcr71d.dll $(EXEDIR)
    $(COPY) %SystemRoot%\System32\Msvcr71d.pdb $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MSVCRTD.DLL $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MSVCRTD.pdb $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC71D.DLL $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC71D.pdb $(EXEDIR)
 !ELSE IF ("$(AFSVER_CL)"=="1300")
    $(COPY) %SystemRoot%\System32\Msvcp70d.dll $(EXEDIR)
    $(COPY) %SystemRoot%\System32\Msvcp70d.pdb $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MSVCRTD.DLL $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MSVCRTD.pdb $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC70D.DLL $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC70D.pdb $(EXEDIR)
 !ELSE IF ("$(AFSVER_CL)"=="1200")
@@ -56,10 +62,10 @@ prebuild:
    echo !define MUI_MAJORVERSION $(AFSPRODUCT_VER_MAJOR) >>nsi-includes.nsi
    echo !define MUI_MINORVERSION $(AFSPRODUCT_VER_MINOR) >>nsi-includes.nsi
    echo !define MUI_PATCHLEVEL $(AFSPRODUCT_VER_PATCH) >>nsi-includes.nsi
-!if ("$(AFSDEV_CL)" == "1310")
-   echo !define CL1310 1 >> nsi-includes.nsi
-!else if ("$(AFSDEV_CL)" == "1300")
-   echo !define CL1300 1 >> nsi-includes.nsi
+!if ("$(AFSVER_CL)" == "1310")
+   echo !define CL_1310 1 >> nsi-includes.nsi
+!else if ("$(AFSVER_CL)" == "1300")
+   echo !define CL_1300 1 >> nsi-includes.nsi
 !endif
 !if ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
    echo !define DEBUG 1 >>nsi-includes.nsi

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 6f095af..d47d579 100644 (file)
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -782,15 +782,30 @@ Section "AFS Control Center" SecControl
 !IFDEF CL1310
   File "${AFS_WININSTALL_DIR}\msvcr71d.dll"
   File "${AFS_WININSTALL_DIR}\msvcr71d.pdb"
+  File "${AFS_WININSTALL_DIR}\msvcrtd.dll"
+  File "${AFS_WININSTALL_DIR}\msvcrtd.pdb"
+!ELSE
+!IFDEF CL1300
+  File "${AFS_WININSTALL_DIR}\msvcr70d.dll"
+  File "${AFS_WININSTALL_DIR}\msvcr70d.pdb"
+  File "${AFS_WININSTALL_DIR}\msvcrtd.dll"
+  File "${AFS_WININSTALL_DIR}\msvcrtd.pdb"
 !ELSE
   File "${AFS_WININSTALL_DIR}\msvcrtd.dll"
   File "${AFS_WININSTALL_DIR}\msvcrtd.pdb"
 !ENDIF
+!ENDIF
 !ELSE
 !IFDEF CL1310
   File "${AFS_WININSTALL_DIR}\msvcr71.dll"
+  File "${AFS_WININSTALL_DIR}\msvcrt.dll"
 !ELSE
+!IFDEF CL1300
+  File "${AFS_WININSTALL_DIR}\msvcr70.dll"
   File "${AFS_WININSTALL_DIR}\msvcrt.dll"
+!ELSE
+  File "${AFS_WININSTALL_DIR}\msvcrt.dll"
+!ENDIF
 !ENDIF
 !ENDIF