Skip to content

V
vlc
Commit 670660b3 authored by Ludovic Fauvet's avatar Ludovic Fauvet
Browse files
Options

msi: simplification 

Directly assign the given subdirectories to the application folder.
parent 690a8d7d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
extras/package/win32/msi.mak
View file @ 670660b3
...@@ -18,10 +18,10 @@ WINE_C=`winepath c:` ...@@ -18,10 +18,10 @@ WINE_C=`winepath c:`
package-msi: heat candle light package-msi: heat candle light
heat: package-win-strip heat: package-win-strip
$(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -srd -dr PLUGINSDIR -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs $(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 -srd -dr LOCALEDIR -out $(W_MSIBUILDDIR)/Locale.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 -srd -dr LUADIR -out $(W_MSIBUILDDIR)/Lua.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 -srd -dr SKINSDIR -out $(W_MSIBUILDDIR)/Skins.fragment.wxs $(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
candle: candle:
$(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)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs
......
extras/package/win32/msi/product.wxs
View file @ 670660b3
...@@ -151,10 +151,6 @@ ...@@ -151,10 +151,6 @@
<RemoveFile Id="RemovePluginsCache" Name="plugins.dat" On="uninstall" /> <RemoveFile Id="RemovePluginsCache" Name="plugins.dat" On="uninstall" />
</Component> </Component>
</Directory> </Directory>
<Directory Id='LOCALEDIR' Name='locale' />
<Directory Id='LUADIR' Name='lua' />
<!-- <Directory Id='OSDMENUDIR' Name='osdmenu' /> -->
<Directory Id='SKINSDIR' Name='skins' />
<Component Id='CompPlayDiscs' Guid='b0d90296-b20c-4c74-a3b3-a7694e011f25' Win64="$(var.Win64)"> <Component Id='CompPlayDiscs' Guid='b0d90296-b20c-4c74-a3b3-a7694e011f25' Win64="$(var.Win64)">
<!-- Audio CD --> <!-- Audio CD -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment