Unified Diff: installer/Makefile
Issue 10996004:
Installer: Make sure that wixobj files are rebuilt for version changes (Closed)
Patch Set: Reverted change of file names
Created Nov. 5, 2013, 10:55 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: installer/Makefile |
| =================================================================== |
| --- a/installer/Makefile |
| +++ b/installer/Makefile |
| @@ -50,45 +50,47 @@ ia32: $(Installer_ia32) |
| x64: $(Installer_x64) |
| setup: $(Setup) |
| #--------------------- |
| # candle .wxs --> .wixobj |
| #--------------------- |
| -Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Configuration)" $(CANDLE_FLAGS) $** -out $@ |
| +Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Configuration)" $(CANDLE_FLAGS) $(*F).wxs -out $@ |
| objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj |
| -$(objects_common): custom_WixUI_InstallDir.wxs |
| +objects_deps = adblockplusie.wxs bho_registry_value.wxi dll_class.wxi |
| +objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj |
| +objects_x64 = $(Build_Dir_x64)adblockplusie.wixobj |
| + |
| +.wxs{$(Build_Dir_common)}.wixobj: |
| $(Candle) |
| -objects_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION).wixobj |
| -$(objects_ia32): adblockplusie.wxs |
| +$(objects_ia32): $(objects_deps) |
| $(Candle) -arch x86 |
| -objects_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION).wixobj |
| -$(objects_x64): adblockplusie.wxs |
| +$(objects_x64): $(objects_deps) |
| $(Candle) -arch x64 |
| object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj |
| $(object_setup): setup.wxs |
| $(Candle) -ext WixBalExtension |
| #--------------------- |
| # light .wixobj --> .msi |
| #--------------------- |
| Light = light -notidy -nologo -cultures:en-us -ext WixUIExtension -out $@ |
| -$(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll" |
| +$(Installer_ia32): $(objects_ia32) $(objects_common) en-us.wxl "..\build\ia32\$(Configuration)\AdblockPlus.dll" |
| $(Light) $(objects_ia32) $(objects_common) -loc en-us.wxl |
| # TODO: Don't ignore errors here (fix install paths) |
| -$(Installer_x64): $(objects_x64) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll" |
| +$(Installer_x64): $(objects_x64) $(objects_common) en-us.wxl "..\build\ia32\$(Configuration)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll" |
| -$(Light) $(objects_x64) $(objects_common) -loc en-us.wxl |
| #--------------------- |
| # light .wixobj --> .exe |
| #--------------------- |
| $(Setup): $(object_setup) bootstrap-theme.xml bootstrap-theme.wxl |
| $(Light) $(object_setup) -ext WixBalExtension -loc bootstrap-theme.wxl |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
