build: add install target to Makefile.msvc
This commit is contained in:
parent
d70721eb65
commit
5a21ba2b66
1
CHANGES
1
CHANGES
|
@ -10,6 +10,7 @@ Fixed:
|
|||
o avoid using system's inet_net_pton affected by the WLB-2008080064 advisory
|
||||
o replacement ares_inet_net_pton affected by the WLB-2008080064 advisory
|
||||
o replacement ares_inet_ntop affected by potential out of bounds write
|
||||
o added install target to Makefile.msvc
|
||||
|
||||
Version 1.7.4 (December 9, 2010)
|
||||
|
||||
|
|
|
@ -139,6 +139,22 @@ BASE_DIR = .\$(CC_VERS_STR)
|
|||
|
||||
SRCDIR = .
|
||||
|
||||
# -----------------------------
|
||||
# Default installation subdirs
|
||||
# -----------------------------
|
||||
|
||||
!IFNDEF INSTALL_DIR
|
||||
INSTALL_DIR = .
|
||||
!ENDIF
|
||||
|
||||
!IFNDEF INSTALL_DIR_LIB
|
||||
INSTALL_DIR_LIB = $(INSTALL_DIR)\lib
|
||||
!ENDIF
|
||||
|
||||
!IFNDEF INSTALL_DIR_INC
|
||||
INSTALL_DIR_INC = $(INSTALL_DIR)\include
|
||||
!ENDIF
|
||||
|
||||
# -------------------------
|
||||
# Configuration validation
|
||||
# -------------------------
|
||||
|
@ -397,6 +413,12 @@ ALL:
|
|||
clean:
|
||||
@-RMDIR /S /Q $(BASE_DIR) >NUL 2>&1
|
||||
|
||||
install:
|
||||
@$(MAKE) /nologo /f .\Makefile.msvc CFG=lib-release install
|
||||
@$(MAKE) /nologo /f .\Makefile.msvc CFG=lib-debug install
|
||||
@$(MAKE) /nologo /f .\Makefile.msvc CFG=dll-release install
|
||||
@$(MAKE) /nologo /f .\Makefile.msvc CFG=dll-debug install
|
||||
|
||||
!ENDIF
|
||||
|
||||
# ---------------------------------------------------------------------
|
||||
|
@ -456,6 +478,19 @@ clean:
|
|||
@-RMDIR /S /Q $(PROG2_OUTDIR) >NUL 2>&1
|
||||
@-RMDIR /S /Q $(PROG3_OUTDIR) >NUL 2>&1
|
||||
|
||||
install:
|
||||
@if not exist $(CARES_OUTDIR)\$(CARES_TARGET) \
|
||||
$(MAKE) /f .\Makefile.msvc CFG=$(CFG) c-ares
|
||||
@if not exist "$(INSTALL_DIR)" mkdir "$(INSTALL_DIR)"
|
||||
@if not exist "$(INSTALL_DIR_LIB)" mkdir "$(INSTALL_DIR_LIB)"
|
||||
@if not exist "$(INSTALL_DIR_INC)" mkdir "$(INSTALL_DIR_INC)"
|
||||
@copy /y $(CARES_OUTDIR)\*.* "$(INSTALL_DIR_LIB)" >NUL
|
||||
@copy /y $(SRCDIR)\ares.h "$(INSTALL_DIR_INC)" >NUL
|
||||
@copy /y $(SRCDIR)\ares_build.h "$(INSTALL_DIR_INC)" >NUL
|
||||
@copy /y $(SRCDIR)\ares_rules.h "$(INSTALL_DIR_INC)" >NUL
|
||||
@copy /y $(SRCDIR)\ares_version.h "$(INSTALL_DIR_INC)" >NUL
|
||||
@echo Installed c-ares $(CFG)
|
||||
|
||||
!ENDIF
|
||||
|
||||
$(BASE_DIR):
|
||||
|
|
24
README.msvc
24
README.msvc
|
@ -40,6 +40,30 @@
|
|||
library version it is using.
|
||||
|
||||
|
||||
How to install using MSVC from the command line
|
||||
-----------------------------------------------
|
||||
|
||||
In order to allow easy usage of c-ares libraries it may be convenient to
|
||||
install c-ares libraries and header files to a common subdirectory tree.
|
||||
|
||||
Once that c-ares libraries have been built using procedure described above,
|
||||
use same command prompt window to define environment variable INSTALL_DIR
|
||||
to designate the top subdirectory where installation of c-ares libraries and
|
||||
header files will be done.
|
||||
|
||||
> set INSTALL_DIR=c:\c-ares
|
||||
|
||||
Afterwards, run following command to actually perform the installation:
|
||||
|
||||
> nmake -f Makefile.msvc install
|
||||
|
||||
Installation procedure will copy c-ares libraries to subdirectory 'lib' and
|
||||
c-ares header files to subdirectory 'include' below the INSTALL_DIR subdir.
|
||||
|
||||
When environment variable INSTALL_DIR is not defined, installation is done
|
||||
to c-ares source folder where Makefile.msvc file is located.
|
||||
|
||||
|
||||
How to build using Visual Studio 6 IDE
|
||||
--------------------------------------
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@ Fixed:
|
|||
o avoid using system's inet_net_pton affected by the WLB-2008080064 advisory
|
||||
o replacement ares_inet_net_pton affected by the WLB-2008080064 advisory
|
||||
o replacement ares_inet_ntop affected by potential out of bounds write
|
||||
o added install target to Makefile.msvc
|
||||
|
||||
Thanks go to these friendly people for their efforts and contributions:
|
||||
|
||||
|
|
Loading…
Reference in New Issue