Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 31320 invoked from network); 16 Mar 2005 04:27:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 16 Mar 2005 04:27:05 -0000 Received: (qmail 91576 invoked by uid 500); 16 Mar 2005 04:27:05 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 91533 invoked by uid 500); 16 Mar 2005 04:27:04 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list commits@apr.apache.org Received: (qmail 91518 invoked by uid 99); 16 Mar 2005 04:27:04 -0000 X-ASF-Spam-Status: No, hits=-7.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50,WEIRD_QUOTING X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 15 Mar 2005 20:27:04 -0800 Received: (qmail 31284 invoked by uid 65534); 16 Mar 2005 04:27:03 -0000 Message-ID: <20050316042703.31283.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 16 Mar 2005 04:27:03 -0000 Subject: svn commit: r157666 - in apr/apr-iconv/branches/1.0.x: CHANGES include/api_version.h libapriconv.dsp libapriconv.rc To: commits@apr.apache.org From: jerenkrantz@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jerenkrantz Date: Tue Mar 15 20:27:02 2005 New Revision: 157666 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157666 Log: Fix libapriconv.rc for Win32 release builds. Added: apr/apr-iconv/branches/1.0.x/libapriconv.rc (with props) Modified: apr/apr-iconv/branches/1.0.x/CHANGES apr/apr-iconv/branches/1.0.x/include/api_version.h apr/apr-iconv/branches/1.0.x/libapriconv.dsp Modified: apr/apr-iconv/branches/1.0.x/CHANGES URL: http://svn.apache.org/viewcvs/apr/apr-iconv/branches/1.0.x/CHANGES?vie= w=3Ddiff&r1=3D157665&r2=3D157666 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-iconv/branches/1.0.x/CHANGES (original) +++ apr/apr-iconv/branches/1.0.x/CHANGES Tue Mar 15 20:27:02 2005 @@ -1,5 +1,7 @@ Changes with APR-ICONV 1.0.2 =20 + *) Fix libapriconv.rc for Win32 builds [William Rowe, Justin Erenkrantz] + Changes with APR-ICONV 1.0.1 =20 Changes with APR-ICONV 1.0.0 Modified: apr/apr-iconv/branches/1.0.x/include/api_version.h URL: http://svn.apache.org/viewcvs/apr/apr-iconv/branches/1.0.x/include/api= _version.h?view=3Ddiff&r1=3D157665&r2=3D157666 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-iconv/branches/1.0.x/include/api_version.h (original) +++ apr/apr-iconv/branches/1.0.x/include/api_version.h Tue Mar 15 20:27:02 = 2005 @@ -16,18 +16,9 @@ #ifndef API_VERSION_H #define API_VERSION_H =20 -#include "apr.h" -#include "apr_version.h" - -#include "apr_iconv.h" - -#ifdef __cplusplus -extern "C" { -#endif - /** * @file api_version.h - * @brief=20 + * @brief APR-iconv Versioning Interface *=20 * APR-iconv's Version * @@ -45,6 +36,7 @@ * http://apr.apache.org/versioning.html */ =20 + /* The numeric compile-time version constants. These constants are the * authoritative version numbers for API.=20 */ @@ -56,31 +48,72 @@ */ #define API_MAJOR_VERSION 1 =20 -/**=20 +/** minor version * Minor API changes that do not cause binary compatibility problems. - * Should be reset to 0 when upgrading API_MAJOR_VERSION + * Reset to 0 when upgrading API_MAJOR_VERSION */ #define API_MINOR_VERSION 0 =20 -/** patch level */ -#define API_PATCH_VERSION 2 +/** patch level=20 + * The Patch Level never includes API changes, simply bug fixes. + * Reset to 0 when upgrading API_MINOR_VERSION + */ +#define API_PATCH_VERSION 1 =20 /**=20 - * This symbol is defined for internal, "development" copies of API. This - * symbol will be #undef'd for releases.=20 + * The symbol API_IS_DEV_VERSION is only defined for internal, + * "development" copies of API. It is undefined for released versions + * of API. */ -#define API_IS_DEV_VERSION +/* #define API_IS_DEV_VERSION */ + + +#if defined(API_IS_DEV_VERSION) || defined(DOXYGEN) +/** Internal: string form of the "is dev" flag */ +#define API_IS_DEV_STRING "-dev" +#else +#define API_IS_DEV_STRING "" +#endif =20 +#ifndef API_STRINGIFY +/** Properly quote a value as a string in the C preprocessor */ +#define API_STRINGIFY(n) API_STRINGIFY_HELPER(n) +/** Helper macro for API_STRINGIFY */ +#define API_STRINGIFY_HELPER(n) #n +#endif =20 /** The formatted string of API's version */ #define API_VERSION_STRING \ - APR_STRINGIFY(API_MAJOR_VERSION) "." \ - APR_STRINGIFY(API_MINOR_VERSION) "." \ - APR_STRINGIFY(API_PATCH_VERSION) \ + API_STRINGIFY(API_MAJOR_VERSION) "." \ + API_STRINGIFY(API_MINOR_VERSION) "." \ + API_STRINGIFY(API_PATCH_VERSION) \ API_IS_DEV_STRING =20 +/** An alternative formatted string of APR's version */ +/* macro for Win32 .rc files using numeric csv representation */ +#define API_VERSION_STRING_CSV API_MAJOR_VERSION ##, \ + ##API_MINOR_VERSION ##, \ + ##API_PATCH_VERSION + + +#ifndef API_VERSION_ONLY + +/* The C language API to access the version at run time,=20 + * as opposed to compile time. API_VERSION_ONLY may be defined=20 + * externally when preprocessing apr_version.h to obtain strictly=20 + * the C Preprocessor macro declarations. + */ + +#include "apr_version.h" + +#include "apr_iconv.h" + +#ifdef __cplusplus +extern "C" { +#endif + /** - * Return APR-util's version information information in a numeric form. + * Return APR-iconv's version information information in a numeric form. * * @param pvsn Pointer to a version structure for returning the version * information. @@ -90,16 +123,10 @@ /** Return API's version information as a string. */ API_DECLARE(const char *) api_version_string(void); =20 - -/** Internal: string form of the "is dev" flag */ -#ifdef API_IS_DEV_VERSION -#define API_IS_DEV_STRING "-dev" -#else -#define API_IS_DEV_STRING "" -#endif - #ifdef __cplusplus } #endif =20 -#endif /* API_VERSION_H */ +#endif /* ndef API_VERSION_ONLY */ + +#endif /* ndef API_VERSION_H */ Modified: apr/apr-iconv/branches/1.0.x/libapriconv.dsp URL: http://svn.apache.org/viewcvs/apr/apr-iconv/branches/1.0.x/libapriconv= .dsp?view=3Ddiff&r1=3D157665&r2=3D157666 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-iconv/branches/1.0.x/libapriconv.dsp (original) +++ apr/apr-iconv/branches/1.0.x/libapriconv.dsp Tue Mar 15 20:27:02 2005 @@ -47,7 +47,7 @@ # 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 "API_VERSION_ONLY" /I "./include" BSC32=3Dbscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -73,7 +73,7 @@ # 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 "API_VERSION_ONLY" /I "./include" BSC32=3Dbscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -147,36 +147,6 @@ =20 SOURCE=3D.\libapriconv.rc # End Source File -# Begin Source File - -SOURCE=3D..\apr\build\win32ver.awk - -!IF "$(CFG)" =3D=3D "libapriconv - Win32 Release" - -# PROP Ignore_Default_Tool 1 -USERDEP__WIN32=3D"./include/api_version.h"=09 -# Begin Custom Build - Creating Version Resource -InputPath=3D..\apr\build\win32ver.awk - -".\libapriconv.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../apr/build/win32ver.awk libapriconv.dll "Apache APR I18N Convers= ion Library" ./include/api_version.h > .\libapriconv.rc - -# End Custom Build - -!ELSEIF "$(CFG)" =3D=3D "libapriconv - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -USERDEP__WIN32=3D"./include/api_version.h"=09 -# Begin Custom Build - Creating Version Resource -InputPath=3D..\apr\build\win32ver.awk - -".\libapriconv.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - awk -f ../apr/build/win32ver.awk libapriconv.dll "Apache APR I18N Convers= ion Library" ./include/api_version.h > .\libapriconv.rc - -# End Custom Build =20 -!ENDIF=20 - -# End Source File # End Target # End Project Added: apr/apr-iconv/branches/1.0.x/libapriconv.rc URL: http://svn.apache.org/viewcvs/apr/apr-iconv/branches/1.0.x/libapriconv= .rc?view=3Dauto&rev=3D157666 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- apr/apr-iconv/branches/1.0.x/libapriconv.rc (added) +++ apr/apr-iconv/branches/1.0.x/libapriconv.rc Tue Mar 15 20:27:02 2005 @@ -0,0 +1,54 @@ +#include "api_version.h" + +#define API_COPYRIGHT "Copyright 2000-2005 The Apache Software " \ + "Foundation or its licensors, as applicable." + +#define API_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 API_DLL_BASENAME "libapriconv-" API_STRINGIFY(API_MAJOR_VERSION) + + +1 VERSIONINFO + FILEVERSION API_VERSION_STRING_CSV,0 + PRODUCTVERSION API_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", API_LICENSE "\0" + VALUE "CompanyName", "Apache Software Foundation\0" + VALUE "FileDescription", "Apache Portable Runtime Library\0" + VALUE "FileVersion", API_VERSION_STRING "\0" + VALUE "InternalName", API_DLL_BASENAME "\0" + VALUE "LegalCopyright", API_COPYRIGHT "\0" + VALUE "OriginalFilename", API_DLL_BASENAME ".dll\0" + VALUE "ProductName", "Apache Portable Runtime Project\0" + VALUE "ProductVersion", API_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Propchange: apr/apr-iconv/branches/1.0.x/libapriconv.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D CRLF