windows-nsis-vs2008-runtime-20080715

[openafs.git] / src / WINNT / install / NSIS / NTMakefile

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index 50228f3..7740832 100644 (file)
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -10,6 +10,11 @@ C2OBJ   = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(cvars) $(afscflags) $(afsc
 
 LOOPBACK_LIBS = wbemuuid.lib setupapi.lib msi.lib ole32.lib shell32.lib oleaut32.lib user32.lib
 
+!IFNDEF MSIDNNLS
+!ERROR Please set IDNMREDISTDIR to the directory where Microsoft IDN Mitigation APIs Redistributables are to be found.
+# $(MSIDNNLS)\REDIST\idndl.(platform).exe should exist.
+!ENDIF
+
 $(OUT)\Service.obj: Service.cpp
           $(C2OBJ) Service.cpp
 
@@ -18,6 +23,7 @@ $(OUT)\Service.res: Service.rc AFS_component_version_number.h
 $(EXEDIR)\Service.exe: $(OUT)\Service.obj $(OUT)\Service.res
       $(EXECONLINK) 
       $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\Killer.res: Killer.rc AFS_component_version_number.h
 
@@ -27,6 +33,7 @@ $(OUT)\Killer.obj: Killer.cpp
 $(EXEDIR)\Killer.exe: $(OUT)\Killer.obj $(OUT)\Killer.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
 
 $(OUT)\AdminGroup.res: AdminGroup.rc AFS_component_version_number.h
 
@@ -36,12 +43,55 @@ $(OUT)\AdminGroup.obj: AdminGroup.cpp
 $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
+        $(CODESIGN_USERLAND)
+
+!IF ("$(AFSDEV_BUILDTYPE)"=="FREE")
+!IF ("$(CPU)" == "i386")
+ARCH=x86
+!ELSE IF ("$(CPU)" == "amd64")
+ARCH=x64
+!ELSE
+ARCH=$(CPU)
+!ENDIF
+!ELSE
+!IF ("$(CPU)" == "i386")
+ARCH=Intel
+!ELSE IF ("$(CPU)" == "amd64")
+ARCH=x64
+!ELSE
+ARCH=$(CPU)
+!ENDIF
+!ENDIF
+
+!IF ("$(CPU)" == "i386")
+IDNMREDIST=$(MSIDNNLS)\REDIST\idndl.x86.exe
+!ELSE IF ("$(CPU)" == "amd64")
+IDNMREDIST=$(MSIDNNLS)\REDIST\idndl.amd64.exe
+!ELSE
+! error Unknown CPU value
+!ENDIF
+
+!if ("$(AFSVER_CL)"=="1400") || ("$(AFSVER_CL)"=="1500")
+MSVCMSI=$(EXEDIR)\vcruntime-$(AFSVER_CL)$(AFSDEV_BUILDTYPE).msi
+
+$(MSVCMSI): $(OUT)\vcruntime.wixobj
+       light -out $@ $**
+       $(CODESIGN_USERLAND)
+
+$(OUT)\vcruntime.wixobj: vcruntime.wxs
+       candle -out $@ $** -dPlatform=$(ARCH) -dConfig=Debug -dVCVer=$(AFSVER_CL)
+
+!else
+MSVCMSI=
+!endif
+
+runtime: $(MSVCMSI)
+
 
 prebuild:
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 !IF ("$(AFSVER_CL)"=="1400")
-   $(COPY) %SystemRoot%\System32\Msvcr80.dll $(EXEDIR)
-   $(COPY) %SystemRoot%\System32\MFC80.DLL $(EXEDIR)
+   $(COPY) "%VSINSTALLDIR%\SDK\v2.0\BootStrapper\Packages\vcredist_$(ARCH)\vcredist_$(ARCH).exe" $(EXEDIR)
 !ELSE IF ("$(AFSVER_CL)"=="1310")
    $(COPY) %SystemRoot%\System32\Msvcr71.dll $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC71.DLL $(EXEDIR)
@@ -56,11 +106,10 @@ prebuild:
 !ERROR Unknown Compiler Version
 !ENDIF
 !ELSE # NOT FREE - CHECKED
-!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)
+!IF ("$(AFSVER_CL)"=="1500")
+# Do nothing
+!ELSE IF ("$(AFSVER_CL)"=="1400")
+# Do nothing.
 !ELSE IF ("$(AFSVER_CL)"=="1310")
    $(COPY) %SystemRoot%\System32\Msvcr71d.dll $(EXEDIR)
    $(COPY) %SystemRoot%\System32\Msvcr71d.pdb $(EXEDIR)
