mirror of
https://github.com/apache/httpd.git
synced 2025-04-18 22:24:07 +03:00
Windows bits for mod_log_json.dsp
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steffen Land
parent
1dc3c88d41
commit
482089e7e1
@ -2170,6 +2170,24 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "mod_log_json"=.\modules\loggers\mod_log_json.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libapr
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libhttpd
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "mod_logio"=.\modules\loggers\mod_logio.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
||||
21
Apache.dsw
21
Apache.dsw
@ -2577,6 +2577,27 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "mod_log_json"=.\modules\loggers\mod_log_json.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libapr
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libaprutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libhttpd
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "mod_logio"=.\modules\loggers\mod_logio.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
||||
@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir ""
|
||||
# PROP Intermediate_Dir ""
|
||||
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _tryserf _dummy"
|
||||
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _tryserf _tryjson _dummy"
|
||||
# PROP Rebuild_Opt ""
|
||||
# PROP Target_File "\Apache2\bin\httpd.exe"
|
||||
# PROP Bsc_Name ".\Browse\httpd.bsc"
|
||||
@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir ""
|
||||
# PROP Intermediate_Dir ""
|
||||
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _tryserf _dummy"
|
||||
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryxml _tryssl _tryzlib _trynghttp2 _trybrotli _trymd _tryserf -tryjson _dummy"
|
||||
# PROP Rebuild_Opt ""
|
||||
# PROP Target_File "\Apache2\bin\httpd.exe"
|
||||
# PROP Bsc_Name ".\Browse\httpd.bsc"
|
||||
|
||||
34
Makefile.win
34
Makefile.win
@ -166,6 +166,33 @@ _tryserf:
|
||||
!ENDIF
|
||||
# NOT EXIST("srclib\serf")
|
||||
|
||||
!IF EXIST("srclib\jansson")
|
||||
|
||||
_tryjson:
|
||||
!IF $(USEMAK) == 1
|
||||
cd modules\loggers
|
||||
$(MAKE) $(MAKEOPT) -f mod_log_json.mak CFG="mod_log_json - Win32 $(LONG)" RECURSE=0 $(CTARGET)
|
||||
cd ..\..
|
||||
!ELSEIF $(USESLN) == 1
|
||||
devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_log_json
|
||||
!ELSE
|
||||
@msdev $(TLP).dsw /USEENV /MAKE \
|
||||
"mod_log_json - Win32 $(LONG)" /NORECURSE $(CTARGET)
|
||||
!ENDIF
|
||||
|
||||
!ELSE
|
||||
# NOT EXIST("srclib\jansson")
|
||||
|
||||
_tryjson:
|
||||
@echo -----
|
||||
@echo mod_log_json will not build unless jansson is built in srclib\jansson
|
||||
@echo Version 2.0 and later available from https://github.com/akheron/jansson/releases
|
||||
@echo build with:
|
||||
@echo cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
|
||||
@echo nmake
|
||||
|
||||
!ENDIF
|
||||
|
||||
!IF EXIST("srclib\zlib")
|
||||
|
||||
_tryzlib:
|
||||
@ -604,6 +631,9 @@ _build:
|
||||
$(MAKE) $(MAKEOPT) -f mod_log_config.mak CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET)
|
||||
$(MAKE) $(MAKEOPT) -f mod_log_debug.mak CFG="mod_log_debug - Win32 $(LONG)" RECURSE=0 $(CTARGET)
|
||||
$(MAKE) $(MAKEOPT) -f mod_log_forensic.mak CFG="mod_log_forensic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
|
||||
!IF EXIST("srclib\jansson")
|
||||
$(MAKE) $(MAKEOPT) -f mod_log_json.mak CFG="mod_log_json - Win32 $(LONG)" RECURSE=0 $(CTARGET)
|
||||
!ENDIF
|
||||
$(MAKE) $(MAKEOPT) -f mod_logio.mak CFG="mod_logio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
|
||||
cd ..\..
|
||||
!IF EXIST("srclib\lua")
|
||||
@ -920,6 +950,10 @@ _copybin:
|
||||
copy modules\loggers\$(LONG)\mod_log_debug.$(src_so) "$(inst_so)" <.y
|
||||
copy modules\loggers\$(LONG)\mod_log_forensic.$(src_so) "$(inst_so)" <.y
|
||||
copy modules\loggers\$(LONG)\mod_logio.$(src_so) "$(inst_so)" <.y
|
||||
!IF EXIST("srclib\jansson")
|
||||
copy modules\loggers\$(LONG)\mod_log_json.$(src_so) "$(inst_so)" <.y
|
||||
copy srclib\jansson\bin\jansson.$(src_dll) "$(inst_dll)" <.y
|
||||
!ENDIF
|
||||
!IF EXIST("srclib\lua")
|
||||
copy modules\lua\$(LONG)\mod_lua.$(src_so) "$(inst_so)" <.y
|
||||
!IF EXIST("srclib\lua\src\lua51.$(src_dll)")
|
||||
|
||||
@ -159,6 +159,7 @@ BEGIN {
|
||||
print "LoadModule log_config_module modules/mod_log_config.so" > dstfl;
|
||||
print "#LoadModule log_debug_module modules/mod_log_debug.so" > dstfl;
|
||||
print "#LoadModule log_forensic_module modules/mod_log_forensic.so" > dstfl;
|
||||
print "#LoadModule log_json_module modules/mod_log_json.so" > dstfl;
|
||||
print "#LoadModule lua_module modules/mod_lua.so" > dstfl;
|
||||
print "#LoadModule macro_module modules/mod_macro.so" > dstfl;
|
||||
print "#LoadModule md_module modules/mod_md.so" > dstfl;
|
||||
|
||||
@ -140,3 +140,4 @@ mod_socache_redis.so 0x70E20000 0x00020000
|
||||
mod_md.so 0x70E40000 0x00030000
|
||||
mod_proxy_uwsgi.so 0x70E70000 0x00020000
|
||||
libapreq.dll 0x70E90000 0x00020000
|
||||
mod_log_json.so 0x70EB0000 0x00020000
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user