[vlc-devel] [PATCH v2 05/10] win32: msi: fix building with spaces in the path

[Steve Lhomme]

It's common in WSL/msys2
---
 extras/package/win32/msi.mak | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak
index 94f16d2700b1..a8db35699696 100644
--- a/extras/package/win32/msi.mak
+++ b/extras/package/win32/msi.mak
@@ -7,7 +7,7 @@ WIXPATH=`wine winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\
 HEAT=$(RUN_HOST_CMD) "$(WIXPATH)/heat.exe"
 CANDLE=$(RUN_HOST_CMD) "$(WIXPATH)/candle.exe"
 LIGHT=$(RUN_HOST_CMD) "$(WIXPATH)/light.exe"
-W_VLCDIR=`wine winepath -s \`wine winepath -w '$(abs_top_builddir)/vlc-$(VERSION)'\``
+W_VLCDIR=`wine winepath -w '$(abs_top_builddir)/vlc-$(VERSION)'`
 MSIDIR=$(abs_srcdir)/extras/package/win32/msi
 W_MSIDIR=`wine winepath -w '$(MSIDIR)'`
 MSIBUILDDIR=$(abs_top_builddir)/extras/package/win32/msi
@@ -20,22 +20,22 @@ endif
 WINE_C=`wine winepath -u c:`
 
 heat: package-win-strip
-	$(HEAT) dir $(W_VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs
-	$(HEAT) dir $(W_VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Locale.fragment.wxs
+	$(HEAT) dir "$(W_VLCDIR)/plugins" -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out "$(W_MSIBUILDDIR)\Plugins.fragment.wxs"
+	$(HEAT) dir "$(W_VLCDIR)/locale" -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out "$(W_MSIBUILDDIR)\Locale.fragment.wxs"
 if BUILD_LUA
-	$(HEAT) dir $(W_VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Lua.fragment.wxs
+	$(HEAT) dir "$(W_VLCDIR)/lua" -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out "$(W_MSIBUILDDIR)\Lua.fragment.wxs"
 endif
 if BUILD_SKINS
-	$(HEAT) dir $(W_VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
+	$(HEAT) dir "$(W_VLCDIR)/skins" -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out "$(W_MSIBUILDDIR)\Skins.fragment.wxs"
 endif
 
 candle: heat
-	$(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs
+	$(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension "$(W_MSIDIR)\product.wxs" "$(W_MSIDIR)\extensions.wxs" "$(W_MSIBUILDDIR)\*.fragment.wxs"
 
 light: candle
 	test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v"
 	ln -Tsf "$(abs_top_builddir)/vlc-$(VERSION)" "$(WINE_C)"/v
-	$(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b $(W_MSIDIR) -b C:/v/plugins -b C:/v/locale -b C:/v/lua -b C:/v/skins $(W_MSIBUILDDIR)\\product.wixobj $(W_MSIBUILDDIR)\\axvlc.wixobj $(W_MSIBUILDDIR)\\extensions.wixobj $(W_MSIBUILDDIR)\\*.fragment.wixobj -o $(MSIOUTFILE)
+	$(LIGHT) -sval -spdb -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -b "$(W_MSIDIR)" -b C:/v/plugins -b C:/v/locale -b C:/v/lua -b C:/v/skins "$(W_MSIBUILDDIR)\\product.wixobj" "$(W_MSIBUILDDIR)\\axvlc.wixobj" "$(W_MSIBUILDDIR)\\extensions.wixobj" "$(W_MSIBUILDDIR)\\*.fragment.wixobj" -o $(MSIOUTFILE)
 	chmod 644 $(MSIOUTFILE)
 
 package-msi: light
-- 
2.26.2