Skip to content

Commit

Permalink
prepare for releasing acl 3.4.2 version!
Browse files Browse the repository at this point in the history
  • Loading branch information
zsx committed Mar 9, 2019
1 parent 59ea283 commit 71fc751
Show file tree
Hide file tree
Showing 16 changed files with 55 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions app/master/daemon/version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions changes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
�޸���ʷ�б���
------------------------------------------------------------------------
113) 2019.3.9 --- acl 3.4.2 �汾������

112) 2019.3.7
112.1) compile: �� Android Studio 3.3.2 �����б���ͨ��

Expand Down
8 changes: 4 additions & 4 deletions lib_acl/lib_acl.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_acl/lib_acl_vc2017.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib_acl/src/init/acl_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions lib_acl_cpp/lib_acl_cpp_vc2003.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_acl_cpp/lib_acl_cpp_vc2008.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_acl_cpp/lib_acl_cpp_vc2010.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_acl_cpp/lib_acl_cpp_vc2012.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_acl_cpp/lib_acl_cpp_vc2013.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_acl_cpp/lib_acl_cpp_vc2015.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_acl_cpp/lib_acl_cpp_vc2017.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_protocol/lib_protocol.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib_protocol/lib_protocol_vc2017.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
7 changes: 5 additions & 2 deletions packaging/acl-libs.spec
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 71fc751

Please sign in to comment.