You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2016/12/16 15:00:07 UTC

svn commit: r1774609 - /httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp

Author: rjung
Date: Fri Dec 16 15:00:06 2016
New Revision: 1774609

URL: http://svn.apache.org/viewvc?rev=1774609&view=rev
Log:
Add ../generators to include path for Windows
build of mod_socache_memcache. It now needs
mod_status.h.

Untested but exactly analogous to what works for
mod_socache_shmcb and others.

Modified:
    httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp

Modified: httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp?rev=1774609&r1=1774608&r2=1774609&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp Fri Dec 16 15:00:06 2016
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "mod_socache_memcache_EXPORTS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_socache_memcache_src" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_socache_memcache_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"



Re: svn commit: r1774609 - /httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp

Posted by NormW <no...@gknw.net>.
G/A...
On 17/12/2016 5:38 AM, William A Rowe Jr wrote:
> Erm... did you miss the same edit to mod_socache_memcache.mak?
> (Just catching up on the flurry of traffic, so this is speculation.)
>
> Further speculation, are we solid for NetWare now? Any word, Norm?
Have clean build and 'install' on 2.4.x tree using:
APR/APR-UTIL 1.5 trees
PCRE 8.39
NGHTTP2 1.17.0
SERF 1.3.9
LUA 5.2.4
EXPAT 2.2.0

HTH
Norm

>
> [wrowe@hub cache]$ grep "/generators" *
> mod_cache_socache.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
> /Fd"Release\mod_cache_socache_src" /FD /c
> mod_cache_socache.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
> /Fd"Debug\mod_cache_socache_src" /FD /c
> mod_cache_socache.mak:CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
> /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cache_socache_src" /FD /c
> mod_cache_socache.mak:CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
> /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cache_socache_src" /FD /EHsc /c
> mod_socache_dbm.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
> /Fd"Release\mod_socache_dbm_src" /FD /c
> mod_socache_dbm.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
> /Fd"Debug\mod_socache_dbm_src" /FD /c
> mod_socache_dbm.mak:CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
> /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_dbm_src" /FD /c
> mod_socache_dbm.mak:CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
> /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_dbm_src" /FD /EHsc /c
> mod_socache_memcache.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
> /Fd"Release\mod_socache_memcache_src" /FD /c
> mod_socache_memcache.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
> /Fd"Debug\mod_socache_memcache_src" /FD /c
> mod_socache_shmcb.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
> /Fd"Release\mod_socache_shmcb_src" /FD /c
> mod_socache_shmcb.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
> /Fd"Debug\mod_socache_shmcb_src" /FD /c
> mod_socache_shmcb.mak:CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
> /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_shmcb_src" /FD /c
> mod_socache_shmcb.mak:CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I
> "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
> "../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
> /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_shmcb_src" /FD /EHsc /c
> NWGNUcach_socache: $(STDMOD)/generators \
> NWGNUsocachdbm: $(STDMOD)/generators \
> NWGNUsocachmem: $(STDMOD)/generators \
> NWGNUsocachshmcb: $(STDMOD)/generators \
>
>
> On Fri, Dec 16, 2016 at 9:00 AM, <rj...@apache.org> wrote:
>
>> Author: rjung
>> Date: Fri Dec 16 15:00:06 2016
>> New Revision: 1774609
>>
>> URL: http://svn.apache.org/viewvc?rev=1774609&view=rev
>> Log:
>> Add ../generators to include path for Windows
>> build of mod_socache_memcache. It now needs
>> mod_status.h.
>>
>> Untested but exactly analogous to what works for
>> mod_socache_shmcb and others.
>>
>> Modified:
>>      httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp
>>
>> Modified: httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache
>> /mod_socache_memcache.dsp?rev=1774609&r1=1774608&r2=1774609&view=diff
>> ============================================================
>> ==================
>> --- httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp (original)
>> +++ httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp Fri Dec 16
>> 15:00:06 2016
>> @@ -43,7 +43,7 @@ RSC=rc.exe
>>   # PROP Ignore_Export_Lib 0
>>   # PROP Target_Dir ""
>>   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
>> /D "_MBCS" /D "_USRDLL" /D "mod_socache_memcache_EXPORTS" /FD /c
>> -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include"
>> /I "../../srclib/apr/include" /I "../../include" /D "NDEBUG" /D "WIN32" /D
>> "_WINDOWS" /Fd"Release\mod_socache_memcache_src" /FD /c
>> +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include"
>> /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D
>> "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_socache_memcache_src"
>> /FD /c
>>   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
>>   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
>>   # ADD BASE RSC /l 0x409 /d "NDEBUG"
>> @@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
>>   # PROP Ignore_Export_Lib 0
>>   # PROP Target_Dir ""
>>   # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D
>> "_WINDOWS" /FD /c
>> -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include"
>> /I "../../srclib/apr/include" /I "../../include" /D "_DEBUG" /D "WIN32" /D
>> "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD /c
>> +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include"
>> /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D
>> "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD
>> /c
>>   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
>>   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
>>   # ADD BASE RSC /l 0x409 /d "_DEBUG"
>>
>>
>>
>


