mirror of
https://git.openafs.org/openafs.git
synced 2025-01-19 23:40:13 +00:00
STABLE14-nsis-1400-compiler-20040908
Add support for MS VS 2005
(cherry picked from commit 8c887b2072)
This commit is contained in:
Jeffrey Altman
Jeffrey Altman
parent
e0e9832c9b
commit
0b68a11a93
@ -30,9 +30,11 @@ $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj
|
||||
|
||||
prebuild:
|
||||
!IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
|
||||
!IF ("$(AFSVER_CL)"=="1310")
|
||||
!IF ("$(AFSVER_CL)"=="1400")
|
||||
$(COPY) %SystemRoot%\System32\Msvcr80.dll $(EXEDIR)
|
||||
$(COPY) %SystemRoot%\System32\MFC80.DLL $(EXEDIR)
|
||||
!ELSE 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)
|
||||
@ -45,7 +47,12 @@ prebuild:
|
||||
!ERROR Unknown Compiler Version
|
||||
!ENDIF
|
||||
!ELSE # NOT FREE - CHECKED
|
||||
!IF ("$(AFSVER_CL)"=="1310")
|
||||
!IF ("$(AFSVER_CL)"=="1400")
|
||||
$(COPY) %SystemRoot%\System32\Msvcr80d.dll $(EXEDIR)
|
||||
$(COPY) %SystemRoot%\System32\Msvcr80d.pdb $(EXEDIR)
|
||||
$(COPY) %SystemRoot%\System32\MFC80D.DLL $(EXEDIR)
|
||||
$(COPY) %SystemRoot%\System32\MFC80D.pdb $(EXEDIR)
|
||||
!ELSE IF ("$(AFSVER_CL)"=="1310")
|
||||
$(COPY) %SystemRoot%\System32\Msvcr71d.dll $(EXEDIR)
|
||||
$(COPY) %SystemRoot%\System32\Msvcr71d.pdb $(EXEDIR)
|
||||
$(COPY) %SystemRoot%\System32\MFC71D.DLL $(EXEDIR)
|
||||
@ -75,7 +82,9 @@ prebuild:
|
||||
$(DESTDIR)\bin\util_cr.exe _echo "!define " >>$(OUT)\nsi-includes.nsi
|
||||
"$(NSISDIR)\makensis.exe" /VERSION >>$(OUT)\nsi-includes.nsi
|
||||
echo. >>$(OUT)\nsi-includes.nsi
|
||||
!if ("$(AFSVER_CL)" == "1310")
|
||||
!if ("$(AFSVER_CL)" == "1400")
|
||||
echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
|
||||
!else if ("$(AFSVER_CL)" == "1310")
|
||||
echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
|
||||
!else if ("$(AFSVER_CL)" == "1300")
|
||||
echo !define CL_1300 1 >> $(OUT)\nsi-includes.nsi
|
||||
|
||||
@ -1177,6 +1177,11 @@ DoControl:
|
||||
|
||||
DoCommon:
|
||||
SetOutPath "$INSTDIR\Common"
|
||||
!IFDEF CL_1400
|
||||
File "${SYSTEMDIR}\msvcr80d.pdb"
|
||||
File "${SYSTEMDIR}\msvcp80d.pdb"
|
||||
File "${SYSTEMDIR}\mfc80d.pdb"
|
||||
!ELSE
|
||||
!IFDEF CL_1310
|
||||
File "${SYSTEMDIR}\msvcr71d.pdb"
|
||||
File "${SYSTEMDIR}\msvcp71d.pdb"
|
||||
@ -1192,6 +1197,7 @@ DoCommon:
|
||||
File "${SYSTEMDIR}\msvcrtd.pdb"
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
; Common Areas
|
||||
SetOutPath "$INSTDIR\Common"
|
||||
@ -1631,6 +1637,14 @@ StartRemove:
|
||||
Delete /REBOOTOK "$INSTDIR\Common\afskasadmin.pdb"
|
||||
Delete /REBOOTOK "$INSTDIR\Common\afsptsadmin.pdb"
|
||||
!IFDEF DEBUG
|
||||
!IFDEF CL_1400
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr80d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr80d.pdb"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcp80d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcp80d.pdb"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc80d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc80d.pdb"
|
||||
!ELSE
|
||||
!IFDEF CL_1310
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr71d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr71d.pdb"
|
||||
@ -1655,6 +1669,21 @@ StartRemove:
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcrtd.pdb"
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ELSE
|
||||
!IFDEF CL_1400
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc80.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr80.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcp80.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80CHS.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80CHT.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80DEU.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80ENU.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80ESP.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80FRA.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80ITA.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80JPN.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80KOR.DLL"
|
||||
!ELSE
|
||||
!IFDEF CL_1310
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc71.dll"
|
||||
@ -1689,6 +1718,7 @@ StartRemove:
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcrt.dll"
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
IfSilent SkipDel
|
||||
@ -1790,6 +1820,14 @@ StartRemove:
|
||||
RMDir "$INSTDIR\Client"
|
||||
|
||||
!IFDEF DEBUG
|
||||
!IFDEF CL_1400
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr80d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr80d.pdb"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcp80d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcp80d.pdb"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc80d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc80d.pdb"
|
||||
!ELSE
|
||||
!IFDEF CL_1310
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr71d.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr71d.pdb"
|
||||
@ -1814,6 +1852,21 @@ StartRemove:
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcrtd.pdb"
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ELSE
|
||||
!IFDEF CL_1400
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc80.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcr80.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcp80.dll"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80CHS.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80CHT.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80DEU.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80ENU.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80ESP.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80FRA.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80ITA.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80JPN.DLL"
|
||||
Delete /REBOOTOK "$INSTDIR\bin\MFC80KOR.DLL"
|
||||
!ELSE
|
||||
!IFDEF CL_1310
|
||||
Delete /REBOOTOK "$INSTDIR\bin\mfc71.dll"
|
||||
@ -1848,6 +1901,7 @@ StartRemove:
|
||||
Delete /REBOOTOK "$INSTDIR\bin\msvcrt.dll"
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
Delete /REBOOTOK "$INSTDIR\Common\*"
|
||||
@ -2597,6 +2651,20 @@ Function AFSLangFiles
|
||||
SetOutPath "$INSTDIR\Common"
|
||||
|
||||
!IFDEF DEBUG
|
||||
!IFDEF CL_1400
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcr80d.dll" "$INSTDIR\Common\msvcr80d.dll" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcp80d.dll" "$INSTDIR\Common\msvcp80d.dll" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\mfc80d.dll" "$INSTDIR\Common\mfc80d.dll" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80CHS.DLL" "$INSTDIR\Common\MFC80CHS.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80CHT.DLL" "$INSTDIR\Common\MFC80CHT.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80DEU.DLL" "$INSTDIR\Common\MFC80DEU.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80ENU.DLL" "$INSTDIR\Common\MFC80ENU.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80ESP.DLL" "$INSTDIR\Common\MFC80ESP.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80FRA.DLL" "$INSTDIR\Common\MFC80FRA.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80ITA.DLL" "$INSTDIR\Common\MFC80ITA.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80JPN.DLL" "$INSTDIR\Common\MFC80JPN.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80KOR.DLL" "$INSTDIR\Common\MFC80KOR.DLL" "$INSTDIR"
|
||||
!ELSE
|
||||
!IFDEF CL_1310
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcr71d.dll" "$INSTDIR\Common\msvcr71d.dll" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcp71d.dll" "$INSTDIR\Common\msvcp71d.dll" "$INSTDIR"
|
||||
@ -2630,6 +2698,21 @@ Function AFSLangFiles
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcrtd.dll" "$INSTDIR\Common\msvcrtd.dll" "$INSTDIR"
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ELSE
|
||||
!IFDEF CL_1400
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\mfc80.dll" "$INSTDIR\Common\mfc80.dll" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcr80.dll" "$INSTDIR\Common\msvcr80.dll" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\msvcp80.dll" "$INSTDIR\Common\msvcp80.dll" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80CHS.DLL" "$INSTDIR\Common\MFC80CHS.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80CHT.DLL" "$INSTDIR\Common\MFC80CHT.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80DEU.DLL" "$INSTDIR\Common\MFC80DEU.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80ENU.DLL" "$INSTDIR\Common\MFC80ENU.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80ESP.DLL" "$INSTDIR\Common\MFC80ESP.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80FRA.DLL" "$INSTDIR\Common\MFC80FRA.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80ITA.DLL" "$INSTDIR\Common\MFC80ITA.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80JPN.DLL" "$INSTDIR\Common\MFC80JPN.DLL" "$INSTDIR"
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\MFC80KOR.DLL" "$INSTDIR\Common\MFC80KOR.DLL" "$INSTDIR"
|
||||
!ELSE
|
||||
!IFDEF CL_1310
|
||||
!insertmacro ReplaceDLL "${SYSTEMDIR}\mfc71.dll" "$INSTDIR\Common\mfc71.dll" "$INSTDIR"
|
||||
@ -2665,6 +2748,7 @@ Function AFSLangFiles
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
||||
StrCmp $LANGUAGE ${LANG_ENGLISH} DoEnglish
|
||||
StrCmp $LANGUAGE ${LANG_GERMAN} DoGerman
|
||||
|
||||
Loading…
Reference in New Issue
Block a user