Merge pull request #2 from velopack/cs/msilib

Add libmsi build

Author: caesay

.github/workflows/build.yml

@@ -65,10 +65,22 @@ jobs:
       - name: Rename binary
         run: copy builddir\wixl.exe wixl-win-${{ matrix.arch }}.exe
 
+      - name: Collect libmsi artifacts
+        shell: msys2 {0}
+        run: |
+          (cd builddir && ar t libmsi-1.0.a | tr -d '\r' | xargs ar rcs libmsi.a)
+          cp builddir/libmsi.a libmsi-win-${{ matrix.arch }}.lib
+          cp builddir/libmsi.dll libmsi-win-${{ matrix.arch }}.dll
+          cp builddir/libmsi.dll.a libmsi-win-${{ matrix.arch }}.dll.lib
+
       - uses: actions/upload-artifact@v4
         with:
           name: build-win-${{ matrix.arch }}
-          path: wixl-win-${{ matrix.arch }}.exe
+          path: |
+            wixl-win-${{ matrix.arch }}.exe
+            libmsi-win-${{ matrix.arch }}.lib
+            libmsi-win-${{ matrix.arch }}.dll
+            libmsi-win-${{ matrix.arch }}.dll.lib
           retention-days: 1
 
   linux:
@@ -107,15 +119,34 @@ jobs:
             file builddir/wixl
             ldd builddir/wixl || echo "statically linked"
             builddir/wixl --version
+            echo "=== libmsi shared library ==="
+            file builddir/libmsi.so
+            ls -lh builddir/libmsi.so
+            echo "=== creating non-thin static archive ==="
+            (cd builddir && ar rcs libmsi.a $(ar t libmsi-1.0.a))
+            ls -lh builddir/libmsi.a
           '
 
       - name: Rename binary
         run: cp builddir/wixl wixl-linux-${{ matrix.arch }}
 
+      - name: Collect libmsi artifacts
+        run: |
+          cp builddir/libmsi.a libmsi-linux-${{ matrix.arch }}.a
+          cp builddir/libmsi.so libmsi-linux-${{ matrix.arch }}.so
+
+      - name: Collect generated header
+        if: matrix.arch == 'x64'
+        run: cp builddir/libmsi-enums.h libmsi-enums-generated.h
+
       - uses: actions/upload-artifact@v4
         with:
           name: build-linux-${{ matrix.arch }}
-          path: wixl-linux-${{ matrix.arch }}
+          path: |
+            wixl-linux-${{ matrix.arch }}
+            libmsi-linux-${{ matrix.arch }}.a
+            libmsi-linux-${{ matrix.arch }}.so
+            libmsi-enums-generated.h
           retention-days: 1
 
   macos:
@@ -156,44 +187,85 @@ jobs:
             echo "ERROR: Found non-system dynamic dependencies!"
             exit 1
           fi
+          echo "=== libmsi shared library ==="
+          file builddir/libmsi.dylib
+          otool -L builddir/libmsi.dylib
+          ls -lh builddir/libmsi.dylib
 
       - name: Rename binary
         run: cp builddir/wixl wixl-macos-${{ matrix.arch }}
 
+      - name: Collect libmsi artifacts
+        run: |
+          cp builddir/libmsi-1.0.a libmsi-macos-${{ matrix.arch }}.a
+          cp builddir/libmsi.dylib libmsi-macos-${{ matrix.arch }}.dylib
+
       - uses: actions/upload-artifact@v4
         with:
           name: build-macos-${{ matrix.arch }}
-          path: wixl-macos-${{ matrix.arch }}
+          path: |
+            wixl-macos-${{ matrix.arch }}
+            libmsi-macos-${{ matrix.arch }}.a
+            libmsi-macos-${{ matrix.arch }}.dylib
           retention-days: 1
 
   package:
     runs-on: macos-latest
     needs: [windows, linux, macos]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
       - uses: actions/download-artifact@v4
         with:
           pattern: build-*
           merge-multiple: true
 
-      - name: Create macOS universal binary
+      - name: Create macOS universal wixl binary
         run: |
           lipo -create wixl-macos-arm64 wixl-macos-x64 -output wixl-osx-universal
           chmod +x wixl-osx-universal
           file wixl-osx-universal
           rm wixl-macos-arm64 wixl-macos-x64
 
-      - name: Prepare release directory
+      - name: Create macOS universal dylib
         run: |
