Merge branch 'master' into tintou/csv-malformed

Author: winterz

.github/workflows/build.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Configure project
         run: |
           mkdir build
-          cmake -B build --warn-uninitialized -Werror=dev -G Ninja -DLIBICAL_DEVMODE_MEMORY_CONSISTENCY=False -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DLIBICAL_DEVMODE=True -DLIBICAL_GLIB_BUILD_DOCS=True -DLIBICAL_GLIB=True -DGOBJECT_INTROSPECTION=True -DLIBICAL_GLIB_VAPI=True -DLIBICAL_BUILD_TESTING_BIGFUZZ=True
+          cmake -B build --warn-uninitialized -Werror=dev -G Ninja -DLIBICAL_DEVMODE_MEMORY_CONSISTENCY=False -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DLIBICAL_DEVMODE=True -DLIBICAL_GLIB_BUILD_DOCS=True -DLIBICAL_GLIB=True -DGOBJECT_INTROSPECTION=True -DLIBICAL_GLIB_VAPI=True -DLIBICAL_GLIB_CHECK_API_FILES=True -DLIBICAL_BUILD_TESTING_BIGFUZZ=True
       - name: Build project
         run: cmake --build build
       - name: Test project

CMakeLists.txt

@@ -40,10 +40,6 @@
 #  Default=false (build shared and static libs)
 #  Takes precedence over STATIC_ONLY
 #
-# -DENABLE_LTO_BUILD=[true|false]
-#  Build a link-time optimized version (requires gcc or clang)
-#  Default=false (do not build a link time optimized version)
-#
 # -DGOBJECT_INTROSPECTION=[true|false]
 #  Set to build GObject introspection "typelib" files
 #  Requires GObject Introspection development package (version MIN_GOBJECT_INTROSPECTION)
@@ -69,6 +65,11 @@
 #  Requires gi-docgen, GOBJECT_INTROSPECTION and LIBICAL_BUILD_DOCS options to be true.
 #  Default=true (build libical-glib developer documentation)
 #
+# -DLIBICAL_GLIB_CHECK_API_FILES=[true|false]
+#  Set to check whether API files for the libical-glib contain all symbols exported
+#  in the corresponding header files; requires ICAL_GLIB to be set to True
+#  Default=false (always true if LIBICAL_DEVMODE is on)
+#
 # -DLIBICAL_ENABLE_MSVC_32BIT_TIME_T=[true|false]
 #  Set to build using a 32bit time_t (ignored unless building with MSVC on Windows)
 #  Default=false (use the default size of time_t)
@@ -133,9 +134,9 @@
 #  Build with the undefined sanitizer (requires gcc or clang)
 #  Default=false
 #
-# -DLIBICAL_SYNCMODE_THREADLOCAL=[true|false]
-#  Experimental: If set to true, global variables are marked as thread-local. This allows accessing
-#  libical from multiple threads without the need for synchronization. However, any global settings
+# -DLIBICAL_DEVMODE_SYNCMODE_THREADLOCAL=[true|false]
+#  If set to true, global variables are marked as thread-local. This allows accessing libical
+#  from multiple threads without the need for synchronization. However, any global settings
 #  must be applied per thread. Note that in this mode, any global variables and cached data are
 #  allocated per thread, including the cache for the built-in timezone data. This can lead to a
 #  significant overhead in memory usage and initialization time. It's therefore recommended to limit
@@ -748,6 +749,11 @@ if(LIBICAL_GLIB)
     )
   endif()
 endif()
+libical_option(LIBICAL_GLIB_CHECK_API_FILES "Check libical-glib API files for completeness." False)
+# Always check the API files in developer-mode (when libical-glib is enabled)
+if(LIBICAL_DEVMODE)
+  set(LIBICAL_GLIB_CHECK_API_FILES True)
+endif()
 # LIBICAL_GLIB_BUILD_DOCS might be disabled later by some devmode options
 libical_deprecated_option(ICAL_GLIB_BUILD_DOCS LIBICAL_GLIB_BUILD_DOCS "Build libical-glib documentation" True)
 
@@ -971,32 +977,24 @@ if(LIBICAL_DEVMODE_UNDEFINED_SANITIZER)
   endif()
 endif()
 
