prepare for releasing acl 3.4.2 version!

zsx · zsx · commit 71fc7510a2ed · 2019-03-09T14:12:34.000+08:00
diff --git a/Makefile b/Makefile
@@ -78,7 +78,7 @@ endif
 ##############################################################################
 
 .PHONY = check help all_lib all samples all clean install uninstall uninstall_all build_one
-VERSION = 3.4.1-0
+VERSION = 3.4.2
 
 default: build_one
 help h:
diff --git a/app/master/daemon/version.h b/app/master/daemon/version.h
@@ -14,7 +14,7 @@
 #define __MASTER_VERSION_INCLUDE_H__
 
 #define MASTER_NAME	"acl_master"
-#define MASTER_VERSION	"3.4.1-30"
-#define MASTER_DATE	"20181115"
+#define MASTER_VERSION	"3.4.2-0"
+#define MASTER_DATE	"20190309"
 
 #endif
diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,7 @@
 �޸���ʷ�б���
 ------------------------------------------------------------------------
+113) 2019.3.9 --- acl 3.4.2 �汾������
+
 112) 2019.3.7
 112.1) compile: �� Android Studio 3.3.2 �����б���ͨ��
 
diff --git a/lib_acl/lib_acl.rc b/lib_acl/lib_acl.rc
@@ -52,8 +52,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "����Ϊ��ƽ̨��C�⣬����������ͨѶ����������ܵȹ���"
             VALUE "FileDescription", "acl ��"
-            VALUE "FileVersion", "3.1.3.0"
+            VALUE "FileVersion", "3.4.2.0"
             VALUE "InternalName", "lib_acl"
             VALUE "LegalCopyright", "zsx (C) 2015"
             VALUE "OriginalFilename", "lib_acl.lib"
             VALUE "ProductName", " acl ��"
-            VALUE "ProductVersion", "3, 1, 3, 0"
+            VALUE "ProductVersion", "3, 4, 2, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl/lib_acl_vc2017.rc b/lib_acl/lib_acl_vc2017.rc
@@ -52,8 +52,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "����Ϊ��ƽ̨��C�⣬����������ͨѶ����������ܵȹ���"
             VALUE "FileDescription", "acl ��"
-            VALUE "FileVersion", "3.1.3.0"
+            VALUE "FileVersion", "3.4.2.0"
             VALUE "InternalName", "lib_acl"
             VALUE "LegalCopyright", "zsx (C) 2015"
             VALUE "OriginalFilename", "lib_acl.lib"
             VALUE "ProductName", " acl ��"
-            VALUE "ProductVersion", "3, 1, 3, 0"
+            VALUE "ProductVersion", "3, 4, 2, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl/src/init/acl_init.c b/lib_acl/src/init/acl_init.c
@@ -24,7 +24,7 @@
 
 #include "init.h"
 
