jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 14:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nsis-installer-updates-20031205

Browse Source 
Remove need for MakeCommon.bat

Produce nsi-includes.nsi from NTMakefile

Update OpenAFS.nsi to use MFC70.DLL and MFC71.DLL as needed.
(Need to confirm with Rob Murawski)
This commit is contained in:
Jeffrey Altman 2003-12-06 06:19:03 +00:00 committed by Jeffrey Altman
parent ad9367a9ad
commit 235cd101fd
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/WINNT/install/NSIS/NTMakefile
View File

@ -20,31 +20,50 @@ prebuild:
!IF ("$(AFSDEV_BUILDTYPE)" == "FREE") !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
!IF ("$(AFSVER_CL)"=="1310") !IF ("$(AFSVER_CL)"=="1310")
$(COPY) %SystemRoot%\System32\Msvcr71.dll $(EXEDIR) $(COPY) %SystemRoot%\System32\Msvcr71.dll $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC71.DLL $(EXEDIR)
!ELSE IF ("$(AFSVER_CL)"=="1300") !ELSE IF ("$(AFSVER_CL)"=="1300")
$(COPY) %SystemRoot%\System32\Msvcp70.dll $(EXEDIR) $(COPY) %SystemRoot%\System32\Msvcp70.dll $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC71.DLL $(EXEDIR)
!ELSE IF ("$(AFSVER_CL)"=="1200") !ELSE IF ("$(AFSVER_CL)"=="1200")
$(COPY) %SystemRoot%\System32\MSVCRT.DLL $(EXEDIR) $(COPY) %SystemRoot%\System32\MSVCRT.DLL $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC42.DLL $(EXEDIR)
!ELSE !ELSE
!ERROR Unknown Compiler Version !ERROR Unknown Compiler Version
!ENDIF !ENDIF
$(COPY) %SystemRoot%\System32\MFC42.DLL $(EXEDIR)
!ELSE !ELSE
!IF ("$(AFSVER_CL)"=="1310") !IF ("$(AFSVER_CL)"=="1310")
$(COPY) %SystemRoot%\System32\Msvcr71d.dll $(EXEDIR) $(COPY) %SystemRoot%\System32\Msvcr71d.dll $(EXEDIR)
$(COPY) %SystemRoot%\System32\Msvcr71d.pdb $(EXEDIR) $(COPY) %SystemRoot%\System32\Msvcr71d.pdb $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC71D.DLL $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC71D.pdb $(EXEDIR)
!ELSE IF ("$(AFSVER_CL)"=="1300") !ELSE IF ("$(AFSVER_CL)"=="1300")
$(COPY) %SystemRoot%\System32\Msvcp70d.dll $(EXEDIR) $(COPY) %SystemRoot%\System32\Msvcp70d.dll $(EXEDIR)
$(COPY) %SystemRoot%\System32\Msvcp70d.pdb $(EXEDIR) $(COPY) %SystemRoot%\System32\Msvcp70d.pdb $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC70D.DLL $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC70D.pdb $(EXEDIR)
!ELSE IF ("$(AFSVER_CL)"=="1200") !ELSE IF ("$(AFSVER_CL)"=="1200")
$(COPY) %SystemRoot%\System32\MSVCRTD.DLL $(EXEDIR) $(COPY) %SystemRoot%\System32\MSVCRTD.DLL $(EXEDIR)
$(COPY) %SystemRoot%\System32\MSVCRTD.pdb $(EXEDIR) $(COPY) %SystemRoot%\System32\MSVCRTD.pdb $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC42D.DLL $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC42D.pdb $(EXEDIR)
!ELSE !ELSE
!ERROR Unknown Compiler Version !ERROR Unknown Compiler Version
!ENDIF !ENDIF
$(COPY) %SystemRoot%\System32\MFC42D.DLL $(EXEDIR)
$(COPY) %SystemRoot%\System32\MFC42D.pdb $(EXEDIR)
!ENDIF !ENDIF
MakeCommon.bat "$(AFSPRODUCT_VERSION)" $(DEL) nsi-includes.nsi
echo !define AFS_DESTDIR $(DESTDIR) > nsi-includes.nsi
echo !define MUI_VERSION $(AFSPRODUCT_VERSION) >> nsi-includes.nsi
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
!endif
!if ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
echo !define DEBUG 1 >>nsi-includes.nsi
!endif
build: prebuild build: prebuild
"C:\Program Files\NSIS\makensis.exe" OpenAFS.nsi "C:\Program Files\NSIS\makensis.exe" OpenAFS.nsi

16
src/WINNT/install/NSIS/OpenAFS.nsi
View File

@ -554,10 +554,26 @@ Section "AFS Client" SecClient
!IFDEF DEBUG !IFDEF DEBUG
;File "${SDK_DIR}\REDIST\msvcrtd.dll" ;File "${SDK_DIR}\REDIST\msvcrtd.dll"
;File "${SDK_DIR}\REDIST\msvcrtd.pdb" ;File "${SDK_DIR}\REDIST\msvcrtd.pdb"
!IFDEF CL_1310
!insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc71d.dll" "$SYSDIR\mfc71d.dll"
!ELSE
!IFDEF CL_1300
!insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc70d.dll" "$SYSDIR\mfc70d.dll"
!ELSE
!insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc42d.dll" "$SYSDIR\mfc42d.dll" !insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc42d.dll" "$SYSDIR\mfc42d.dll"
!ENDIF
!ENDIF
!ELSE !ELSE
;File "${SDK_DIR}\REDIST\msvcrt.dll" ;File "${SDK_DIR}\REDIST\msvcrt.dll"
!IFDEF CL_1310
!insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc71.dll" "$SYSDIR\mfc71.dll"
!ELSE
!IFDEF CL_1300
!insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc70.dll" "$SYSDIR\mfc70.dll"
!ELSE
!insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc42.dll" "$SYSDIR\mfc42.dll" !insertmacro UpgradeDLL "${AFS_WININSTALL_DIR}\mfc42.dll" "$SYSDIR\mfc42.dll"
!ENDIF
!ENDIF
!ENDIF !ENDIF
; Do WINDOWSDIR components ; Do WINDOWSDIR components