Author: wrowe
Date: Tue Sep 14 10:46:00 2010
New Revision: 996830
URL: http://svn.apache.org/viewvc?rev=996830&view=rev
Log:
This change requires JK_ISAPI, JK_NSAPI to be defined, drops JK_DLL_BASENAME
Modified:
tomcat/jk/trunk/native/common/jk.rc
tomcat/jk/trunk/native/common/jk_version.h
Modified: tomcat/jk/trunk/native/common/jk.rc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=996830&r1=996829&r2=996830&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk.rc (original)
+++ tomcat/jk/trunk/native/common/jk.rc Tue Sep 14 10:46:00 2010
@@ -1,76 +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 JK_STRINGIFY(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
-
+/* 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 JK_STRINGIFY(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", PACKAGE "\0"
+ VALUE "LegalCopyright", ASF_COPYRIGHT "\0"
+ VALUE "OriginalFilename", PACKAGE "." JK_DLL_SUFFIX "\0"
+ VALUE "ProductName", "Apache Tomcat " PACKAGE " Connector\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=996830&r1=996829&r2=996830&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Tue Sep 14 10:46:00 2010
@@ -44,10 +44,13 @@
#if !defined(PACKAGE)
#if defined(JK_ISAPI)
#define PACKAGE "isapi_redirector"
+#define JK_DLL_SUFFIX "dll"
#elif defined(JK_NSAPI)
#define PACKAGE "nsapi_redirector"
+#define JK_DLL_SUFFIX "dll"
#else
#define PACKAGE "mod_jk"
+#define JK_DLL_SUFFIX "so"
#endif
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
