Author: wrowe
Date: Tue Sep 8 18:46:03 2009
New Revision: 812624
URL: http://svn.apache.org/viewvc?rev=812624&view=rev
Log:
Split version into components, and use to create a win32 version resource
Added:
httpd/mod_ftp/trunk/modules/ftp/mod_ftp.rc (with props)
Modified:
httpd/mod_ftp/trunk/include/mod_ftp.h
httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp
Modified: httpd/mod_ftp/trunk/include/mod_ftp.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/mod_ftp.h?rev=812624&r1=812623&r2=812624&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/mod_ftp.h (original)
+++ httpd/mod_ftp/trunk/include/mod_ftp.h Tue Sep 8 18:46:03 2009
@@ -23,6 +23,31 @@
#ifndef MOD_FTP_H
#define MOD_FTP_H
+#include "apr_general.h" /* stringify */
+
+#define MODFTP_COPYRIGHT \
+ "Copyright 2009 The Apache Software Foundation."
+
+#define MODFTP_VERSION_MAJOR 0
+#define MODFTP_VERSION_MINOR 9
+#define MODFTP_VERSION_SUBVER 5
+#define MODFTP_VERSION_DEV 1
+
+#if MODFTP_VERSION_DEV
+#define MODFTP_VERSION_DEVSTR "-dev"
+#else
+#define MODFTP_VERSION_DEVSTR ""
+#endif
+
+#define MODFTP_REVISION APR_STRINGIFY(MODFTP_VERSION_MAJOR) \
+ "." APR_STRINGIFY(MODFTP_VERSION_MINOR) \
+ "." APR_STRINGIFY(MODFTP_VERSION_SUBVER)
+#define MODFTP_VERSION MODFTP_REVISION MODFTP_VERSION_DEVSTR
+
+#define MODFTP_PRODUCT "mod_ftp/" MODFTP_VERSION
+
+#ifndef VERSION_ONLY
+
#include "httpd.h"
#include "http_config.h"
@@ -30,7 +55,6 @@
extern "C" {
#endif
-#define MODFTP_VERSION "0.9.5-dev"
/* FTP Reply Codes */
@@ -297,3 +321,5 @@
#endif
+#endif
+
Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp?rev=812624&r1=812623&r2=812624&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.dsp Tue Sep 8 18:46:03 2009
@@ -47,7 +47,7 @@
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "../../include" /I "../../srclib/apr/include" /I "$(APACHE2_HOME)/include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -79,7 +79,7 @@
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "../../include" /I "../../srclib/apr/include" /I "$(APACHE2_HOME)/include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -195,12 +195,16 @@
# End Source File
# Begin Source File
-SOURCE=..\..\include\mod_ftp.h
+SOURCE=.\ftp_internal.h
# End Source File
# Begin Source File
-SOURCE=.\ftp_internal.h
+SOURCE=..\..\include\mod_ftp.h
# End Source File
# End Group
+# Begin Source File
+
+SOURCE=.\mod_ftp.rc
+# End Source File
# End Target
# End Project
Added: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.rc
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.rc?rev=812624&view=auto
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.rc (added)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.rc Tue Sep 8 18:46:03 2009
@@ -0,0 +1,56 @@
+#define VERSION_ONLY
+
+#include "mod_ftp.h"
+
+#define ASF_LICENSE \
+ "Licensed to the Apache Software Foundation (ASF) under one or more " \
+ "contributor license agreements. See the NOTICE file distributed with " \
+ "this work for additional information regarding copyright ownership. " \
+ "The ASF licenses this file to You 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."
+
+/* macro for Win32 .rc files using numeric csv representation */
+#define MODFTP_REVISION_CSV MODFTP_VERSION_MAJOR ##, \
+ ##MODFTP_VERSION_MINOR ##, \
+ ##MODFTP_VERSION_SUBVER
+
+1 VERSIONINFO
+ FILEVERSION MODFTP_REVISION_CSV,200
+ PRODUCTVERSION MODFTP_REVISION_CSV,200
+ 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", ASF_LICENSE "\0"
+ VALUE "CompanyName", "Apache Software Foundation\0"
+ VALUE "FileDescription", "ftp_module for Apache\0"
+ VALUE "FileVersion", MODFTP_REVISION "\0"
+ VALUE "InternalName", "mod_ftp.so\0"
+ VALUE "LegalCopyright", MODFTP_COPYRIGHT "\0"
+ VALUE "OriginalFilename", "mod_ftp.so\0"
+ VALUE "ProductName", "Apache HTTP Server Project\0"
+ VALUE "ProductVersion", MODFTP_REVISION "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
Propchange: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.rc
------------------------------------------------------------------------------
svn:eol-style = native