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

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

[Eric, 2013-06-14 14:39:10]

I think you'll need a couple of explicit dependency rules to make this work.
They're in the comments.

http://codereview.adblockplus.org/10996004/diff/1/WixInstaller/Makefile
File WixInstaller/Makefile (right):

http://codereview.adblockplus.org/10996004/diff/1/WixInstaller/Makefile#newco...
WixInstaller/Makefile:68: objects_x64 =
$(Build_Dir_x64)adblockplusie-$(VERSION).wixobj $(objects_common)
I don't think $(objects_ia32) and $(objects_x64) will build, because the
basename of the source and the version-modified basename of the target are no
longer the same.

You can add explicit rules for these, though, similar to what $(object_setup) is
doing.

$(objects_ia32): adblockplusie.wxs
    $(Candle) -arch x86

$(objects_x64): adblockplusie.wxs
    $(Candle) -arch x64

http://codereview.adblockplus.org/10996004/diff/1/WixInstaller/Makefile#newco...
WixInstaller/Makefile:70: object_setup =
$(Build_Dir_common)setup-$(VERSION).wixobj
This one will work because there's an explicit dependency rule for
$(object_setup) on line 71.

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

I would not recommend eliminating the version-independent inference rule.

Other than that, it'll work.

http://codereview.adblockplus.org/10996004/diff/5001/WixInstaller/Makefile
File WixInstaller/Makefile (left):

http://codereview.adblockplus.org/10996004/diff/5001/WixInstaller/Makefile#ol...
WixInstaller/Makefile:60: $(Candle)
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.

http://codereview.adblockplus.org/10996004/diff/5001/WixInstaller/Makefile
File WixInstaller/Makefile (right):

http://codereview.adblockplus.org/10996004/diff/5001/WixInstaller/Makefile#ne...
WixInstaller/Makefile:65: $(objects_ia32): adblockplusie.wxs
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.

http://codereview.adblockplus.org/10996004/diff/5001/WixInstaller/Makefile#ne...
WixInstaller/Makefile:69: $(objects_x64): adblockplusie.wxs
Same .wxi dependencies needed here.

http://codereview.adblockplus.org/10996004/diff/5001/WixInstaller/Makefile#ne...
WixInstaller/Makefile:83: $(Light) $(objects_ia32) $(objects_common)
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.

[Wladimir Palant, 2013-11-05 11:04:13]

After some consideration I've reverted most of the hack here - adding version
numbers to file names doesn't make anything better. The underlying issue here
are insufficient dependency specifications and by now we work around that by
forcing all targets to be built for release builds. I've added some missing
dependencies to make development easier but adding all of them (like HTML files
and images being bundled) will be very ugly with nmake.

[Eric, 2013-11-05 14:01:09]

On 2013/11/05 11:04:13, Wladimir Palant wrote:
> The underlying issue here
> are insufficient dependency specifications and by now we work around that by
> forcing all targets to be built for release builds.

It's not the worst thing to build clean for release regardless of the build
system.

Nonetheless, I'm in the process of replacing the makefile as part of i18n.

[Wladimir Palant, 2013-11-05 15:08:38]

Well, I don't insist on landing this change if you are going to remove that code
anyway - but it's good to have this cleanup around just in case.