diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | include/apu_version.h | 81 | ||||
| -rw-r--r-- | libaprutil.dsp | 34 | ||||
| -rw-r--r-- | libaprutil.rc | 54 |
4 files changed, 115 insertions, 58 deletions
@@ -2,6 +2,10 @@ Changes with APR-util 1.2.0 *) Introduction of APR DBD layer. [Nick Kew] +Changes with APR-util 1.1.2 + + *) Fix libaprutil.rc for Win32 builds [William Rowe, Justin Erenkrantz] + Changes with APR-util 1.1.1 *) Fix memory leak in buckets when using APR_POOL_DEBUG mode. [Joe Schaefer] diff --git a/include/apu_version.h b/include/apu_version.h index b5c8815a..1edb7888 100644 --- a/include/apu_version.h +++ b/include/apu_version.h @@ -17,17 +17,9 @@ #ifndef APU_VERSION_H #define APU_VERSION_H -#include "apr_version.h" - -#include "apu.h" - -#ifdef __cplusplus -extern "C" { -#endif - /** * @file apu_version.h - * @brief + * @brief APR-util Versioning Interface * * APR-util's Version * @@ -45,6 +37,7 @@ extern "C" { * http://apr.apache.org/versioning.html */ + /* The numeric compile-time version constants. These constants are the * authoritative version numbers for APU. */ @@ -56,29 +49,71 @@ extern "C" { */ #define APU_MAJOR_VERSION 1 -/** +/** minor version * Minor API changes that do not cause binary compatibility problems. - * Should be reset to 0 when upgrading APU_MAJOR_VERSION + * Reset to 0 when upgrading APU_MAJOR_VERSION */ #define APU_MINOR_VERSION 2 -/** patch level */ +/** patch level + * The Patch Level never includes API changes, simply bug fixes. + * Reset to 0 when upgrading APR_MINOR_VERSION + */ #define APU_PATCH_VERSION 0 /** - * This symbol is defined for internal, "development" copies of APU. This - * symbol will be #undef'd for releases. + * The symbol APU_IS_DEV_VERSION is only defined for internal, + * "development" copies of APU. It is undefined for released versions + * of APU. */ #define APU_IS_DEV_VERSION +#if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN) +/** Internal: string form of the "is dev" flag */ +#define APU_IS_DEV_STRING "-dev" +#else +#define APU_IS_DEV_STRING "" +#endif + + +#ifndef APU_STRINGIFY +/** Properly quote a value as a string in the C preprocessor */ +#define APU_STRINGIFY(n) APU_STRINGIFY_HELPER(n) +/** Helper macro for APU_STRINGIFY */ +#define APU_STRINGIFY_HELPER(n) #n +#endif + /** The formatted string of APU's version */ #define APU_VERSION_STRING \ - APR_STRINGIFY(APU_MAJOR_VERSION) "." \ - APR_STRINGIFY(APU_MINOR_VERSION) "." \ - APR_STRINGIFY(APU_PATCH_VERSION) \ + APU_STRINGIFY(APU_MAJOR_VERSION) "." \ + APU_STRINGIFY(APU_MINOR_VERSION) "." \ + APU_STRINGIFY(APU_PATCH_VERSION) \ APU_IS_DEV_STRING +/** An alternative formatted string of APR's version */ +/* macro for Win32 .rc files using numeric csv representation */ +#define APU_VERSION_STRING_CSV APU_MAJOR_VERSION ##, \ + ##APU_MINOR_VERSION ##, \ + ##APU_PATCH_VERSION + + +#ifndef APU_VERSION_ONLY + +/* The C language API to access the version at run time, + * as opposed to compile time. APU_VERSION_ONLY may be defined + * externally when preprocessing apr_version.h to obtain strictly + * the C Preprocessor macro declarations. + */ + +#include "apr_version.h" + +#include "apu.h" + +#ifdef __cplusplus +extern "C" { +#endif + /** * Return APR-util's version information information in a numeric form. * @@ -90,16 +125,10 @@ APU_DECLARE(void) apu_version(apr_version_t *pvsn); /** Return APU's version information as a string. */ APU_DECLARE(const char *) apu_version_string(void); - -/** Internal: string form of the "is dev" flag */ -#ifdef APU_IS_DEV_VERSION -#define APU_IS_DEV_STRING "-dev" -#else -#define APU_IS_DEV_STRING "" -#endif - #ifdef __cplusplus } #endif -#endif /* APU_VERSION_H */ +#endif /* ndef APU_VERSION_ONLY */ + +#endif /* ndef APU_VERSION_H */ diff --git a/libaprutil.dsp b/libaprutil.dsp index fc06e3c7..1db9bd42 100644 --- a/libaprutil.dsp +++ b/libaprutil.dsp @@ -47,7 +47,7 @@ RSC=rc.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" /d "APU_VERSION_ONLY" /I "./include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -73,7 +73,7 @@ LINK32=link.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" /d "APU_VERSION_ONLY" /I "./include" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -601,36 +601,6 @@ SOURCE=.\include\apu_version.h SOURCE=.\libaprutil.rc # End Source File -# Begin Source File - -SOURCE=..\apr\build\win32ver.awk - -!IF "$(CFG)" == "libaprutil - Win32 Release" - -# PROP Ignore_Default_Tool 1 -USERDEP__WIN32="./include/apu_version.h" -# Begin Custom Build - Creating Version Resource -InputPath=..\apr\build\win32ver.awk -".\libaprutil.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../apr/build/win32ver.awk libaprutil.dll "Apache APR Utility Library" ./include/apu_version.h > .\libaprutil.rc - -# End Custom Build - -!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -USERDEP__WIN32="./include/apu_version.h" -# Begin Custom Build - Creating Version Resource -InputPath=..\apr\build\win32ver.awk - -".\libaprutil.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../apr/build/win32ver.awk libaprutil.dll "Apache APR Utility Library" ./include/apu_version.h > .\libaprutil.rc - -# End Custom Build - -!ENDIF - -# End Source File # End Target # End Project diff --git a/libaprutil.rc b/libaprutil.rc new file mode 100644 index 00000000..c8dc0b36 --- /dev/null +++ b/libaprutil.rc @@ -0,0 +1,54 @@ +#include "apu_version.h"
+
+#define APU_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
+ "Foundation or its licensors, as applicable."
+
+#define APU_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 APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION)
+
+
+1 VERSIONINFO
+ FILEVERSION APU_VERSION_STRING_CSV,0
+ PRODUCTVERSION APU_VERSION_STRING_CSV,0
+ FILEFLAGSMASK 0x3fL
+#if defined(_DEBUG)
+ FILEFLAGS 0x01L
+#else
+ FILEFLAGS 0x00L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", APU_LICENSE "\0"
+ VALUE "CompanyName", "Apache Software Foundation\0"
+ VALUE "FileDescription", "Apache Portable Runtime Library\0"
+ VALUE "FileVersion", APU_VERSION_STRING "\0"
+ VALUE "InternalName", APU_DLL_BASENAME "\0"
+ VALUE "LegalCopyright", APU_COPYRIGHT "\0"
+ VALUE "OriginalFilename", APU_DLL_BASENAME ".dll\0"
+ VALUE "ProductName", "Apache Portable Runtime Project\0"
+ VALUE "ProductVersion", APU_VERSION_STRING "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
|