Merge pull request #4 from cppp-project/dev

[Pull Request] Prepare for release v2.1.0.

Author: ChenPi11

.github/workflows/build.yml

@@ -127,13 +127,13 @@ jobs:
         export C_COMPILER="gcc"
         export CXX_COMPILER="g++"
         export LINKER="ld"
-        export CC="/usr/bin/${{ matrix.arch }}-$C_COMPILER"
-        export CXX="/usr/bin/${{ matrix.arch }}-$CXX_COMPILER"
+        export CC_CROSS="/usr/bin/${{ matrix.arch }}-$C_COMPILER"
+        export CXX_CROSS="/usr/bin/${{ matrix.arch }}-$CXX_COMPILER"
         export LD="/usr/bin/${{ matrix.arch }}-$LINKER"
 
         mkdir build
         cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }} -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_LINKER=$LD
+        cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }} -DCMAKE_C_COMPILER=$CC_CROSS -DCMAKE_CXX_COMPILER=$CXX_CROSS -DCMAKE_LINKER=$LD
         cmake --build . --config=Release
         cmake --install .
         cd ..
@@ -175,6 +175,10 @@ jobs:
     steps:
 
     #--------------------------------------------collect--------------------------------------------
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+
     - name: 🏷️ Get infomations
       run: |
         tag="${GITHUB_REF#refs/tags/}"
@@ -200,12 +204,12 @@ jobs:
     
     - name: 🛠️ Build binary distribution
       run: |
-        export CC="clang"
-        export CXX="clang++"
+        export CC_CROSS="clang"
+        export CXX_CROSS="clang++"
 
         mkdir build
         cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -arch ${{ matrix.arch }}" -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -arch ${{ matrix.arch }}"
+        cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.srcdir }}/${{ env.pkgname }}-${{ matrix.arch }}-darwin-apple -DCMAKE_C_COMPILER=$CC_CROSS -DCMAKE_CXX_COMPILER=$CXX_CROSS -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -arch ${{ matrix.arch }}" -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -arch ${{ matrix.arch }}"
         cmake --build . --config=Release
         cmake --install .
         cd ..

.github/workflows/test.yml

@@ -15,6 +15,9 @@ jobs:
     steps:
     #--------------------------------------------collect--------------------------------------------
     - uses: actions/checkout@v3
+
+    - name: 🧰 Setup Python
+      uses: actions/setup-python@v4
 
     - name: 📁 Collect dependencies
       run: |
@@ -31,16 +34,16 @@ jobs:
         mkdir -p build
         cd build
         cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
-        cmake --build .
+        cmake --build . --config=Release
         cd ..
     
     #--------------------------------------------test--------------------------------------------
     - name: ✔️ Test
       run : |
         cd build
-        ctest --verbose
+        ctest --verbose -C Release
         cd ..
-    
+  
   test-macos:
 
     runs-on: macos-latest
@@ -63,12 +66,12 @@ jobs:
         mkdir build
         cd build
         cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
-        cmake --build .
+        cmake --build . --config=Release
         cd ..
     
     #--------------------------------------------test--------------------------------------------
     - name: ✔️ Test
       run : |
         cd build
-        ctest --verbose
+        ctest --verbose -C Release
         cd ..

.gitignore

@@ -23,6 +23,23 @@ Testing
 *.log
 *.dSYM
 
+# Makefile.devel temp files
+lib/generated/genaliases
+lib/generated/genaliases_sysaix
+lib/generated/genaliases_syshpux
+lib/generated/genaliases_sysosf1
+lib/generated/genaliases_syssolaris
+lib/generated/genaliases2_aix
+lib/generated/genaliases2_aix_sysaix
+lib/generated/genaliases2_dos
+lib/generated/genaliases2_extra
+lib/generated/genaliases2_osf1
+lib/generated/genaliases2_osf1_sysosf1
+lib/generated/genaliases2_zos
+lib/generated/genflags
+/*/**/*.gperf
+
+
 # Test suite runable
 tests/cmp
 tests/cmp.exe

CMakeLists.txt

@@ -22,7 +22,7 @@ project(cppp-reiconv VERSION 2.1.0)
 option(ENABLE_EXTRA "Enable extra encodings and features." OFF)
 
 # Set C++ standard
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 # ----------------------------------------------------------------------------------
 # Import build-aux subdirectory.