-mark_as_advanced(LIBICAL_SYNCMODE_THREADLOCAL)
-libical_option(LIBICAL_SYNCMODE_THREADLOCAL "Experimental: Mark global variables as thread-local." False)
+mark_as_advanced(LIBICAL_DEVMODE_SYNCMODE_THREADLOCAL)
+libical_deprecated_option(
+  LIBICAL_SYNCMODE_THREADLOCAL
+  LIBICAL_DEVMODE_SYNCMODE_THREADLOCAL
+  "Mark global variables as thread-local."
+  False
+)
 
-libical_option(ENABLE_LTO_BUILD "Build a link-time optimized version." False)
-if(ENABLE_LTO_BUILD)
-  if(CMAKE_C_COMPILER_IS_GCC)
-    libical_add_cflag(-flto LTO)
-    if(C_SUPPORTS_LTO)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlto-type-mismatch -fuse-linker-plugin")
-      set(CMAKE_AR "gcc-ar")
-      set(CMAKE_RANLIB "gcc-ranlib")
-    else()
-      message(FATAL_ERROR "Your C compiler ${CMAKE_C_COMPILER_ID} does not support the LTO building.")
-    endif()
-    if(LIBICAL_CXX_BINDINGS AND CMAKE_CXX_COMPILER_IS_GCC)
-      include(CheckCXXCompilerFlag)
-      libical_add_cxxflag(-flto LTO)
-      if(CXX_SUPPORTS_LTO)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wlto-type-mismatch -fuse-linker-plugin")
-      else()
-        message(FATAL_ERROR "Your C++ compiler ${CMAKE_CXX_COMPILER_ID} does not support LTO building.")
-      endif()
-    endif()
-  else()
-    message(FATAL_ERROR "Build link-time optimization using a non-GCC compiler is currently not supported.")
-  endif()
+libical_deprecated_option(
+  ENABLE_LTO_BUILD
+  CMAKE_INTERPROCEDURAL_OPTIMIZATION
+  "Build a link-time optimized version."
+  False
+)
+if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
+  include(CheckIPOSupported)
+  # A fatal error is issued if IPO not supported by the compiler
+  check_ipo_supported()
 endif()
 
 libical_option(LIBICAL_BUILD_TESTING "Build tests." False)

config.h.cmake

@@ -615,13 +615,13 @@ typedef ssize_t IO_SSIZE_T;
 #define ICALMEMORY_DEFAULT_FREE free
 
 
-#cmakedefine LIBICAL_SYNCMODE_THREADLOCAL 1
+#cmakedefine LIBICAL_DEVMODE_SYNCMODE_THREADLOCAL 1
 
 #define ICAL_SYNC_MODE_NONE 1
 #define ICAL_SYNC_MODE_PTHREAD 2
 #define ICAL_SYNC_MODE_THREADLOCAL 3
 
-#ifdef LIBICAL_SYNCMODE_THREADLOCAL
+#ifdef LIBICAL_DEVMODE_SYNCMODE_THREADLOCAL
 #define ICAL_SYNC_MODE ICAL_SYNC_MODE_THREADLOCAL
 #elif HAVE_PTHREAD == 1
 #define ICAL_SYNC_MODE ICAL_SYNC_MODE_PTHREAD

docs/MigrationGuide_to_4.md

@@ -10,23 +10,25 @@ Please change your build scripts to use the new names before the next major rele
 
 User-specific:
 
-| Old Name             | New Name                            |
-|----------------------|-------------------------------------|
-| ICAL_BUILD_DOCS      | LIBICAL_BUILD_DOCS                  |
-| ICAL_GLIB            | LIBICAL_GLIB                        |
-| ICAL_GLIB_VAPI       | LIBICAL_GLIB_VAPI                   |
-| ICAL_GLIB_BUILD_DOCS | LIBICAL_GLIB_BUILD_DOCS             |
-| USE_32BIT_TIME_T     | LIBICAL_ENABLE_MSVC_32BIT_TIME_T    |
-| WITH_CXX_BINDINGS    | LIBICAL_CXX_BINDINGS                |
+| Old Name                     | New Name                             |
+|------------------------------|--------------------------------------|
+| ICAL_BUILD_DOCS              | LIBICAL_BUILD_DOCS                   |
+| ICAL_GLIB                    | LIBICAL_GLIB                         |
+| ICAL_GLIB_VAPI               | LIBICAL_GLIB_VAPI                    |
+| ICAL_GLIB_BUILD_DOCS         | LIBICAL_GLIB_BUILD_DOCS              |
+| USE_32BIT_TIME_T             | LIBICAL_ENABLE_MSVC_32BIT_TIME_T     |
+| WITH_CXX_BINDINGS            | LIBICAL_CXX_BINDINGS                 |
+| ENABLE_LTO_BUILD             | CMAKE_INTERPROCEDURAL_OPTIMIZATION   |
 
 Developer-specific:
 
-| Old Name             | New Name                            |
-|----------------------|-------------------------------------|
-| ABI_DUMPER           | LIBICAL_DEVMODE_ABI_DUMPER          |
-| ADDRESS_SANITIZER    | LIBICAL_DEVMODE_ADDRESS_SANITIZER   |
-| THREAD_SANITIZER     | LIBICAL_DEVMODE_THREAD_SANITIZER    |
-| UNDEFINED_SANITIZER  | LIBICAL_DEVMODE_UNDEFINED_SANITIZER |
+| Old Name                     | New Name                             |
+|------------------------------|--------------------------------------|
+| ABI_DUMPER                   | LIBICAL_DEVMODE_ABI_DUMPER           |
+| ADDRESS_SANITIZER            | LIBICAL_DEVMODE_ADDRESS_SANITIZER    |
+| LIBICAL_SYNCMODE_THREADLOCAL | LIBICAL_DEVMODE_SYNCMODE_THREADLOCAL |
+| THREAD_SANITIZER             | LIBICAL_DEVMODE_THREAD_SANITIZER     |
+| UNDEFINED_SANITIZER          | LIBICAL_DEVMODE_UNDEFINED_SANITIZER  |
 
 ## Conditional compilation
 
@@ -144,6 +146,36 @@ The following functions have been added:
   * `icaltzutil_fetch_timezone()`
   * `icalrecurrencetype_clear()`
 
+### Removed macros
+
+These convenience macros were added in version 3 to ease porting from older versions.
+They have been removed in version 4 and should be replaced with their actual function
+names as follows:
+
+| Old Macro Name                       | Actual Function Name                   |
+|--------------------------------------|----------------------------------------|
+| icalenum_action_to_string            | icalproperty_action_to_string          |
+| icalenum_class_to_string             | icalproperty_class_to_string           |
+| icalenum_component_kind_to_string    | icalcomponent_kind_to_string           |
+| icalenum_method_to_string            | icalproperty_method_to_string          |
+| icalenum_participanttype_to_string   | icalproperty_participanttype_to_string |
+| icalenum_property_kind_to_string     | icalproperty_kind_to_string            |
+| icalenum_property_kind_to_value_kind | icalproperty_kind_to_value_kind        |
+| icalenum_resourcetype_to_string      | icalproperty_resourcetype_to_string    |
+| icalenum_status_to_string            | icalproperty_status_to_string          |
+| icalenum_string_to_action            | icalproperty_string_to_action          |
+| icalenum_string_to_class             | icalproperty_string_to_class           |
+| icalenum_string_to_component_kind    | icalcomponent_string_to_kind           |
+| icalenum_string_to_method            | icalproperty_string_to_method          |
+| icalenum_string_to_participanttype   | icalproperty_string_to_participanttype |
+| icalenum_string_to_property_kind     | icalproperty_string_to_kind            |
+| icalenum_string_to_resourcetype      | icalproperty_string_to_resourcetype    |
+| icalenum_string_to_status            | icalproperty_string_to_status          |
+| icalenum_string_to_transp            | icalproperty_string_to_transp          |
+| icalenum_string_to_value_kind        | icalvalue_string_to_kind               |
+| icalenum_transp_to_string            | icalproperty_transp_to_string          |
+| icalenum_value_kind_to_string        | icalvalue_kind_to_string               |
+
 ### Added data types
 
 * These data types have been added:

scripts/buildtests.sh

