9.2.7rc3

3 files changed, 107 insertions, 3 deletions

diff --git a/bin/win32/BINDInstall/BINDInstall.mak b/bin/win32/BINDInstall/BINDInstall.mak
index b4175894..9f105294 100644
--- a/bin/win32/BINDInstall/BINDInstall.mak
+++ b/bin/win32/BINDInstall/BINDInstall.mak
@@ -26,6 +26,81 @@ NULL=nul
 !ENDIF 

 

 !IF  "$(CFG)" == "BINDInstall - Win32 Release"

+_VC_MANIFEST_INC=0

+_VC_MANIFEST_BASENAME=__VC80

+!ELSE

+_VC_MANIFEST_INC=1

+_VC_MANIFEST_BASENAME=__VC80.Debug

+!ENDIF

+

+####################################################

+# Specifying name of temporary resource file used only in incremental builds:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res

+!else

+_VC_MANIFEST_AUTO_RES=

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1

+

+!endif

+

+####################################################

+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+#MT_SPECIAL_RETURN=1090650113

+#MT_SPECIAL_SWITCH=-notify_resource_update

+MT_SPECIAL_RETURN=0

+MT_SPECIAL_SWITCH=

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \

+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \

+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \

+link $** /out:$@ $(LFLAGS)

+

+!else

+

+_VC_MANIFEST_EMBED_EXE= \

+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2

+

+!endif

+####################################################

+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:

+

+!if "$(_VC_MANIFEST_INC)" == "1"

+

+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \

+    $(_VC_MANIFEST_BASENAME).auto.rc \

+    $(_VC_MANIFEST_BASENAME).auto.manifest

+

+!else

+

+_VC_MANIFEST_CLEAN=

+

+!endif

+

+!IF  "$(CFG)" == "BINDInstall - Win32 Release"

 

 OUTDIR=.\Release

 INTDIR=.\Release

@@ -43,6 +118,7 @@ CLEAN :
 	-@erase "$(INTDIR)\vc60.idb"

 	-@erase "$(INTDIR)\VersionInfo.obj"

 	-@erase "..\..\..\Build\Release\BINDInstall.exe"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -102,6 +178,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+    $(_VC_MANIFEST_EMBED_EXE)

 

 !ELSEIF  "$(CFG)" == "BINDInstall - Win32 Debug"

 

@@ -131,6 +208,7 @@ CLEAN :
 	-@erase "$(INTDIR)\VersionInfo.sbr"

 	-@erase "$(OUTDIR)\BINDInstall.bsc"

 	-@erase "..\..\..\Build\Debug\BINDInstall.exe"

+	-@$(_VC_MANIFEST_CLEAN)

 

 "$(OUTDIR)" :

     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

@@ -200,6 +278,7 @@ LINK32_OBJS= \
     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

+    $(_VC_MANIFEST_EMBED_EXE)

 

 !ENDIF 

 

@@ -311,3 +390,21 @@ SOURCE=.\BINDInstall.rc
 

 !ENDIF 

 

+####################################################

+# Commands to generate initial empty manifest file and the RC file

+# that references it, and for generating the .res file:

+

+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc

+

+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest

+    type <<$@

+#include <winuser.h>

+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"

+<< KEEP

+

+$(_VC_MANIFEST_BASENAME).auto.manifest :

+    type <<$@

+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

+</assembly>

+<< KEEP

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 637b89fa..901baa44 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.6.2.14 2005/10/11 23:53:58 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.16 2006/09/28 00:03:07 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -109,7 +109,10 @@ const FileData installFiles[] =
 	{"msvcrt.dll", FileData::WinSystem, FileData::Critical, TRUE},
 #  endif
 #endif
-#if _MSC_VER >= 1310
+#if _MSC_VER >= 1400
+	{"mfc80.dll", FileData::WinSystem, FileData::Critical, TRUE},
+	{"msvcr80.dll", FileData::WinSystem, FileData::Critical, TRUE},
+#elif _MSC_VER >= 1310
 	{"mfc71.dll", FileData::WinSystem, FileData::Critical, TRUE},
 	{"msvcr71.dll", FileData::WinSystem, FileData::Critical, TRUE},
 #elif _MSC_VER > 1200
diff --git a/bin/win32/BINDInstall/StdAfx.h b/bin/win32/BINDInstall/StdAfx.h
index 2607529c..d5929bba 100644
--- a/bin/win32/BINDInstall/StdAfx.h
+++ b/bin/win32/BINDInstall/StdAfx.h
@@ -3,6 +3,10 @@
 //      are changed infrequently
 //
 
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
 #if !defined(AFX_STDAFX_H__61537819_39FC_11D3_A97A_00105A12BD65__INCLUDED_)
 #define AFX_STDAFX_H__61537819_39FC_11D3_A97A_00105A12BD65__INCLUDED_