Author: pgollucci
Date: Thu Apr 24 13:18:34 2008
New Revision: 651388
URL: http://svn.apache.org/viewvc?rev=651388&view=rev
Log:
Win32 License/build Add libapreq.rc and generate libapreq.res
Tweaked by: pgollucci
Reviewed by: wrowe
Submitted by: Mladen Turk <[EMAIL PROTECTED]>
Added:
httpd/apreq/trunk/libapreq.rc
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/win32/libapreq2.mak
Modified: httpd/apreq/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=651388&r1=651387&r2=651388&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Thu Apr 24 13:18:34 2008
@@ -4,6 +4,9 @@
@section v2_10 Changes with libapreq2-2.10 (under developement)
+- License [Mladen Turk]
+ Add libapreq.rc and generate libapreq.res
+
- Build [Mladen Turk]
Add APREQ_DECLARE_EXPORT/APREQ_DECLARE_STATIC
in the same way as APR declares so that dllexport/dllimport
Added: httpd/apreq/trunk/libapreq.rc
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/libapreq.rc?rev=651388&view=auto
==============================================================================
--- httpd/apreq/trunk/libapreq.rc (added)
+++ httpd/apreq/trunk/libapreq.rc Thu Apr 24 13:18:34 2008
@@ -0,0 +1,69 @@
+#include "apreq_version.h"
+
+#define APREQ_COPYRIGHT "Copyright 2008 The Apache Software " \
+ "Foundation or its licensors, as applicable."
+
+#define APREQ_LICENSE "Licensed under the Apache License, Version 2.0 " \
+ "(the ""License""); you may not use this file except " \
+ "in compliance with the License. You may obtain a " \
+ "copy of the License at\r\n\r\n" \
+ "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n"; \
+ "Unless required by applicable law or agreed to in " \
+ "writing, software distributed under the License is " \
+ "distributed on an ""AS IS"" BASIS, WITHOUT " \
+ "WARRANTIES OR CONDITIONS OF ANY KIND, either " \
+ "express or implied. See the License for the " \
+ "specific language governing permissions and " \
+ "limitations under the License."
+
+#define APREQ_DLL_BASENAME "libapreq-" APR_STRINGIFY(APREQ_MAJOR_VERSION)
+#define APREQ_VERSION_STRING_CSV APREQ_MAJOR_VERSION ##, \
+ ##APREQ_MINOR_VERSION ##, \
+ ##APREQ_PATCH_VERSION
+
+
+1 VERSIONINFO
+ FILEVERSION APREQ_VERSION_STRING_CSV,0
+ PRODUCTVERSION APREQ_VERSION_STRING_CSV,0
+ FILEFLAGSMASK 0x3fL
+#if defined(APREQ_IS_DEV_VERSION)
+#if defined(_DEBUG)
+ FILEFLAGS 0x03L
+#else
+ FILEFLAGS 0x02L
+#endif
+#else
+#if defined(_DEBUG)
+ FILEFLAGS 0x01L
+#else
+ FILEFLAGS 0x00L
+#endif
+#endif
+#if defined(WINNT) || defined(WIN64)
+ FILEOS 0x40004L
+#else
+ FILEOS 0x4L
+#endif
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", APREQ_LICENSE "\0"
+ VALUE "CompanyName", "Apache Software Foundation\0"
+ VALUE "FileDescription", "Apache HTTP Server Request Library\0"
+ VALUE "FileVersion", APREQ_VERSION_STRING "\0"
+ VALUE "InternalName", APREQ_DLL_BASENAME "\0"
+ VALUE "LegalCopyright", APREQ_COPYRIGHT "\0"
+ VALUE "OriginalFilename", APREQ_DLL_BASENAME ".dll\0"
+ VALUE "ProductName", "Apache HTTP Server Project\0"
+ VALUE "ProductVersion", APREQ_VERSION_STRING "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
Modified: httpd/apreq/trunk/win32/libapreq2.mak
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/win32/libapreq2.mak?rev=651388&r1=651387&r2=651388&view=diff
==============================================================================
--- httpd/apreq/trunk/win32/libapreq2.mak (original)
+++ httpd/apreq/trunk/win32/libapreq2.mak Thu Apr 24 13:18:34 2008
@@ -68,6 +68,7 @@
"$(INTDIR)\module_custom.obj" \
"$(INTDIR)\module_cgi.obj" \
"$(INTDIR)\error.obj" \
+ "$(INTDIR)\libprocrun.res \
"$(APR_LIB)" \
"$(APU_LIB)"
@@ -80,6 +81,8 @@
CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "APREQ_DECLARE_EXPORT" /I"$(APACHE)\include"
/I"$(APREQ_HOME)\include" /YX /FD /c
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /i "$(APACHE)\include" /d "NDEBUG" /i "$(APREQ_HOME)\include"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LINK32=link.exe
@@ -101,6 +104,8 @@
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "APREQ_DECLARE_EXPORT" /I"$(APACHE)\include"
/I"$(APREQ_HOME)\include" /YX /FD /GZ /c
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+RSC_PROJ=/l 0x409 /i "$(APACHE)\include" /d "_DEBUG /i "$(APREQ_HOME)\include"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapreq2.bsc"
LINK32=link.exe
@@ -207,6 +212,11 @@
"$(INTDIR)\error.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) /Fo"$(INTDIR)\error.obj" $(CPP_PROJ) $(SOURCE)
+
+SOURCE=.\libapreq.rc
+
+"$(INTDIR)\libapreq.res" : $(SOURCE) "$(INTDIR)"
+ $(RSC) /fo"$(INTDIR)\libapreq.res" $(RSC_PROJ) $(SOURCE)
!ENDIF