ChangeLog

@@ -1,3 +1,27 @@
+2023-10-03  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Update C++ standard of the project.
+	Remove unused canonical files and codes.
+	Move 'lib/gen*.c' to 'tools/gen*.cpp'.
+	Optimize 'Makefile.devel'.
+	Move generated files to C++ to avoid 'register' warnings.
+	Add test and clean target in 'Makefile.devel'.
+	Update 'FILELIST'.
+	Update GitHub Action for build and test.
+	Prepare for release version 2.1.0.
+
+2023-09-09  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
+
+	Version 2.1.0 compile failed (release failed).
+	Update doccomments in reiconv.hpp.in.
+	Add function 'int iconv_string(const iconv_t& cd, const char *start, const char *end, char **resultp, size_t *lengthp)'
+	Add function 'int iconv_string(int tocode_cp, int fromcode_cp, const char* start, const char* end, char** resultp, size_t* lengthp, bool strict=true)'
+	Update function 'encode' definion.
+	Fix some warnings in Clang.
+	Change the 'autodetect' feature of 'iconv_string' to a non extra feature.
+	Update language maps.
+	Fix compile error in MinGW GNU GCC.
+
 2023-09-02  ChenPi11  <wushengwuxi-msctinoulk@outlook.com>
 
 	Optimize 'iconv_open(int, int)'.

FILELIST

@@ -90,15 +90,13 @@ lib/tcvn.h
 lib/ebcdic1123.h
 lib/ebcdic1158.h
 lib/ucs2be.h
-lib/genaliases2.c
 lib/ebcdic425.h
 lib/cp1253.h
 lib/iconv_open1.h
 lib/ces_big5.h
 lib/cp857.h
 lib/cp949.h
 lib/ebcdic1137.h
-lib/genflags.c
 lib/iso8859_10.h
 lib/gb2312.h
 lib/cp936.h
@@ -121,41 +119,19 @@ lib/euc_jp.h
 lib/hkscs2008.h
 lib/mac_centraleurope.h
 lib/cp1129.h
-lib/generated/canonical.h
-lib/generated/canonical_syssolaris.h
 lib/generated/flags.h
 lib/generated/aliases_sysosf1.h
-lib/generated/canonical_sysaix.h
 lib/generated/aliases_osf1_sysosf1.h
-lib/generated/canonical_extra.h
 lib/generated/aliases_aix_sysaix.h
-lib/generated/canonical_osf1.h
 lib/generated/aliases.h
-lib/generated/aliases.gperf
-lib/generated/canonical_osf1_sysosf1.h
 lib/generated/aliases_syssolaris.h
-lib/generated/aliases_sysosf1.gperf
-lib/generated/canonical_sysosf1.h
-lib/generated/aliases_syssolaris.gperf
-lib/generated/aliases_syshpux.gperf
 lib/generated/aliases_extra.h
-lib/generated/canonical_local_syshpux.h
-lib/generated/canonical_local_sysosf1.h
-lib/generated/canonical_local_sysaix.h
 lib/generated/aliases_aix.h
-lib/generated/canonical_dos.h
-lib/generated/canonical_local.h
 lib/generated/aliases_sysaix.h
-lib/generated/aliases_sysaix.gperf
 lib/generated/aliases_syshpux.h
 lib/generated/aliases_zos.h
-lib/generated/canonical_syshpux.h
-lib/generated/canonical_zos.h
 lib/generated/aliases_dos.h
-lib/generated/canonical_aix.h
-lib/generated/canonical_local_syssolaris.h
 lib/generated/aliases_osf1.h
-lib/generated/canonical_aix_sysaix.h
 lib/ebcdic12712.h
 lib/uhc_2.h
 lib/iso8859_1.h
@@ -180,7 +156,6 @@ lib/ebcdic1122.h
 lib/isoir165.h
 lib/cp864.h
 lib/iso8859_15.h
-lib/genaliases.c
 lib/mac_turkish.h
 lib/ebcdic424.h
 lib/uhc_1.h
@@ -545,6 +520,9 @@ tests/throw_error.hpp
 tests/file_utils.hpp
 tests/sort.cpp
 tests/sort.hpp
+tools/genaliases.cpp
+tools/genaliases2.cpp
+tools/genflags.cpp
 COPYING
 Makefile.devel
 include/cppp/reiconv.hpp.in