vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue May 29 11:35:24 2018 +0200| [4c697708273d679c2efec6424243d485a5db21ea] | committer: Hugo Beauzée-Luyssen
package: Fix msi target dependencies The previous version was causing parallel builds to fail > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c697708273d679c2efec6424243d485a5db21ea --- extras/package/win32/msi.mak | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak index 9c7f21ba40..d76ee2ab8b 100644 --- a/extras/package/win32/msi.mak +++ b/extras/package/win32/msi.mak @@ -19,23 +19,23 @@ MSIOUTFILE=vlc-$(VERSION)-win32.msi endif WINE_C=`wine winepath c:` -package-msi: heat candle light - heat: package-win-strip $(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs $(HEAT) dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Locale.fragment.wxs $(HEAT) dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Lua.fragment.wxs $(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs -candle: +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 -light: +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) chmod 644 $(MSIOUTFILE) +package-msi: light + cleanmsi: -rm -f $(MSIBUILDDIR)/*.wixobj -rm -f $(MSIBUILDDIR)/*.wixpdb _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
