Skip to content

Commit ffca294

Browse files
committed
Prepare for release version 2.1.0.
修改: CMakeLists.txt 修改: CPPPPKG 修改: ChangeLog 修改: FILELIST 修改: NEWS.md 修改: README.md 修改: include/cppp/reiconv.hpp.in 修改: lib/iconv.cpp
1 parent e4fff28 commit ffca294

File tree

8 files changed

+21
-14
lines changed

8 files changed

+21
-14
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# If not, see <https://www.gnu.org/licenses/>.
1717

1818
cmake_minimum_required(VERSION 3.12)
19-
project(cppp-reiconv VERSION 2.0.0)
19+
project(cppp-reiconv VERSION 2.1.0)
2020

2121
# Define options
2222
option(ENABLE_EXTRA "Enable extra encodings and features." OFF)

CPPPPKG

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
{
22
"name" : "cppp-reiconv",
3-
"version" : "2.0.0",
3+
"version" : "2.1.0",
44
"list_file_path": "FILELIST",
55
"description": "C++ Plus character set conversion library",
66
"authors": [
77
"The C++ Plus Project",
88
"Bruno Haible",
9-
"ChenPi11",
10-
"Sam Steingold",
11-
"Ben Noordhuis",
12-
"Mike Fulton",
13-
"Daiki Ueno",
14-
"KO Myung-Hun"
9+
"ChenPi11"
1510
],
1611
"webpage": "https://github.com/cppp-project/cppp-reiconv",
1712
"subpackages": {

ChangeLog

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
2023-09-2 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
1+
2023-09-02 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
22

33
Optimize 'iconv_open(int, int)'.
4+
Change version to '2.1.0'.
5+
Update NEWS.md.
6+
Remove some authors because they are only contributors.
7+
Prepare for release version 2.1.0.
48

59
2023-08-29 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
610

FILELIST

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ lib/encodings.def
287287
lib/tds565.h
288288
lib/cp932ext.h
289289
lib/gb12345ext.h
290-
lib/loop_wchar.h
291290
tests/check-stateless.cpp
292291
tests/table-from.hpp
293292
tests/tests.cmake

NEWS.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
New in 2.1.0:
2+
* Add a new function `iconv_t iconv_open(int tocode_cp, int fromcode_cp, bool strict = true);` and codepage definitions.
3+
* Add CTest on Windows support.
4+
* Remove 'iconv_allocation_t';
5+
* Fully remove wchar support.
6+
* Fix some bugs.
7+
* Add header comments NLS support.
8+
* Add Doxygen comments for 'cppp/reiconv.hpp'.
9+
110
New in 2.0.0:
211
* Redist 'GNU LIBICONV' to 'cppp-reiconv'.
312
* Remove iconv program, iconv gettext po, iconv manual.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ cmake --install .
131131

132132
# Install
133133
This library installs:
134-
- a shared library 'libcppp-reiconv.so' or '~.dll' or '~.dylib' ...
135-
- a static library 'libcppp-reiconv.a' or '~.lib' ...
134+
- a shared library 'libcppp-reiconv'.
135+
- a static library 'libcppp-reiconv.static'.
136136
- a header file '<cppp/reiconv.hpp>'.
137137

138138
To use it, simply #include <cppp/reiconv.hpp> and import the lib to use the functions.

include/cppp/reiconv.hpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @file cppp/reiconv.hpp
33
* @author ChenPi11
44
* @brief C++ Plus base definitions
5-
* @version 2.0.1
5+
* @version 2.1.0
66
* @date 2023-7-28
77
* @copyright Copyright (C) 1999-2023 Free Software Foundation, Inc.
88
*/

lib/iconv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ static const unsigned short all_canonical[] = {
530530
};
531531

532532
/* version number: (major<<8) + minor */
533-
int reiconv_version = (2 << 8) + 0;
533+
int reiconv_version = (2 << 8) + 1;
534534

535535
#define tmpbufsize 4096
536536

0 commit comments

Comments
 (0)