contrib/src/main.mak

@@ -419,7 +419,7 @@ UNPACK = $(RM) -R $@ \
 	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar $(TAR_VERBOSE)xzfo $(f)) \
 	$(foreach f,$(filter %.tar.bz2,$^), && tar $(TAR_VERBOSE)xjfo $(f)) \
 	$(foreach f,$(filter %.tar.xz,$^), && tar $(TAR_VERBOSE)xJfo $(f)) \
-	$(foreach f,$(filter %.zip,$^), && unzip $(f))
+	$(foreach f,$(filter %.zip,$^), && unzip $(f) $(UNZIP_PARAMS))
 UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
 pkg_static = (cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-static.sh $(1))

contrib/src/wix/SHA512SUMS

+26b1d2a5b582fcaa31ffaaf289711854897f91e8e5002bd8ddee2e69c95a60f53c6e3375d38fba4519ddd4a68bcf402c36eaef5a8faa6f3a4b8b2bc011e8f05a  wix3.5.2519.0.zip

contrib/src/wix/rules.mak

+WIX_VERSION=35
+WIX_FULL_VERSION=3.5.2519.0
+WIX_URL := https://wixtoolset.org/downloads/v$(WIX_FULL_VERSION)/wix$(WIX_VERSION)-binaries.zip
+
+ifdef HAVE_WIN32
+# this requires dotnet 4.0 to be installed when running wix
+PKGS += wix
+# need to be installed when using prebuilt
+PKGS_TOOLS += wix
+endif
+
+.sum-wix: wix$(WIX_FULL_VERSION).zip
+
+$(TARBALLS)/wix$(WIX_FULL_VERSION).zip:
+	$(call download_pkg,$(WIX_URL),wix)
+
+wix: UNZIP_PARAMS=-d wix$(WIX_FULL_VERSION)
+wix: wix$(WIX_FULL_VERSION).zip .sum-wix
+	$(UNPACK)
+	$(MOVE)
+
+.wix: wix
+	install -d "$(PREFIX)/bin"
+	for f in $</*.exe $</*.exe.config $</*.dll $</*.targets $</*.cub $</*.wixlib ; do \
+	  install $$f "$(PREFIX)/bin" ; \
+	done
+	touch $@

extras/ci/gitlab-ci.yml

@@ -46,21 +46,18 @@ variables:
         VLCARCH: win32
         HOST_ARCH: i686
         TRIPLET: $HOST_ARCH-w64-mingw32
-        WIX_PATH: '-W/home/videolan/.wine/dosdevices/c:/Program Files (x86)/Windows Installer XML v3.5/bin'
 
 .variables-win64: &variables-win64
         SHORTARCH: win64
         VLCARCH: win64
         HOST_ARCH: x86_64
         TRIPLET: $HOST_ARCH-w64-mingw32
-        WIX_PATH: '-W/home/videolan/.wine/dosdevices/c:/Program Files (x86)/Windows Installer XML v3.5/bin'
 
 .variables-win64-arm: &variables-win64-arm
         SHORTARCH: arm64
         VLCARCH: winarm64
         HOST_ARCH: aarch64
         TRIPLET: $HOST_ARCH-w64-mingw32
-        WIX_PATH: '-W/home/videolan/.wine/dosdevices/c:/Program Files (x86)/Windows Installer XML v3.5/bin'
 
 .variables-macos-x86_64: &variables-macos-x86_64
         VLC_PATH: /Users/videolanci/sandbox/bin
@@ -147,7 +144,7 @@ variables:
         if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then
             EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} -c"
         fi
-        extras/package/win32/build.sh -a $HOST_ARCH $EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS "${WIX_PATH}"
+        extras/package/win32/build.sh -a $HOST_ARCH $EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
         if [ "${CI_JOB_NAME}" = "win64" ]; then
           cmake -DLIBVLC_SDK_INC:STRING=${CI_PROJECT_DIR}/include -DLIBVLC_SDK_LIB:STRING=${CI_PROJECT_DIR}/${VLCARCH}/lib/.libs -H${CI_PROJECT_DIR}/doc/libvlc -B${CI_PROJECT_DIR}/doc/libvlc/build \
                 -G Ninja -DCMAKE_C_COMPILER=${TRIPLET}-gcc -DCMAKE_CXX_COMPILER=${TRIPLET}-g++ -DCMAKE_SYSTEM_NAME=Windows

extras/package/win32/build.sh

@@ -209,6 +209,11 @@ if [ ! -z "$BUILD_UCRT" ]; then
     fi
 fi
 
+if [ ! -z "$WIXPATH" ]; then
+    # the CI didn't provide its own WIX, make sure we use our own
+    CONTRIBFLAGS="$CONTRIBFLAGS --enable-wix"
+fi
+
 export PATH="$PWD/contrib/$CONTRIB_PREFIX/bin":"$PATH"
 
 if [ "$INTERACTIVE" = "yes" ]; then