Some minor fixes we need for Windows / MSVC support

.github/micromamba_ci_environment.yml

@@ -0,0 +1,8 @@
+name: ci_environment
+channels:
+  - conda-forge
+dependencies:
+  - c-compiler
+  - ninja
+  - cmake
+  - zlib

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
       - master
 
 jobs:
-  build:
+  build_linux:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -28,3 +28,38 @@ jobs:
         run:  |
           cd build
           make test
+
+  build_win:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install environment from environment.yml
+        uses: mamba-org/provision-with-micromamba@main
+        with:
+          environment-file: .github/micromamba_ci_environment.yml
+
+      - name: Build
+        shell: cmd /C CALL {0}
+        run:  |
+          call micromamba activate ci_environment
+
+          mkdir build
+          cd build
+          cmake -GNinja .. ^
+            -D CMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
+            -D ENABLE_CONDA=ON ^
+            -D MULTI_SEMANTICS=ON ^
+            -D WITHOUT_COOKIEOPEN=ON
+
+          ninja
+
+          ninja install
+
+      - name: Test
+        shell: cmd /C call {0}
+        run: |
+          call micromamba activate ci_environment
+
+          set CTEST_OUTPUT_ON_FAILURE=1
+          cd build
+          ninja test

ext/CMakeLists.txt

@@ -162,6 +162,9 @@ IF (WIN32)
 ENDIF ()
 
 SET_TARGET_PROPERTIES(libsolvext PROPERTIES OUTPUT_NAME "solvext")
+if (MSVC AND DISABLE_SHARED AND ENABLE_STATIC)
+    SET_TARGET_PROPERTIES(libsolvext PROPERTIES OUTPUT_NAME "solvext_static")
+endif()
 SET_TARGET_PROPERTIES(libsolvext PROPERTIES SOVERSION ${LIBSOLVEXT_SOVERSION})
 
 INSTALL (FILES ${libsolvext_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/solv")

src/CMakeLists.txt

@@ -62,6 +62,10 @@ IF (WIN32)
 ENDIF (WIN32)
 
 SET_TARGET_PROPERTIES(libsolv PROPERTIES OUTPUT_NAME "solv")
+if (MSVC AND DISABLE_SHARED AND ENABLE_STATIC)
+    SET_TARGET_PROPERTIES(libsolv PROPERTIES OUTPUT_NAME "solv_static")
+endif()
+
 SET_TARGET_PROPERTIES(libsolv PROPERTIES SOVERSION ${LIBSOLV_SOVERSION})
 
 INSTALL (FILES ${libsolv_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/solv")

src/repo_write.c

@@ -188,7 +188,7 @@ write_compressed_blob(Repodata *data, void *blob, int len)
 	  write_u8(data, clen);
 	  write_blob(data, cpage, clen);
 	}
-      blob += chunk;
+      blob = (char*) blob + chunk;
       len -= chunk;
     }
 }

src/solvversion.c

@@ -7,8 +7,8 @@
 
 #include "solvversion.h"
 
-const char solv_version[] = LIBSOLV_VERSION_STRING;
-int solv_version_major = LIBSOLV_VERSION_MAJOR;
-int solv_version_minor = LIBSOLV_VERSION_MINOR;
-int solv_version_patch = LIBSOLV_VERSION_PATCH;
-const char solv_toolversion[] = LIBSOLV_TOOLVERSION;
+SOLV_API const char solv_version[] = LIBSOLV_VERSION_STRING;
+SOLV_API int solv_version_major = LIBSOLV_VERSION_MAJOR;
+SOLV_API int solv_version_minor = LIBSOLV_VERSION_MINOR;
+SOLV_API int solv_version_patch = LIBSOLV_VERSION_PATCH;
+SOLV_API const char solv_toolversion[] = LIBSOLV_TOOLVERSION;

src/solvversion.h.in

@@ -19,11 +19,18 @@
 #define LIBSOLV_VERSION_PATCH @LIBSOLV_PATCH@
 #define LIBSOLV_VERSION (LIBSOLV_VERSION_MAJOR * 10000 + LIBSOLV_VERSION_MINOR * 100 + LIBSOLV_VERSION_PATCH)
 
-extern const char solv_version[];
-extern int solv_version_major;
-extern int solv_version_minor;
-extern int solv_version_patch;
-extern const char solv_toolversion[];
+#ifdef _WIN32
+// include win32/config.h for SOLV_API
+#include "config.h"
+#else
+#define SOLV_API
+#endif
+
+SOLV_API extern const char solv_version[];
+SOLV_API extern int solv_version_major;
+SOLV_API extern int solv_version_minor;
+SOLV_API extern int solv_version_patch;
+SOLV_API extern const char solv_toolversion[];
 
 #cmakedefine LIBSOLV_FEATURE_LINKED_PKGS
 #cmakedefine LIBSOLV_FEATURE_COMPLEX_DEPS

win32/CMakeLists.txt

@@ -1,9 +1,12 @@
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/win32)
+
 SET (WIN32_COMPAT_SOURCES
   ${PROJECT_SOURCE_DIR}/win32/fnmatch.c
   ${PROJECT_SOURCE_DIR}/win32/getopt.c
   ${PROJECT_SOURCE_DIR}/win32/regcomp.c
   ${PROJECT_SOURCE_DIR}/win32/regexec.c
   ${PROJECT_SOURCE_DIR}/win32/strfncs.c
   ${PROJECT_SOURCE_DIR}/win32/tre-mem.c
-)
+)
+
+INSTALL (FILES ${PROJECT_SOURCE_DIR}/win32/config.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/solv")