Re: svn commit: r1774609 - /httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp

Posted by William A Rowe Jr <wr...@rowe-clan.net>.
Erm... did you miss the same edit to mod_socache_memcache.mak?
(Just catching up on the flurry of traffic, so this is speculation.)

Further speculation, are we solid for NetWare now? Any word, Norm?

[wrowe@hub cache]$ grep "/generators" *
mod_cache_socache.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/Fd"Release\mod_cache_socache_src" /FD /c
mod_cache_socache.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/Fd"Debug\mod_cache_socache_src" /FD /c
mod_cache_socache.mak:CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cache_socache_src" /FD /c
mod_cache_socache.mak:CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cache_socache_src" /FD /EHsc /c
mod_socache_dbm.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/Fd"Release\mod_socache_dbm_src" /FD /c
mod_socache_dbm.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/Fd"Debug\mod_socache_dbm_src" /FD /c
mod_socache_dbm.mak:CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_dbm_src" /FD /c
mod_socache_dbm.mak:CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_dbm_src" /FD /EHsc /c
mod_socache_memcache.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/Fd"Release\mod_socache_memcache_src" /FD /c
mod_socache_memcache.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/Fd"Debug\mod_socache_memcache_src" /FD /c
mod_socache_shmcb.dsp:# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/Fd"Release\mod_socache_shmcb_src" /FD /c
mod_socache_shmcb.dsp:# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/Fd"Debug\mod_socache_shmcb_src" /FD /c
mod_socache_shmcb.mak:CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_shmcb_src" /FD /c
mod_socache_shmcb.mak:CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I
"../../srclib/apr-util/include" /I "../../srclib/apr/include" /I
"../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_socache_shmcb_src" /FD /EHsc /c
NWGNUcach_socache: $(STDMOD)/generators \
NWGNUsocachdbm: $(STDMOD)/generators \
NWGNUsocachmem: $(STDMOD)/generators \
NWGNUsocachshmcb: $(STDMOD)/generators \


On Fri, Dec 16, 2016 at 9:00 AM, <rj...@apache.org> wrote:

> Author: rjung
> Date: Fri Dec 16 15:00:06 2016
> New Revision: 1774609
>
> URL: http://svn.apache.org/viewvc?rev=1774609&view=rev
> Log:
> Add ../generators to include path for Windows
> build of mod_socache_memcache. It now needs
> mod_status.h.
>
> Untested but exactly analogous to what works for
> mod_socache_shmcb and others.
>
> Modified:
>     httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp
>
> Modified: httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache
> /mod_socache_memcache.dsp?rev=1774609&r1=1774608&r2=1774609&view=diff
> ============================================================
> ==================
> --- httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp (original)
> +++ httpd/httpd/trunk/modules/cache/mod_socache_memcache.dsp Fri Dec 16
> 15:00:06 2016
> @@ -43,7 +43,7 @@ RSC=rc.exe
>  # PROP Ignore_Export_Lib 0
>  # PROP Target_Dir ""
>  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
> /D "_MBCS" /D "_USRDLL" /D "mod_socache_memcache_EXPORTS" /FD /c
> -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include"
> /I "../../srclib/apr/include" /I "../../include" /D "NDEBUG" /D "WIN32" /D
> "_WINDOWS" /Fd"Release\mod_socache_memcache_src" /FD /c
> +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include"
> /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D
> "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_socache_memcache_src"
> /FD /c
>  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
>  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
>  # ADD BASE RSC /l 0x409 /d "NDEBUG"
> @@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
>  # PROP Ignore_Export_Lib 0
>  # PROP Target_Dir ""
>  # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D
> "_WINDOWS" /FD /c
> -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include"
> /I "../../srclib/apr/include" /I "../../include" /D "_DEBUG" /D "WIN32" /D
> "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD /c
> +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include"
> /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D
> "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD
> /c
>  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
>  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
>  # ADD BASE RSC /l 0x409 /d "_DEBUG"
>
>
>