This is (part of) the point to apr_release.h, although that name is

  certainly subject to discussion.

  Elimiate use of win32ver.awk for creating libapr.rc.  Simply pull
  in the cpp macros from apr_release.h.  The issue is that we could
  not do this with apr_version.h due to how complex the c grammer
  has become.  We need a lightweight c preprocessor file for the
  resource compiler (rc) to parse.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@151780 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 37 insertions, 33 deletions

diff --git a/libapr.dsp b/libapr.dsp
index 5999c3d29..80c415875 100644
--- a/libapr.dsp
+++ b/libapr.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" /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" /I "./include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -637,36 +637,5 @@ SOURCE=.\include\apr_want.h
 
 SOURCE=.\libapr.rc
 # End Source File
-# Begin Source File
-
-SOURCE=.\build\win32ver.awk
-
-!IF  "$(CFG)" == "libapr - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="./include/apr_version.h"	
-# Begin Custom Build - Creating Version Resource
-InputPath=.\build\win32ver.awk
-
-".\libapr.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ./build/win32ver.awk libapr.dll "Apache Portability Runtime Library" ./include/apr_version.h > .\libapr.rc
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__WIN32="./include/apr_version.h"	
-# Begin Custom Build - Creating Version Resource
-InputPath=.\build\win32ver.awk
-
-".\libapr.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	awk -f ./build/win32ver.awk libapr.dll "Apache Portability Runtime Library" ./include/apr_version.h > .\libapr.rc
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
 # End Target
 # End Project
diff --git a/libapr.rc b/libapr.rc
new file mode 100644
index 000000000..e9a15be1c
--- /dev/null
+++ b/libapr.rc
@@ -0,0 +1,35 @@
+#include "apr_release.h"

+

+1 VERSIONINFO

+ FILEVERSION APR_VERSION_STRING_CSV,0

+ PRODUCTVERSION APR_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", "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\nhttp://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless 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.\0"

+      VALUE "CompanyName", "Apache Software Foundation\0"

+      VALUE "FileDescription", "Apache Portability Runtime Library\0"

+      VALUE "FileVersion", APR_VERSION_STRING "\0"

+      VALUE "InternalName", "libapr\0"

+      VALUE "LegalCopyright", "Copyright 2000-2005 The Apache Software Foundation or its licensors, as applicable.\0"

+      VALUE "OriginalFilename", "libapr.dll\0"

+      VALUE "ProductName", "Apache Portablity Runtime Project\0"

+      VALUE "ProductVersion", APR_VERSION_STRING "\0"

+    END

+  END

+  BLOCK "VarFileInfo"

+  BEGIN

+    VALUE "Translation", 0x409, 1200

+  END

+END