-          mkdir release
-          mv wixl-win-x86.exe release/
-          mv wixl-win-x64.exe release/
-          mv wixl-win-arm64.exe release/
-          mv wixl-linux-x64 release/
-          mv wixl-linux-arm64 release/
-          mv wixl-osx-universal release/
-          ls -la release/
+          lipo -create libmsi-macos-arm64.dylib libmsi-macos-x64.dylib -output libmsi-osx-universal.dylib
+          file libmsi-osx-universal.dylib
+          rm libmsi-macos-arm64.dylib libmsi-macos-x64.dylib
+
+      - name: Package wixl
+        run: |
+          mkdir -p build-wixl
+          mv wixl-win-x86.exe wixl-win-x64.exe wixl-win-arm64.exe build-wixl/
+          mv wixl-linux-x64 wixl-linux-arm64 build-wixl/
+          mv wixl-osx-universal build-wixl/
+          ls -la build-wixl/
+
+      - name: Package libmsi
+        run: |
+          mkdir -p build-libmsi/include build-libmsi/shared build-libmsi/static
+          cp msitools/include/libmsi.h msitools/include/libmsi-database.h \
+             msitools/include/libmsi-query.h msitools/include/libmsi-record.h \
+             msitools/include/libmsi-summary-info.h msitools/include/libmsi-types.h \
+             build-libmsi/include/
+          cp libmsi-enums-generated.h build-libmsi/include/libmsi-enums.h
+          mv libmsi-win-*.dll build-libmsi/shared/
+          mv libmsi-win-*.dll.lib build-libmsi/shared/
+          mv libmsi-linux-*.so build-libmsi/shared/
+          mv libmsi-osx-universal.dylib build-libmsi/shared/
+          mv libmsi-win-*.lib build-libmsi/static/
+          mv libmsi-linux-*.a build-libmsi/static/
+          mv libmsi-macos-arm64.a libmsi-macos-x64.a build-libmsi/static/
+          ls -laR build-libmsi/
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-wixl
+          path: build-wixl/*
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wixl
-          path: release/*
+          name: build-libmsi
+          path: build-libmsi/**/*

.github/workflows/release.yml

@@ -46,8 +46,18 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: wixl
-          path: release
+          name: build-wixl
+          path: wixl
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: build-libmsi
+          path: libmsi
+
+      - name: Create release archives
+        run: |
+          zip -r wixl.zip wixl/
+          zip -r libmsi.zip libmsi/
 
       - name: Create GitHub Release
         env:
@@ -57,9 +67,5 @@ jobs:
             --target "${{ github.sha }}" \
             --title "${{ steps.version.outputs.version }}" \
             --generate-notes \
-            release/wixl-win-x86.exe \
-            release/wixl-win-x64.exe \
-            release/wixl-win-arm64.exe \
-            release/wixl-linux-x64 \
-            release/wixl-linux-arm64 \
-            release/wixl-osx-universal
+            wixl.zip \
+            libmsi.zip

meson.build

@@ -120,6 +120,7 @@ if host_machine.system() == 'darwin'
     dependencies: [zlib],
     c_args: ['-include', meson.project_build_root() / 'xml2-config.h',
              '-I' + meson.project_build_root()],
+    pic: true,
   )
 
   libxml = declare_dependency(
@@ -237,6 +238,7 @@ libgsf = static_library('gsf-1',
     '-DG_LOG_DOMAIN="libgsf"',
     '-DGSF_DISABLE_DEPRECATED',
   ],
+  pic: true,
 )
 
 libgsf_dep = declare_dependency(
@@ -344,6 +346,7 @@ libmsi = static_library('msi-1.0',
   include_directories: inc_dirs,
   dependencies: libmsi_deps,
   c_args: ['-include', meson.project_build_root() / 'config.h'],
+  pic: true,
 )
 
 libmsi_dep = declare_dependency(
@@ -352,6 +355,41 @@ libmsi_dep = declare_dependency(
   dependencies: libmsi_deps,
 )
 
+# --- libmsi shared library ---
+libmsi_shared_link_args = []
+if host_machine.system() == 'windows'
+  libmsi_shared_link_args = [
+    '-lws2_32', '-lole32', '-lshell32', '-lshlwapi',
+    '-ladvapi32', '-luserenv', '-liphlpapi', '-ldnsapi',
+    '-lbcrypt',
+  ]
+elif host_machine.system() == 'darwin'
+  libmsi_shared_link_args = [
+    '-framework', 'CoreFoundation',
+    '-framework', 'Foundation',
+    '-framework', 'AppKit',
+    '-framework', 'Carbon',
+  ]
+endif
+
+if host_machine.system() == 'linux'
+  libmsi_shared_deps = [
+    dependency('glib-2.0',    static: false),
+    dependency('gio-2.0',     static: false),
+    dependency('gobject-2.0', static: false),
+    dependency('libxml-2.0',  static: false),
+    dependency('zlib',        static: false),
+  ]
+else
+  libmsi_shared_deps = [glib, gio, gobject, libxml, zlib]
+endif
+
+libmsi_shared = shared_library('msi',
+  objects: [libmsi.extract_all_objects(), libgsf.extract_all_objects()],
+  dependencies: libmsi_shared_deps,
+  link_args: libmsi_shared_link_args,
+)
+
 # --- Platform-specific dependencies and link args ---
 platform_link_deps = []