This is an automated email from the ASF dual-hosted git repository.
mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 0ff7479 Drop all that beta,rc,release bloatware from jk_version.h. We
use git, and release should be as simple as clicking on the webpage
0ff7479 is described below
commit 0ff7479904e1a5447736b020a267b897ff826e1f
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Sat Jun 13 19:07:26 2020 +0200
Drop all that beta,rc,release bloatware from jk_version.h. We use git, and
release should be as simple as clicking on the webpage
---
native/apache-2.0/Makefile.vc | 2 +-
native/common/jk.rc | 35 +++++++++++++----------------
native/common/jk_version.h | 52 ++++++++++++-------------------------------
native/iis/Makefile.vc | 2 +-
4 files changed, 31 insertions(+), 60 deletions(-)
diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 13d6980..e3d5bbe 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -105,7 +105,7 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
$(BUILDRES): ..\common\jk.rc
- $(RC) /l 0x409 /i ..\common /d NDEBUG /fo $(BUILDRES) $@
+ $(RC) /l 0x409 /n /i ..\common /d NDEBUG /fo $(BUILDRES) ..\common\jk.rc
$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LDLIBS) /out:$(BUILDBIN)
/pdb:$(BUILDPDB)
diff --git a/native/common/jk.rc b/native/common/jk.rc
index e0eae36..a51a385 100644
--- a/native/common/jk.rc
+++ b/native/common/jk.rc
@@ -39,31 +39,27 @@
1 VERSIONINFO
- FILEVERSION JK_VERSIONCSV
- PRODUCTVERSION JK_VERSIONCSV
- FILEFLAGSMASK 0x3fL
-#if defined(_DEBUG)
- FILEFLAGS 0x01L
-#else
- FILEFLAGS 0x00L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
+ FILEVERSION JK_VERSIONCSV,0
+ PRODUCTVERSION JK_VERSIONCSV,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
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"
+ VALUE "Comments", ASF_LICENSE
+ VALUE "CompanyName", "Apache Software Foundation"
+ VALUE "FileDescription", "Apache Tomcat Connector"
+ VALUE "FileVersion", JK_VERSTRING
+ VALUE "InternalName", JK_DISTNAME
+ VALUE "LegalCopyright", ASF_COPYRIGHT
+ VALUE "OriginalFilename", JK_DISTNAME "." JK_DLL_SUFFIX
+ VALUE "ProductName", "Apache Tomcat " JK_DISTNAME " Connector"
+ VALUE "ProductVersion", JK_EXPOSED_VERSION
END
END
BLOCK "VarFileInfo"
@@ -71,4 +67,3 @@ BEGIN
VALUE "Translation", 0x409, 1200
END
END
-
diff --git a/native/common/jk_version.h b/native/common/jk_version.h
index 8ac54cd..a4d06f0 100644
--- a/native/common/jk_version.h
+++ b/native/common/jk_version.h
@@ -22,57 +22,34 @@
#ifndef __JK_VERSION_H
#define __JK_VERSION_H
-/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
#define JK_VERMAJOR 1
#define JK_VERMINOR 2
-#define JK_VERFIX 49
+#define JK_VERMICRO 49
-/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
-/* Beta number */
-#define JK_VERBETA 0
-#define JK_BETASTRING "0"
-/* Release candidate */
-#define JK_VERRC 0
-#define JK_RCSTRING "0"
-
-/************** END OF AREA TO MODIFY BEFORE RELEASING *************/
-
-#if !defined(PACKAGE)
#if defined(JK_ISAPI)
-#define PACKAGE "isapi_redirector"
+#define JK_DISTNAME "isapi_redirector"
#define JK_DLL_SUFFIX "dll"
#elif defined(JK_NSAPI)
-#define PACKAGE "nsapi_redirector"
+#define JK_DISTNAME "nsapi_redirector"
#define JK_DLL_SUFFIX "dll"
#else
-#define PACKAGE "mod_jk"
+#define JK_DISTNAME "mod_jk"
#define JK_DLL_SUFFIX "so"
#endif
-#endif
/* Build JK_EXPOSED_VERSION and JK_VERSION */
-#define JK_EXPOSED_VERSION_INT PACKAGE "/" JK_VERSTRING
+#define JK_EXPOSED_VERSION JK_DISTNAME "/" JK_VERSTRING
-#if (JK_VERBETA != 0)
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
-#else
-#undef JK_VERBETA
-#define JK_VERBETA 255
-#if (JK_VERRC != 0)
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-rc-" JK_RCSTRING
-#elif (JK_VERISRELEASE == 1)
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
-#else
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-dev"
-#endif
+#if !defined(JK_VERSUFIX)
+#define JK_VERSUFIX ""
#endif
-#define JK_FULL_EXPOSED_VERSION JK_EXPOSED_VERSION
-#define JK_MAKEVERSION(major, minor, fix, beta) \
- (((major) << 24) + ((minor) << 16) + ((fix) << 8) + (beta))
+#define JK_FULL_EXPOSED_VERSION JK_EXPOSED_VERSION JK_VERSUFIX
-#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERFIX,
JK_VERBETA)
+#define JK_MAKEVERSION(major, minor, fix) \
+ (((major) << 24) + ((minor) << 16) + ((fix) << 8))
+
+#define JK_VERSION JK_MAKEVERSION(JK_VERMAJOR, JK_VERMINOR, JK_VERMICRO)
/** Properly quote a value as a string in the C preprocessor */
#define JK_STRINGIFY(n) JK_STRINGIFY_HELPER(n)
@@ -81,13 +58,12 @@
#define JK_VERSTRING \
JK_STRINGIFY(JK_VERMAJOR) "." \
JK_STRINGIFY(JK_VERMINOR) "." \
- JK_STRINGIFY(JK_VERFIX)
+ JK_STRINGIFY(JK_VERMICRO)
/* macro for Win32 .rc files using numeric csv representation */
#define JK_VERSIONCSV JK_VERMAJOR ##, \
##JK_VERMINOR ##, \
- ##JK_VERFIX
+ ##JK_VERMICRO
#endif /* __JK_VERSION_H */
-
diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index c745481..21c7f87 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -86,7 +86,7 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
$(BUILDRES): ..\common\jk.rc
- $(RC)/l 0x409 /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES) $@
+ $(RC) /l 0x409 /n /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES)
..\common\jk.rc
$(PCRELIB):
@cd .\pcre
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