-static char *version = "3.4.1-47 20190213";
+static char *version = "3.4.2 20190309";
 
 const char *acl_version(void)
 {
diff --git a/lib_acl_cpp/lib_acl_cpp_vc2003.rc b/lib_acl_cpp/lib_acl_cpp_vc2003.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "zsx"
             VALUE "FileDescription", "acl_cpp ��"
-            VALUE "FileVersion", "3, 1, 3, 0"
+            VALUE "FileVersion", "3, 4, 2, 0"
             VALUE "InternalName", "lib_acl_"
             VALUE "LegalCopyright", "acl_cpp (C) 2015"
             VALUE "OriginalFilename", "lib_acl_cpp.lib"
             VALUE "ProductName", "acl_cpp ��"
-            VALUE "ProductVersion", "3, 1, 3, 0"
+            VALUE "ProductVersion", "3, 4, 2, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl_cpp/lib_acl_cpp_vc2008.rc b/lib_acl_cpp/lib_acl_cpp_vc2008.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "zsx"
             VALUE "FileDescription", "acl_cpp ��"
-            VALUE "FileVersion", "3, 1, 3, 0"
+            VALUE "FileVersion", "3, 4, 2, 0"
             VALUE "InternalName", "lib_acl_cpp"
             VALUE "LegalCopyright", "acl_cpp (C) 2015"
             VALUE "OriginalFilename", "lib_acl_cpp.lib"
             VALUE "ProductName", "acl_cpp ��"
-            VALUE "ProductVersion", "3, 1, 3, 0"
+            VALUE "ProductVersion", "3, 4, 2, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl_cpp/lib_acl_cpp_vc2010.rc b/lib_acl_cpp/lib_acl_cpp_vc2010.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
             VALUE "Comments", "ͨ�õ�C++��"
             VALUE "CompanyName", "zsx"
             VALUE "FileDescription", "lib_acl_cpp ��"
-            VALUE "FileVersion", "3.1.3.0"
+            VALUE "FileVersion", "3.4.2.0"
             VALUE "InternalName", "lib_acl_cpp"
             VALUE "LegalCopyright", "��Ȩ���� (C) 2015"
             VALUE "OriginalFilename", "lib_acl_cpp.lib"
             VALUE "ProductName", " lib_acl_cpp ��"
-            VALUE "ProductVersion", "3.1.3.0"
+            VALUE "ProductVersion", "3.4.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl_cpp/lib_acl_cpp_vc2012.rc b/lib_acl_cpp/lib_acl_cpp_vc2012.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
             VALUE "Comments", "ͨ�õ�C++��"
             VALUE "CompanyName", "zsx"
             VALUE "FileDescription", "lib_acl_cpp ��"
-            VALUE "FileVersion", "3.1.3.0"
+            VALUE "FileVersion", "3.4.2.0"
             VALUE "InternalName", "lib_acl_cpp"
             VALUE "LegalCopyright", "��Ȩ���� (C) 2015"
             VALUE "OriginalFilename", "lib_acl_cpp.lib"
             VALUE "ProductName", " lib_acl_cpp ��"
-            VALUE "ProductVersion", "3.1.3.0"
+            VALUE "ProductVersion", "3.4.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl_cpp/lib_acl_cpp_vc2013.rc b/lib_acl_cpp/lib_acl_cpp_vc2013.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
             VALUE "Comments", "ͨ�õ�C++��"
             VALUE "CompanyName", "zsx"
             VALUE "FileDescription", "lib_acl_cpp ��"
-            VALUE "FileVersion", "3.1.3.0"
+            VALUE "FileVersion", "3.4.2.0"
             VALUE "InternalName", "lib_acl_cpp"
             VALUE "LegalCopyright", "��Ȩ���� (C) 2015"
             VALUE "OriginalFilename", "lib_acl_cpp.lib"
             VALUE "ProductName", " lib_acl_cpp ��"
-            VALUE "ProductVersion", "3.1.3.0"
+            VALUE "ProductVersion", "3.4.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl_cpp/lib_acl_cpp_vc2015.rc b/lib_acl_cpp/lib_acl_cpp_vc2015.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
             VALUE "Comments", "ͨ�õ�C++��"
             VALUE "CompanyName", "zsx"
             VALUE "FileDescription", "lib_acl_cpp ��"
-            VALUE "FileVersion", "3.1.3.0"
+            VALUE "FileVersion", "3.4.2.0"
             VALUE "InternalName", "lib_acl_cpp"
             VALUE "LegalCopyright", "��Ȩ���� (C) 2015"
             VALUE "OriginalFilename", "lib_acl_cpp.lib"
             VALUE "ProductName", " lib_acl_cpp ��"
-            VALUE "ProductVersion", "3.1.3.0"
+            VALUE "ProductVersion", "3.4.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_acl_cpp/lib_acl_cpp_vc2017.rc b/lib_acl_cpp/lib_acl_cpp_vc2017.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
             VALUE "Comments", "ͨ�õ�C++��"
             VALUE "CompanyName", "zsx"
             VALUE "FileDescription", "lib_acl_cpp ��"
-            VALUE "FileVersion", "3.1.3.0"
+            VALUE "FileVersion", "3.4.2.0"
             VALUE "InternalName", "lib_acl_cpp"
             VALUE "LegalCopyright", "��Ȩ���� (C) 2015"
             VALUE "OriginalFilename", "lib_acl_cpp.lib"
             VALUE "ProductName", " lib_acl_cpp ��"
-            VALUE "ProductVersion", "3.1.3.0"
+            VALUE "ProductVersion", "3.4.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_protocol/lib_protocol.rc b/lib_protocol/lib_protocol.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "��Ҫ����HTTPЭ�飬ICMPЭ�飬SMTPЭ���ʵ��"
             VALUE "FileDescription", "protocol"
-            VALUE "FileVersion", "3, 1, 3, 0"
+            VALUE "FileVersion", "3, 4, 2, 0"
             VALUE "InternalName", "lib_prot"
             VALUE "LegalCopyright", "zsx (C) 2015"
             VALUE "OriginalFilename", "lib_protocol.lib"
             VALUE "ProductName", "protocol"
-            VALUE "ProductVersion", "3, 1, 3, 0"
+            VALUE "ProductVersion", "3, 4, 2, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/lib_protocol/lib_protocol_vc2017.rc b/lib_protocol/lib_protocol_vc2017.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,3,0
- PRODUCTVERSION 3,1,3,0
+ FILEVERSION 3,4,2,0
+ PRODUCTVERSION 3,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "��Ҫ����HTTPЭ�飬ICMPЭ�飬SMTPЭ���ʵ��"
             VALUE "FileDescription", "protocol"
-            VALUE "FileVersion", "3, 1, 3, 0"
+            VALUE "FileVersion", "3, 4, 2, 0"
             VALUE "InternalName", "lib_prot"
             VALUE "LegalCopyright", "zsx (C) 2015"
             VALUE "OriginalFilename", "lib_protocol.lib"
             VALUE "ProductName", "protocol"
-            VALUE "ProductVersion", "3, 1, 3, 0"
+            VALUE "ProductVersion", "3, 4, 2, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/packaging/acl-libs.spec b/packaging/acl-libs.spec
@@ -1,8 +1,8 @@
-%define release_id 48
+%define release_id 0
 
 Summary:        The powerful c/c++ library and server framework
 Name:           acl-libs
-Version:        3.4.1
+Version:        3.4.2
 Release:        %{release_id}
 Group:          System/Libs
 License:        IBM
@@ -133,6 +133,9 @@ fi
 
 %changelog
 
+* Sat Mar 09 2019 zhengshuxin@qiyi.com 3.4.2-0-20190309.13
+- release 3.4.2 version.
+
 * Sun Feb 24 2019 zhengshuxin@qiyi.com 3.4.1-48-20190224.22
 - acl_mylog.c: remove thread mutex when writing log to local file or remote UDP server like syslog-ng
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`#include "init.h"`
`26`	`26`
`27`		`-static char *version = "3.4.1-47 20190213";`
	`27`	`+static char *version = "3.4.2 20190309";`
`28`	`28`
`29`	`29`	`const char *acl_version(void)`
`30`	`30`	`{`