Installer: Make sure that wixobj files are rebuilt for version changes

WixInstaller/Makefile

Index: WixInstaller/Makefile
===================================================================
--- a/WixInstaller/Makefile
+++ b/WixInstaller/Makefile
@@ -50,43 +50,45 @@ ia32: $(Installer_ia32)
 x64: $(Installer_x64)
 
 setup: $(Setup)
 
 #---------------------
 # candle .wxs --> .wixobj
 #---------------------
 
-Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Configuration)" $(CANDLE_FLAGS) $(*F).wxs -out $@
-.wxs{$(Build_Dir_common)}.wixobj:
-    $(Candle)

[Eric, 2013/06/14 15:36:48]

The common .wxs files shouldn't be version dependent, which means they can use
the inference rule. Since there's only one of them, it's the same number of
lines to make an explicit rule. I don't know if this situation will continue.

-.wxs{$(Build_Dir_ia32)}.wixobj:
-    $(Candle) -arch x86
-.wxs{$(Build_Dir_x64)}.wixobj:
-    $(Candle) -arch x64
+Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Configuration)" $(CANDLE_FLAGS) $** -out $@
 
 objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj
-objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj $(objects_common)
-objects_x64 = $(Build_Dir_x64)adblockplusie.wixobj $(objects_common)
+$(objects_common): custom_WixUI_InstallDir.wxs
+		$(Candle)
 
-object_setup = $(Build_Dir_common)setup.wixobj
+objects_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION).wixobj
+$(objects_ia32): adblockplusie.wxs

[Eric, 2013/06/14 15:36:48]

Looking at this line, I realize I forgot to add dependencies "dll_class.wxi" and
"bho_registry_value.wxi". I hadn't noticed because they never change.

+		$(Candle) -arch x86
+
+objects_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION).wixobj
+$(objects_x64): adblockplusie.wxs

[Eric, 2013/06/14 15:36:48]

Same .wxi dependencies needed here.

+		$(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 -loc en-us.wxl -ext WixUIExtension -out $@
 
-$(Installer_ia32): $(objects_ia32) "..\build\ia32\$(Configuration)\AdblockPlus.dll"
-    $(Light) $(objects_ia32)
+$(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configuration)\AdblockPlus.dll"
+    $(Light) $(objects_ia32) $(objects_common)

[Eric, 2013/06/14 15:36:48]

The common object is the custom-modified UI. There's a reference to it in
adblockplusie.wxs. I had put it as a dependency in order to force a build. This
was in part to avoid understanding whether the symbol reference was just that
(and could be handled in the linker) or affected the compile somehow.

Assuming this works, the UIRef element only generates a symbolic reference, and
we can keep it this way.

 
-$(Installer_x64): $(objects_x64) "..\build\x64\$(Configuration)\AdblockPlusx64.dll"
-    $(Light) $(objects_x64)
+$(Installer_x64): $(objects_x64) $(objects_common) "..\build\x64\$(Configuration)\AdblockPlusx64.dll"
+    $(Light) $(objects_x64) $(objects_common)
 
 #---------------------
 # light .wixobj --> .exe
 #---------------------
 
 $(Setup): $(object_setup)
     $(Light) $(object_setup) -ext WixBalExtension