Author: timw
Date: Sun Mar 7 20:17:04 2010
New Revision: 920086
URL: http://svn.apache.org/viewvc?rev=920086&view=rev
Log:
Adding version resource for mod_jk.so on Windows.
Partial fix for #43303
Added:
tomcat/jk/trunk/native/apache-2.0/mod_jk.rc
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=920086&r1=920085&r2=920086&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Sun Mar 7 20:17:04 2010
@@ -26,6 +26,7 @@
CLEAN :
+ -...@erase "$(INTDIR)\mod_jk.res"
-...@erase "$(INTDIR)\jk_ajp12_worker.obj"
-...@erase "$(INTDIR)\jk_ajp13.obj"
-...@erase "$(INTDIR)\jk_ajp13_worker.obj"
@@ -86,6 +87,7 @@
"$(INTDIR)\jk_url.obj" \
"$(INTDIR)\jk_util.obj" \
"$(INTDIR)\jk_worker.obj" \
+ "$(INTDIR)\mod_jk.res" \
"$(INTDIR)\mod_jk.obj"
"$(OUTDIR)\mod_jk.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -125,7 +127,14 @@
$(CPP_PROJ) $<
<<
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x809 /fo"$(INTDIR)\mod_jk.res" /d "NDEBUG"
+
+SOURCE=.\mod_jk.rc
+
+"$(INTDIR)\mod_jk.res" : $(SOURCE) "$(INTDIR)"
+ $(RSC) $(RSC_PROJ) $(SOURCE)
+
SOURCE=..\common\jk_ajp12_worker.c
Added: tomcat/jk/trunk/native/apache-2.0/mod_jk.rc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.rc?rev=920086&view=auto
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.rc (added)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.rc Sun Mar 7 20:17:04 2010
@@ -0,0 +1,97 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (New Zealand) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENZ)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION 1,2,31,0
+ PRODUCTVERSION 1,2,31,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "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\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."
+ VALUE "CompanyName", "Apache Software Foundation"
+ VALUE "FileDescription", "Apache Tomcat Connector for Apache 2.x"
+ VALUE "FileVersion", "1.2.31"
+ VALUE "InternalName", "mod_jk-1.2.31"
+ VALUE "LegalCopyright", "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."
+ VALUE "OriginalFilename", "mod_jk-1.2.31.so"
+ VALUE "ProductName", "Apache Tomcat Connectors project"
+ VALUE "ProductVersion", "1.2.31"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // English (New Zealand) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