@@ -88,11 +137,16 @@ prebuild:
    echo !define AFS_MAJORVERSION $(AFSPRODUCT_VER_MAJOR) >>$(OUT)\nsi-includes.nsi
    echo !define AFS_MINORVERSION $(AFSPRODUCT_VER_MINOR) >>$(OUT)\nsi-includes.nsi
    echo !define AFS_PATCHLEVEL $(AFSPRODUCT_VER_PATCH) >>$(OUT)\nsi-includes.nsi
+   echo !define IDNMREDIST "$(IDNMREDIST)" >>$(OUT)\nsi-includes.nsi
    $(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)" == "1400")
+!if ("$(AFSVER_CL)" == "1500")
+   echo !define CL_1500 1 >> $(OUT)\nsi-includes.nsi
+   echo !define MSVCMSI "$(MSVCMSI)" >> $(OUT)\nsi-includes.nsi
+!else if ("$(AFSVER_CL)" == "1400")
    echo !define CL_1400 1 >> $(OUT)\nsi-includes.nsi
+   echo !define MSVCMSI "$(MSVCMSI)" >> $(OUT)\nsi-includes.nsi
 !else if ("$(AFSVER_CL)" == "1310")
    echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
 !else if ("$(AFSVER_CL)" == "1300")
@@ -105,10 +159,17 @@ prebuild:
    echo !define DEBUG 1 >>$(OUT)\nsi-includes.nsi
 !endif
 
-build: prebuild
-   "$(NSISDIR)\makensis.exe" /DINCLUDEDIR=$(OUT) OpenAFS.nsi
+!if ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
+NSISEXE=$(DESTDIR)\WinInstall\OpenAFSforWindows-DEBUG.exe
+!else
+NSISEXE=$(DESTDIR)\WinInstall\OpenAFSforWindows.exe
+!endif
+
+$(NSISEXE): prebuild $(MSVCMSI)
+       "$(NSISDIR)\makensis.exe" /DINCLUDEDIR=$(OUT) OpenAFS.nsi
+       $(CODESIGN_USERLAND)
 
-install: $(OUT)\Service.obj $(EXEDIR)\Service.exe $(OUT)\Killer.obj $(EXEDIR)\Killer.exe $(EXEDIR)\AdminGroup.exe build
+install: $(OUT)\Service.obj $(EXEDIR)\Service.exe $(OUT)\Killer.obj $(EXEDIR)\Killer.exe $(EXEDIR)\AdminGroup.exe runtime $(NSISEXE)
 
 clean::
    $(DEL) $(OUT)\Service.obj
@@ -124,5 +185,8 @@ clean::
    $(DEL) AFS_component_version_number.h
 #   $(DEL) $(EXEDIR)\Msvcr71.dll
 #   $(DEL) $(EXEDIR)\MFC42.DLL
-#   $(DEL) OpenAFSforWindows.exe
-
+!if ("$(AFSVER_CL)"=="1400") && ("$(AFSDEV_BUILDTYPE)"!="FREE")
+   $(DEL) $(OUT)\vcruntime.wixobj
+   $(DEL) $(MSVCMSI)
+!endif
+   $(DEL) $(NSISEXE)