apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r157666 - in apr/apr-iconv/branches/1.0.x: CHANGES include/api_version.h libapriconv.dsp libapriconv.rc
Date Wed, 16 Mar 2005 04:27:03 GMT
Author: jerenkrantz
Date: Tue Mar 15 20:27:02 2005
New Revision: 157666

URL: http://svn.apache.org/viewcvs?view=rev&rev=157666
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?view=diff&r1=157665&r2=157666
==============================================================================
--- 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
 
+  *) Fix libapriconv.rc for Win32 builds [William Rowe, Justin Erenkrantz]
+
 Changes with APR-ICONV 1.0.1
 
 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=diff&r1=157665&r2=157666
==============================================================================
--- 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
 
-#include "apr.h"
-#include "apr_version.h"
-
-#include "apr_iconv.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * @file api_version.h
- * @brief 
+ * @brief APR-iconv Versioning Interface
  * 
  * APR-iconv's Version
  *
@@ -45,6 +36,7 @@
  *     http://apr.apache.org/versioning.html
  */
 
+
 /* The numeric compile-time version constants. These constants are the
  * authoritative version numbers for API. 
  */
@@ -56,31 +48,72 @@
  */
 #define API_MAJOR_VERSION       1
 
-/** 
+/** 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
 
-/** patch level */
-#define API_PATCH_VERSION       2
+/** patch level 
+ * The Patch Level never includes API changes, simply bug fixes.
+ * Reset to 0 when upgrading API_MINOR_VERSION
+ */
+#define API_PATCH_VERSION       1
 
 /** 
- *  This symbol is defined for internal, "development" copies of API. This
- *  symbol will be #undef'd for releases. 
+ * 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
 
+#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
 
 /** 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
 
+/** 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, 
+ * as opposed to compile time.  API_VERSION_ONLY may be defined 
+ * externally when preprocessing apr_version.h to obtain strictly 
+ * 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);
 
-
-/** 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
 
-#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=diff&r1=157665&r2=157666
==============================================================================
--- 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=bscmake.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=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -147,36 +147,6 @@
 
 SOURCE=.\libapriconv.rc
 # End Source File
-# Begin Source File
-
-SOURCE=..\apr\build\win32ver.awk
-
-!IF  "$(CFG)" == "libapriconv - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="./include/api_version.h"	
-# Begin Custom Build - Creating Version Resource
-InputPath=..\apr\build\win32ver.awk
-
-".\libapriconv.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../apr/build/win32ver.awk libapriconv.dll "Apache APR I18N Conversion Library"  ./include/api_version.h
> .\libapriconv.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libapriconv - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="./include/api_version.h"	
-# Begin Custom Build - Creating Version Resource
-InputPath=..\apr\build\win32ver.awk
-
-".\libapriconv.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ../apr/build/win32ver.awk libapriconv.dll "Apache APR I18N Conversion Library"  ./include/api_version.h
> .\libapriconv.rc
-
-# End Custom Build
 
-!ENDIF 
-
-# 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=auto&rev=157666
==============================================================================
--- 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 = CRLF



Mime
View raw message