Author: mturk
Date: Mon Mar 8 06:34:14 2010
New Revision: 920207
URL: http://svn.apache.org/viewvc?rev=920207&view=rev
Log:
Use common windows .rc file and one place for version (jk_version.h)
Added:
tomcat/jk/trunk/native/common/jk.rc
Removed:
tomcat/jk/trunk/native/apache-2.0/mod_jk.rc
tomcat/jk/trunk/native/iis/isapi_redirect.rc
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
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=920207&r1=920206&r2=920207&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Mar 8 06:34:14 2010
@@ -87,7 +87,7 @@
"$(INTDIR)\jk_url.obj" \
"$(INTDIR)\jk_util.obj" \
"$(INTDIR)\jk_worker.obj" \
- "$(INTDIR)\mod_jk.res" \
+ "$(INTDIR)\jk.res" \
"$(INTDIR)\mod_jk.obj"
"$(OUTDIR)\mod_jk.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -131,11 +131,11 @@
<<
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\mod_jk.res" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d BASENAME="mod_jk" /d
"NDEBUG"
-SOURCE=.\mod_jk.rc
+SOURCE=..\common\jk.rc
-"$(INTDIR)\mod_jk.res" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\k.res" : $(SOURCE) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
Added: tomcat/jk/trunk/native/common/jk.rc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=920207&view=auto
==============================================================================
--- tomcat/jk/trunk/native/common/jk.rc (added)
+++ tomcat/jk/trunk/native/common/jk.rc Mon Mar 8 06:34:14 2010
@@ -0,0 +1,76 @@
+/* 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+#include <windows.h>
+#include "jk_version.h"
+
+#define ASF_COPYRIGHT "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."
+
+#define ASF_LICENSE "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."
+
+#define JK_DLL_BASENAME BASENAME "-" JK_VERSTRING
+
+
+1 VERSIONINFO
+ FILEVERSION JK_VERSIONCSV
+ PRODUCTVERSION JK_VERSIONCSV
+ 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", "Apache Tomcat Connector\0"
+ VALUE "FileVersion", JK_VERSTRING "\0"
+ VALUE "InternalName", JK_DLL_BASENAME "\0"
+ VALUE "LegalCopyright", ASF_COPYRIGHT "\0"
+ VALUE "OriginalFilename", JK_DLL_BASENAME ".dll\0"
+ VALUE "ProductName", "Apache Tomcat Connectors project\0"
+ VALUE "ProductVersion", JK_VERSTRING "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
Modified: tomcat/jk/trunk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=920207&r1=920206&r2=920207&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Mon Mar 8 06:34:14 2010
@@ -27,7 +27,6 @@
#define JK_VERMAJOR 1
#define JK_VERMINOR 2
#define JK_VERFIX 31
-#define JK_VERSTRING "1.2.31"
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
#define JK_VERISRELEASE 0
@@ -69,8 +68,25 @@
#endif
#endif
-#define JK_MAKEVERSION(major, minor, fix, beta) (((major) << 24) + ((minor) <<
16) + ((fix) << 8) + (beta))
+#define JK_MAKEVERSION(major, minor, fix, beta) \
+ (((major) << 24) + ((minor) << 16) + ((fix) << 8) + (beta))
#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX,
JK_VERBETA)
+/** Properly quote a value as a string in the C preprocessor */
+#define JK_STRINGIFY(n) JK_STRINGIFY_HELPER(n)
+/** Helper macro for JK_STRINGIFY */
+#define JK_STRINGIFY_HELPER(n) #n
+#define JK_VERSTRING \
+ JK_STRINGIFY(JK_VERMAJOR) "." \
+ JK_STRINGIFY(JK_VERMINOR) "." \
+ JK_STRINGIFY(JK_VERFIX)
+
+/* macro for Win32 .rc files using numeric csv representation */
+#define JK_VERSIONCSV JK_VERMAJOR ##, \
+ ##JK_VERMINOR ##, \
+ ##JK_VERFIX
+
+
#endif /* __JK_VERSION_H */
+
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=920207&r1=920206&r2=920207&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Mon Mar 8 06:34:14 2010
@@ -27,7 +27,7 @@
!ELSE
CLEAN :
!ENDIF
- -...@erase "$(INTDIR)\isapi_redirect.res"
+ -...@erase "$(INTDIR)\jk.res"
-...@erase "$(INTDIR)\isapi_redirector_src.idb"
-...@erase "$(INTDIR)\isapi_redirector_src.pdb"
-...@erase "$(INTDIR)\jk_ajp12_worker.obj"
@@ -93,7 +93,7 @@
"$(INTDIR)\jk_url.obj" \
"$(INTDIR)\jk_util.obj" \
"$(INTDIR)\jk_worker.obj" \
- "$(INTDIR)\isapi_redirect.res" \
+ "$(INTDIR)\jk.res" \
".\pcre\Release_amd64\pcre.lib"
"$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -136,11 +136,11 @@
<<
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\isapi_redirect.res" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\isapi_redirect.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
-SOURCE=.\isapi_redirect.rc
+SOURCE=..\common\jk.rc
-"$(INTDIR)\isapi_redirect.res" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\jk.res" : $(SOURCE) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=920207&r1=920206&r2=920207&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Mon Mar 8 06:34:14 2010
@@ -42,7 +42,7 @@
!ELSE
CLEAN :
!ENDIF
- -...@erase "$(INTDIR)\isapi_redirect.res"
+ -...@erase "$(INTDIR)\jk.res"
-...@erase "$(INTDIR)\isapi_redirector_src.idb"
-...@erase "$(INTDIR)\isapi_redirector_src.pdb"
-...@erase "$(INTDIR)\jk_ajp12_worker.obj"
@@ -108,7 +108,7 @@
"$(INTDIR)\jk_url.obj" \
"$(INTDIR)\jk_util.obj" \
"$(INTDIR)\jk_worker.obj" \
- "$(INTDIR)\isapi_redirect.res" \
+ "$(INTDIR)\jk.res" \
".\pcre\Release_ia64\pcre.lib"
"$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -151,11 +151,11 @@
<<
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\isapi_redirect.res" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
-SOURCE=.\isapi_redirect.rc
+SOURCE=..\common\jk.rc
-"$(INTDIR)\isapi_redirect.res" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\jk.res" : $(SOURCE) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=920207&r1=920206&r2=920207&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Mon Mar 8 06:34:14 2010
@@ -37,7 +37,7 @@
!ELSE
CLEAN :
!ENDIF
- -...@erase "$(INTDIR)\isapi_redirect.res"
+ -...@erase "$(INTDIR)\jk.res"
-...@erase "$(INTDIR)\isapi_redirector_src.idb"
-...@erase "$(INTDIR)\isapi_redirector_src.pdb"
-...@erase "$(INTDIR)\jk_ajp12_worker.obj"
@@ -103,7 +103,7 @@
"$(INTDIR)\jk_url.obj" \
"$(INTDIR)\jk_util.obj" \
"$(INTDIR)\jk_worker.obj" \
- "$(INTDIR)\isapi_redirect.res" \
+ "$(INTDIR)\jk.res" \
".\pcre\Release_x86\pcre.lib"
"$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -146,11 +146,11 @@
<<
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\isapi_redirect.res" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
-SOURCE=.\isapi_redirect.rc
+SOURCE=..\common\jk.rc
-"$(INTDIR)\isapi_redirect.res" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\jk.res" : $(SOURCE) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
