Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Message-ID: <20050926200438.79603.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r291726 - in /apr/apr-iconv/branches/0.9.x:
 libapriconv.dsp
 libapriconv.rc
Date: Mon, 26 Sep 2005 20:04:38 -0000
To: commits@apr.apache.org
From: wrowe@apache.org

Author: wrowe
Date: Mon Sep 26 13:04:34 2005
New Revision: 291726

URL: http://svn.apache.org/viewcvs?rev=291726&view=rev
Log:

  Backport APR 1.x change to remove awk from libapriconv.rc
  version numbering.  Similar to /apr-0.9/ commit 291722.

Added:
    apr/apr-iconv/branches/0.9.x/libapriconv.rc   (with props)
Modified:
    apr/apr-iconv/branches/0.9.x/libapriconv.dsp

Modified: apr/apr-iconv/branches/0.9.x/libapriconv.dsp
URL: http://svn.apache.org/viewcvs/apr/apr-iconv/branches/0.9.x/libapriconv.dsp?rev=291726&r1=291725&r2=291726&view=diff
==============================================================================
--- apr/apr-iconv/branches/0.9.x/libapriconv.dsp (original)
+++ apr/apr-iconv/branches/0.9.x/libapriconv.dsp Mon Sep 26 13:04:34 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 "APR_VERSION_ONLY" /I "./include" /I "../apr/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 "APR_VERSION_ONLY" /I "./include" /I "../apr/include" 
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -142,35 +142,6 @@
 # Begin Source File
 
 SOURCE=.\libapriconv.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\apr\build\win32ver.awk
-
-!IF  "$(CFG)" == "libapriconv - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# 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/ap_release.h > .\libapriconv.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libapriconv - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# 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/ap_release.h > .\libapriconv.rc
-
-# End Custom Build
-
-!ENDIF 
-
 # End Source File
 # End Target
 # End Project

Added: apr/apr-iconv/branches/0.9.x/libapriconv.rc
URL: http://svn.apache.org/viewcvs/apr/apr-iconv/branches/0.9.x/libapriconv.rc?rev=291726&view=auto
==============================================================================
--- apr/apr-iconv/branches/0.9.x/libapriconv.rc (added)
+++ apr/apr-iconv/branches/0.9.x/libapriconv.rc Mon Sep 26 13:04:34 2005
@@ -0,0 +1,61 @@
+#include "apr_general.h"
+#include "api_version.h"
+
+#define APR_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
+                      "Foundation or its licensors, as applicable."
+
+#define APR_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"
+
+/** 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
+
+
+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", APR_LICENSE "\0"
+      VALUE "CompanyName", "Apache Software Foundation\0"
+      VALUE "FileDescription", "Apache APR I18N Conversion Library\0"
+      VALUE "FileVersion", API_VERSION_STRING "\0"
+      VALUE "InternalName", API_DLL_BASENAME "\0"
+      VALUE "LegalCopyright", APR_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/0.9.x/libapriconv.rc
------------------------------------------------------------------------------
    svn:eol-style = native