WixInstaller/Makefile - Issue 10996004: Installer: Make sure that wixobj files are rebuilt for version changes

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: WixInstaller/Makefile

Issue 10996004: Installer: Make sure that wixobj files are rebuilt for version changes (Closed)

Patch Set: Created June 14, 2013, 2:26 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
1 #----------------------------------	1 #----------------------------------

2 # Makefile for Microsoft NMAKE	2 # Makefile for Microsoft NMAKE

3 #	3 #

4 # Call with only the version parameter to set the default target to all installe rs.	4 # Call with only the version parameter to set the default target to all installe rs.

5 # nmake VERSION=1.2.3	5 # nmake VERSION=1.2.3

6 # Call with a definition of the NMAKE variable ARCH on the command line	6 # Call with a definition of the NMAKE variable ARCH on the command line

7 # nmake VERSION=1.2.3 ARCH=ia32	7 # nmake VERSION=1.2.3 ARCH=ia32

8 # nmake VERSION=1.2.3 ARCH=x64	8 # nmake VERSION=1.2.3 ARCH=x64

9 # If an architecture is specified, the default target is constrained to it.	9 # If an architecture is specified, the default target is constrained to it.

10 #----------------------------------	10 #----------------------------------

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 #---------------------	56 #---------------------

57	57

58 Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Conf iguration)" $(CANDLE_FLAGS) $(*F).wxs -out $@	58 Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Conf iguration)" $(CANDLE_FLAGS) $(*F).wxs -out $@

59 .wxs{$(Build_Dir_common)}.wixobj:	59 .wxs{$(Build_Dir_common)}.wixobj:

60 $(Candle)	60 $(Candle)

61 .wxs{$(Build_Dir_ia32)}.wixobj:	61 .wxs{$(Build_Dir_ia32)}.wixobj:

62 $(Candle) -arch x86	62 $(Candle) -arch x86

63 .wxs{$(Build_Dir_x64)}.wixobj:	63 .wxs{$(Build_Dir_x64)}.wixobj:

64 $(Candle) -arch x64	64 $(Candle) -arch x64

65	65

66 objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj	66 objects_common = $(Build_Dir_common)custom_WixUI_InstallDir-$(VERSION).wixobj

67 objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj $(objects_common)	67 objects_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION).wixobj $(objects_common )

68 objects_x64 = $(Build_Dir_x64)adblockplusie.wixobj $(objects_common)	68 objects_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION).wixobj $(objects_common)
	Eric 2013/06/14 14:39:10 I don't think $(objects_ia32) and $(objects_x64) w 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
69	69

70 object_setup = $(Build_Dir_common)setup.wixobj	70 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj
	Eric 2013/06/14 14:39:10 This one will work because there's an explicit dep This one will work because there's an explicit dependency rule for $(object_setup) on line 71.
71 $(object_setup): setup.wxs	71 $(object_setup): setup.wxs

72 $(Candle) -ext WixBalExtension	72 $(Candle) -ext WixBalExtension

73	73

74 #---------------------	74 #---------------------

75 # light .wixobj --> .msi	75 # light .wixobj --> .msi

76 #---------------------	76 #---------------------

77	77

78 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@	78 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@

79	79

80 $(Installer_ia32): $(objects_ia32) "..\build\ia32\$(Configuration)\AdblockPlus.d ll"	80 $(Installer_ia32): $(objects_ia32) "..\build\ia32\$(Configuration)\AdblockPlus.d ll"

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
113	113

114 install-setup: $(Setup)	114 install-setup: $(Setup)

115 $(Setup)	115 $(Setup)

116	116

117 #---------------------	117 #---------------------

118 # Miscellaneous	118 # Miscellaneous

119 #---------------------	119 #---------------------

120	120

121 clean:	121 clean:

122 del $(objects_ia32)	122 del $(objects_ia32)

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »