Merge pull request #425 from openzim/fix_no_writer_test

Introduce MS Windows CI

.github/workflows/ci.yml

@@ -52,6 +52,51 @@ jobs:
           cd build
           ninja
 
+  Windows:
+    runs-on: windows-2022
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Install packages
+        run:
+          choco install pkgconfiglite ninja
+
+      - name: Install python modules
+        run: pip3 install meson
+
+      - name: Setup MSVC compiler
+        uses: bus1/cabuild/action/msdevshell@v1
+        with:
+          architecture: x64
+
+      - name: Install dependencies
+        uses: kiwix/kiwix-build/actions/dl_deps_archive@main
+        with:
+          target_platform: win-x86_64-static
+
+      - name: Compile
+        shell: cmd
+        run: |
+          set PKG_CONFIG_PATH=%cd%\BUILD_win-amd64\INSTALL\lib\pkgconfig
+          set CPPFLAGS=-I%cd%\BUILD_win-amd64\INSTALL\include
+          meson.exe setup . build -Dstatic-linkage=true --buildtype=debug
+          cd build
+          ninja.exe
+
+      - name: Test
+        shell: cmd
+        run: |
+          cd build
+          meson.exe test --verbose
+        env:
+          WAIT_TIME_FACTOR_TEST: 10
 
   Linux:
     strategy:

meson.build

@@ -1,9 +1,7 @@
 project('zim-tools', ['c', 'cpp'],
   version : '3.4.2',
   license : 'GPLv3+',
-  default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
-
-add_global_arguments(['-Werror', '-Wall'], language:'cpp')
+  default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true', 'warning_level=1'])
 
 add_global_arguments('-DVERSION="@0@"'.format(meson.project_version()), language : 'cpp')
 

src/metadata.cpp

@@ -48,7 +48,21 @@ bool searchRegex(const std::string& regexStr, const std::string& text)
 
 size_t getTextLength(const std::string& utf8EncodedString)
 {
-  return icu::UnicodeString::fromUTF8(utf8EncodedString).length();
+  // For some unknown reason implicite convertion from std::string to icu::StringPiece
+  // is broken on Windows.
+  // Constructors are definde in stringpiece.h as
+  // ```
+  // StringPiece(const std::string& str)
+  //  : ptr_(str.data()), length_(static_cast<int32_t>(str.size())) { }
+  // StringPiece(const char* offset, int32_t len) : ptr_(offset), length_(len) { }
+  // ```
+  // However using the first constructor ends with a corrupted StringPiece (wrong ptr)
+  // and using second one works. Don't ask me why
+  // This is broken
+  // icu::StringPiece stringPiece(utf8EncodedString);
+  // This is not
+  icu::StringPiece stringPiece(utf8EncodedString.data(), static_cast<int32_t>(utf8EncodedString.size()));
+  return icu::UnicodeString::fromUTF8(stringPiece).length();
 }
 
 class MetadataComplexCheckBase
@@ -125,7 +139,7 @@ std::string escapeNonPrintableChars(const std::string& s)
   std::ostringstream os;
   os << std::hex;
   for (const char c : s) {
-    if (std::isprint(c)) {
+    if (std::isprint(static_cast<unsigned char>(c))) {
       os << c;
     } else {
       const unsigned int charVal = static_cast<unsigned char>(c);

src/tools.cpp

@@ -20,7 +20,6 @@
 
 #include "tools.h"
 
-#include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <cerrno>
@@ -31,14 +30,14 @@
 #include <stdexcept>
 #include <vector>
 #include <memory>
-#include <unistd.h>
 #include <algorithm>
 #include <regex>
 #include <array>
 
 #ifdef _WIN32
 #define SEPARATOR "\\"
 #else
+#include <unistd.h>
 #define SEPARATOR "/"
 #endif
 

src/zimcheck/meson.build

@@ -23,7 +23,7 @@ executable('zimcheck',
   '../tools.cpp',
   '../metadata.cpp',
   include_directories : inc,
-  dependencies: [libzim_dep, icu_dep, thread_dep],
+  dependencies: [libzim_dep, icu_dep, thread_dep, docopt_dep],
   install: true)