windows-nsis-vs2005-20080409

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

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index d0b399d..f0a9340 100644 (file)
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -13,29 +13,52 @@ LOOPBACK_LIBS = wbemuuid.lib setupapi.lib msi.lib ole32.lib shell32.lib oleaut32
 $(OUT)\Service.obj: Service.cpp
           $(C2OBJ) Service.cpp
 
-$(EXEDIR)\Service.exe: $(OUT)\Service.obj
-      $(EXECONLINK) $(OUT)\Service.obj
-        $(_VC_MANIFEST_EMBED_EXE)
+$(OUT)\Service.res: Service.rc AFS_component_version_number.h
+
+$(EXEDIR)\Service.exe: $(OUT)\Service.obj $(OUT)\Service.res
+      $(EXECONLINK) 
+      $(_VC_MANIFEST_EMBED_EXE)
+
+$(OUT)\Killer.res: Killer.rc AFS_component_version_number.h
 
 $(OUT)\Killer.obj: Killer.cpp
       $(C2OBJ) Killer.cpp
 
-$(EXEDIR)\Killer.exe: $(OUT)\Killer.obj
-      $(EXECONLINK) $(OUT)\Killer.obj
+$(EXEDIR)\Killer.exe: $(OUT)\Killer.obj $(OUT)\Killer.res
+      $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
 
+$(OUT)\AdminGroup.res: AdminGroup.rc AFS_component_version_number.h
+
 $(OUT)\AdminGroup.obj: AdminGroup.cpp
       $(C2OBJ) AdminGroup.cpp
 
-$(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj
-      $(EXECONLINK) $(OUT)\AdminGroup.obj
+$(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res
+      $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
 
+!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
+
 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)
@@ -51,10 +74,7 @@ prebuild:
 !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)
+# Do nothing.
 !ELSE IF ("$(AFSVER_CL)"=="1310")
    $(COPY) %SystemRoot%\System32\Msvcr71d.dll $(EXEDIR)
    $(COPY) %SystemRoot%\System32\Msvcr71d.pdb $(EXEDIR)
@@ -86,7 +106,8 @@ prebuild:
    "$(NSISDIR)\makensis.exe" /VERSION >>$(OUT)\nsi-includes.nsi          
    echo. >>$(OUT)\nsi-includes.nsi                                       
 !if ("$(AFSVER_CL)" == "1400")
-   echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
+   echo !define CL_1400 1 >> $(OUT)\nsi-includes.nsi
+   echo !define VCREDISTNAME vcredist_$(ARCH).exe >> $(OUT)\nsi-includes.nsi
 !else if ("$(AFSVER_CL)" == "1310")
    echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
 !else if ("$(AFSVER_CL)" == "1300")
@@ -99,16 +120,42 @@ prebuild:
    echo !define DEBUG 1 >>$(OUT)\nsi-includes.nsi
 !endif
 
+!if ("$(AFSVER_CL)"=="1400") && ("$(AFSDEV_BUILDTYPE)"!="FREE")
+MSVCMSI=$(EXEDIR)\vcruntime.msi
+
+$(MSVCMSI): $(OUT)\vcruntime.wixobj
+       light -out $@ $**
+
+$(OUT)\vcruntime.wixobj: vcruntime.wxs
+       candle -out $@ $** -dPlatform=$(ARCH) -dConfig=Debug
+
+!else
+MSVCMSI=
+!endif
+
+runtime: $(MSVCMSI)
+
 build: prebuild
-   "C:\Program Files\NSIS\makensis.exe" /DINCLUDEDIR=$(OUT) OpenAFS.nsi
+   "$(NSISDIR)\makensis.exe" /DINCLUDEDIR=$(OUT) OpenAFS.nsi
 
-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 build
 
-#clean:
-#   $(DEL) $(OUT)\Service.obj
-#   $(DEL) $(EXEDIR)\Service.exe
+clean::
+   $(DEL) $(OUT)\Service.obj
+   $(DEL) $(OUT)\Service.res
+   $(DEL) $(EXEDIR)\Service.exe
+   $(DEL) $(OUT)\Killer.obj
+   $(DEL) $(OUT)\Killer.res
+   $(DEL) $(EXEDIR)\Killer.exe
+   $(DEL) $(OUT)\AdminGroup.obj
+   $(DEL) $(OUT)\AdminGroup.res
+   $(DEL) $(EXEDIR)\AdminGroup.exe
+   $(DEL) nsi-include.nsi
+   $(DEL) AFS_component_version_number.h
 #   $(DEL) $(EXEDIR)\Msvcr71.dll
 #   $(DEL) $(EXEDIR)\MFC42.DLL
 #   $(DEL) OpenAFSforWindows.exe
-#   $(DEL) nsi-include.nsi
-
+!if ("$(AFSVER_CL)"=="1400") && ("$(AFSDEV_BUILDTYPE)"!="FREE")
+   $(DEL) $(OUT)\vcruntime.wixobj
+   $(DEL) $(MSVCMSI)
+!endif