@@ -192,7 +192,7 @@ CONFIGURE() {
   mkdir "$BDIR"
   cd "$BDIR" || exit 1
   # shellcheck disable=SC2086
-  cmake --warn-uninitialized -Werror=dev .. $2 2>&1 | tee cmake.out || exit 1
+  cmake .. $2 2>&1 | tee cmake.out || exit 1
   declare -i numWarnings
   declare -i numDeprecates
   set +e
@@ -419,7 +419,7 @@ THREADLOCAL_BUILD() {
   fi
   echo "===== START THREADLOCAL BUILD: $1 ======"
   SET_GCC
-  BUILD "$name" "-DLIBICAL_SYNCMODE_THREADLOCAL=True $2"
+  BUILD "$name" "-DLIBICAL_DEVMODE_SYNCMODE_THREADLOCAL=True $2"
   echo "===== END THREADLOCAL BUILD: $1 ======"
 }
 
@@ -856,13 +856,14 @@ fi
 #use non-Ninja cmake generator by-default
 UNSET_NINJA
 
+STRICT="--warn-uninitialized -Werror=dev"
 DEFCMAKEOPTS="-DCMAKE_BUILD_TYPE=Release -DNDEBUG=1"
-CMAKEOPTS="-DLIBICAL_DEVMODE=True -DGOBJECT_INTROSPECTION=False -DLIBICAL_GLIB=False -DLIBICAL_BUILD_DOCS=False"
+CMAKEOPTS="$STRICT -DLIBICAL_DEVMODE=True -DGOBJECT_INTROSPECTION=False -DLIBICAL_GLIB=False -DLIBICAL_BUILD_DOCS=False"
 UUCCMAKEOPTS="$CMAKEOPTS -DCMAKE_DISABLE_FIND_PACKAGE_ICU=True"
 TZCMAKEOPTS="$CMAKEOPTS -DUSE_BUILTIN_TZDATA=True"
-LTOCMAKEOPTS="$CMAKEOPTS -DENABLE_LTO_BUILD=True"
-GLIBOPTS="-DLIBICAL_DEVMODE=True -DLIBICAL_GLIB=True -DGOBJECT_INTROSPECTION=True -DUSE_BUILTIN_TZDATA=OFF -DLIBICAL_GLIB_VAPI=ON"
-FUZZOPTS="-DLIBICAL_DEVMODE=True -DLIBICAL_BUILD_TESTING_BIGFUZZ=True"
+LTOCMAKEOPTS="$CMAKEOPTS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True"
+GLIBOPTS="$STRICT -DLIBICAL_DEVMODE=True -DLIBICAL_GLIB=True -DGOBJECT_INTROSPECTION=True -DUSE_BUILTIN_TZDATA=OFF -DLIBICAL_GLIB_VAPI=ON"
+FUZZOPTS="$STRICT -DLIBICAL_DEVMODE=True -DLIBICAL_BUILD_TESTING_BIGFUZZ=True"
 
 #Static code checkers
 STATICCCHECKOPTS="\
@@ -889,15 +890,13 @@ CPPCHECK test "$STATICCCHECKOPTS"
 GCC_BUILD testgcc1 "$DEFCMAKEOPTS"
 GCC_BUILD testgcc2 "$CMAKEOPTS"
 GCC_BUILD testgcc3 "$UUCCMAKEOPTS"
-if (test "$(uname -s)" = "Linux"); then
-  GCC_BUILD testgcc4lto "$LTOCMAKEOPTS"
-fi
+GCC_BUILD testgcc4lto "$LTOCMAKEOPTS"
 GCC_BUILD testgcc4glib "$GLIBOPTS"
 GCC_BUILD testgccnocxx "$CMAKEOPTS -DLIBICAL_CXX_BINDINGS=off -DLIBICAL_JAVA_BINDINGS=off"
 if (test "$(uname -s)" = "Linux"); then
-  echo "Temporarily disable cross-compile tests"
-#  GCC_BUILD testgcc1cross "-DCMAKE_TOOLCHAIN_FILE=$TOP/cmake/Toolchain-Linux-GCC-i686.cmake"
-#  GCC_BUILD testgcc2cross "-DCMAKE_TOOLCHAIN_FILE=$TOP/cmake/Toolchain-Linux-GCC-i686.cmake $CMAKEOPTS"
+  # Fedora: dnf install libstdc++-*.i686 glibc-*.i686 libgcc.i686 libdb-devel.i686
+  CMAKEOPTS_NONSTRICT="-DLIBICAL_DEVMODE=True -DGOBJECT_INTROSPECTION=False -DLIBICAL_GLIB=False -DLIBICAL_BUILD_DOCS=False"
+  GCC_BUILD testgcc1cross "-DCMAKE_TOOLCHAIN_FILE=$TOP/cmake/Toolchain-Linux-GCC-i686.cmake $CMAKEOPTS_NONSTRICT -DLIBICAL_JAVA_BINDINGS=False"
 fi
 GCC_BUILD testgcc1builtin "-DUSE_BUILTIN_TZDATA=True"
 GCC_BUILD testgcc2builtin "$TZCMAKEOPTS"
@@ -914,12 +913,12 @@ NINJA_GCC_BUILD testninjagcc6 "-DSTATIC_ONLY=True -DGOBJECT_INTROSPECTION=False
 CLANG_BUILD testclang1 "$DEFCMAKEOPTS"
 CLANG_BUILD testclang2 "$CMAKEOPTS"
 CLANG_BUILD testclang3 "$UUCCMAKEOPTS"
-#not supported with clang yet CLANG_BUILD testclang4lto "$LTOCMAKEOPTS"
+CLANG_BUILD testclang4lto "$LTOCMAKEOPTS"
 CLANG_BUILD testclang4glib "$GLIBOPTS"
 if (test "$(uname -s)" = "Linux"); then
-  echo "Temporarily disable cross-compile tests"
-#  CLANG_BUILD testclang1cross "-DCMAKE_TOOLCHAIN_FILE=$TOP/cmake/Toolchain-Linux-GCC-i686.cmake"
-#  CLANG_BUILD testclang2cross "-DCMAKE_TOOLCHAIN_FILE=$TOP/cmake/Toolchain-Linux-GCC-i686.cmake $CMAKEOPTS"
+  # Fedora: dnf install libstdc++-*.i686 glibc-*.i686 libgcc.i686 libdb-devel.i686
+  CMAKEOPTS_NONSTRICT="-DLIBICAL_DEVMODE=True -DGOBJECT_INTROSPECTION=False -DLIBICAL_GLIB=False -DLIBICAL_BUILD_DOCS=False"
+  CLANG_BUILD testclang1cross "-DCMAKE_TOOLCHAIN_FILE=$TOP/cmake/Toolchain-Linux-GCC-i686.cmake $CMAKEOPTS_NONSTRICT -DLIBICAL_JAVA_BINDINGS=off"
 fi
 
 #Memory consistency check

scripts/compileit.sh

@@ -22,7 +22,7 @@ if (test "$BRANCH" != "3.0"); then
   CMAKE_VERSION4_OPTIONS="\
     -DLIBICAL_DEVMODE=ON \
     -DLIBICAL_DEVMODE_MEMORY_CONSISTENCY=ON \
-    -DLIBICAL_SYNCMODE_THREADLOCAL=ON \
+    -DLIBICAL_DEVMODE_SYNCMODE_THREADLOCAL=ON \
   "
 fi
 

src/Net-ICal-Libical/netical.i

@@ -115,19 +115,19 @@ void icalerror_set_error_state( icalerrorenum error, icalerrorstate);
 icalerrorstate icalerror_get_error_state( icalerrorenum error);
 
 
-const char* icalenum_property_kind_to_string(icalproperty_kind kind);
-icalproperty_kind icalenum_string_to_property_kind(const char* string);
+const char* icalproperty_kind_to_string(icalproperty_kind kind);
+icalproperty_kind icalproperty_string_to_kind(const char* string);
 
-const char* icalenum_value_kind_to_string(icalvalue_kind kind);
+const char* icalvalue_kind_to_string(icalvalue_kind kind);
 /*icalvalue_kind icalenum_value_kind_by_prop(icalproperty_kind kind);*/
 
 const char* icalenum_parameter_kind_to_string(icalparameter_kind kind);
 icalparameter_kind icalenum_string_to_parameter_kind(const char* string);
 
-const char* icalenum_component_kind_to_string(icalcomponent_kind kind);
-icalcomponent_kind icalenum_string_to_component_kind(const char* string);
+const char* icalcomponent_kind_to_string(icalcomponent_kind kind);
+icalcomponent_kind icalcomponent_string_to_kind(const char* string);
 
-icalvalue_kind icalenum_property_kind_to_value_kind(icalproperty_kind kind);
+icalvalue_kind icalproperty_kind_to_value_kind(icalproperty_kind kind);
 
 
 int* icallangbind_new_array(int size);