mirror of
https://github.com/isc-projects/bind9.git
synced 2026-03-16 23:52:40 -04:00
2193. [port] win32: BINDInstall.exe is now linked statically.
[RT #16906] 2192. [port] win32: use vcredist_x86.exe to install Visual Studio's redistributable dlls if building with Visual Stdio 2005 or later.
This commit is contained in:
Mark Andrews
parent
10d5ba588d
commit
b29934bcce
4 changed files with 34 additions and 37 deletions
7
CHANGES
7
CHANGES
|
|
@ -1,3 +1,10 @@
|
|||
2193. [port] win32: BINDInstall.exe is now linked statically.
|
||||
[RT #16906]
|
||||
|
||||
2192. [port] win32: use vcredist_x86.exe to install Visual
|
||||
Studio's redistributable dlls if building with
|
||||
Visual Stdio 2005 or later.
|
||||
|
||||
2189. [bug] Handle socket() returning EINTR. [RT #15949]
|
||||
|
||||
2188. [contrib] queryperf: autoconf changes to make the search for
|
||||
|
|
|
|||
|
|
@ -43,11 +43,11 @@ RSC=rc.exe
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /TP /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /TP /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
|
||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
|
|
@ -69,11 +69,11 @@ LINK32=link.exe
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR /Yu"stdafx.h" /FD /TP /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /Yu"stdafx.h" /FD /TP /GZ /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
|
||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
|
|
|
|||
|
|
@ -129,9 +129,9 @@ CLEAN :
|
|||
"$(OUTDIR)" :
|
||||
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
|
||||
|
||||
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c
|
||||
CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c
|
||||
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "NDEBUG" /d "_AFXDLL"
|
||||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc"
|
||||
BSC32_SBRS= \
|
||||
|
|
@ -191,9 +191,9 @@ CLEAN :
|
|||
"$(OUTDIR)" :
|
||||
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
|
||||
|
||||
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c
|
||||
CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c
|
||||
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "_DEBUG" /d "_AFXDLL"
|
||||
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\BINDInstall.res" /d "_DEBUG"
|
||||
BSC32=bscmake.exe
|
||||
BSC32_FLAGS=/nologo /o"$(OUTDIR)\BINDInstall.bsc"
|
||||
BSC32_SBRS= \
|
||||
|
|
@ -339,7 +339,7 @@ SOURCE=..\..\..\lib\isc\win32\ntgroups.c
|
|||
|
||||
!IF "$(CFG)" == "BINDInstall - Win32 Release"
|
||||
|
||||
CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c
|
||||
CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c
|
||||
|
||||
"$(INTDIR)\ntgroups.obj" : $(SOURCE) "$(INTDIR)"
|
||||
$(CPP) @<<
|
||||
|
|
@ -349,7 +349,7 @@ CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I ".
|
|||
|
||||
!ELSEIF "$(CFG)" == "BINDInstall - Win32 Debug"
|
||||
|
||||
CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c
|
||||
CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c
|
||||
|
||||
"$(INTDIR)\ntgroups.obj" "$(INTDIR)\ntgroups.sbr" : $(SOURCE) "$(INTDIR)"
|
||||
$(CPP) @<<
|
||||
|
|
@ -363,7 +363,7 @@ SOURCE=.\StdAfx.cpp
|
|||
|
||||
!IF "$(CFG)" == "BINDInstall - Win32 Release"
|
||||
|
||||
CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c
|
||||
CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /c
|
||||
|
||||
"$(INTDIR)\StdAfx.obj" "$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"
|
||||
$(CPP) @<<
|
||||
|
|
@ -373,7 +373,7 @@ CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\..\include" /I ".
|
|||
|
||||
!ELSEIF "$(CFG)" == "BINDInstall - Win32 Debug"
|
||||
|
||||
CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c
|
||||
CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\..\include" /I "..\..\named\win32\include" /I "..\..\..\lib\isc\win32\include" /I "..\..\..\lib\isc\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\BINDInstall.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /TP /GZ /c
|
||||
|
||||
"$(INTDIR)\StdAfx.obj" "$(INTDIR)\StdAfx.sbr" "$(INTDIR)\BINDInstall.pch" : $(SOURCE) "$(INTDIR)"
|
||||
$(CPP) @<<
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.19 2007/05/01 03:24:46 marka Exp $ */
|
||||
/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.20 2007/05/24 01:29:00 marka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999-2000 by Nortel Networks Corporation
|
||||
|
|
@ -113,34 +113,14 @@ const FileData installFiles[] =
|
|||
{"msvcrt.dll", FileData::WinSystem, FileData::Critical, TRUE},
|
||||
# endif
|
||||
#endif
|
||||
#if _MSC_VER >= 1400
|
||||
{"MFC80CHS.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80CHT.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80DEU.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80ENU.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80ESP.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80FRA.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80ITA.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80JPN.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"MFC80KOR.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"Microsoft.VC80.MFCLOC.manifest", FileData::BinDir, FileData::Critical, FALSE},
|
||||
#endif
|
||||
#if _MSC_VER >= 1400
|
||||
{"mfc80.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"mfc80u.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"mfcm80.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"mfcm80u.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"Microsoft.VC80.MFC.manifest", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"msvcm80.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"msvcp80.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"msvcr80.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
{"Microsoft.VC80.CRT.manifest", FileData::BinDir, FileData::Critical, FALSE},
|
||||
#elif _MSC_VER >= 1310
|
||||
#if _MSC_VER < 1400
|
||||
#if _MSC_VER >= 1310
|
||||
{"mfc71.dll", FileData::WinSystem, FileData::Critical, TRUE},
|
||||
{"msvcr71.dll", FileData::WinSystem, FileData::Critical, TRUE},
|
||||
#elif _MSC_VER > 1200
|
||||
#elif _MSC_VER > 1200 && _MSC_VER <
|
||||
{"mfc70.dll", FileData::WinSystem, FileData::Critical, TRUE},
|
||||
{"msvcr70.dll", FileData::WinSystem, FileData::Critical, TRUE},
|
||||
#endif
|
||||
#endif
|
||||
{"bindevt.dll", FileData::BinDir, FileData::Normal, FALSE},
|
||||
{"libbind9.dll", FileData::BinDir, FileData::Critical, FALSE},
|
||||
|
|
@ -492,6 +472,16 @@ void CBINDInstallDlg::OnInstall() {
|
|||
|
||||
ProgramGroup(FALSE);
|
||||
|
||||
#if _MSC_VER >= 1400
|
||||
/*
|
||||
* Install Visual Studio libraries. As per:
|
||||
* http://blogs.msdn.com/astebner/archive/2006/08/23/715755.aspx
|
||||
*
|
||||
* Vcredist_x86.exe /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"
|
||||
*/
|
||||
/*system(".\\Vcredist_x86.exe /q:a /c:\"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log\"");*/
|
||||
system(".\\Vcredist_x86.exe");
|
||||
#endif
|
||||
try {
|
||||
CreateDirs();
|
||||
CopyFiles();
|
||||
|
|
|
|||
Loading…
Reference in a new issue