Delta Between Two Patch Sets: installer/Makefile
Issue 10996004:
Installer: Make sure that wixobj files are rebuilt for version changes (Closed)
Left Patch Set: Added explicit build rules and added back acceptable.png expected by installer
Created June 14, 2013, 3:16 p.m.
Right Patch Set: Reverted change of file names
Created Nov. 5, 2013, 10:55 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
no next file »
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 ia32: $(Installer_ia32) | 48 ia32: $(Installer_ia32) |
| 49 | 49 |
| 50 x64: $(Installer_x64) | 50 x64: $(Installer_x64) |
| 51 | 51 |
| 52 setup: $(Setup) | 52 setup: $(Setup) |
| 53 | 53 |
| 54 #--------------------- | 54 #--------------------- |
| 55 # candle .wxs --> .wixobj | 55 # candle .wxs --> .wixobj |
| 56 #--------------------- | 56 #--------------------- |
| 57 | 57 |
| 58 Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Conf iguration)" $(CANDLE_FLAGS) $** -out $@ | 58 Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Conf iguration)" $(CANDLE_FLAGS) $(*F).wxs -out $@ |
| 59 | 59 |
| 60 objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj | 60 objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj |
| 61 $(objects_common): custom_WixUI_InstallDir.wxs | 61 objects_deps = adblockplusie.wxs bho_registry_value.wxi dll_class.wxi |
| 62 objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj | |
| 63 objects_x64 = $(Build_Dir_x64)adblockplusie.wixobj | |
| 64 | |
| 65 .wxs{$(Build_Dir_common)}.wixobj: | |
| 62 $(Candle) | 66 $(Candle) |
| 63 | 67 |
| 64 objects_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION).wixobj | 68 $(objects_ia32): $(objects_deps) |
| 65 $(objects_ia32): adblockplusie.wxs | |
| 66 $(Candle) -arch x86 | 69 $(Candle) -arch x86 |
| 67 | 70 |
| 68 objects_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION).wixobj | 71 $(objects_x64): $(objects_deps) |
| 69 $(objects_x64): adblockplusie.wxs | |
| 70 $(Candle) -arch x64 | 72 $(Candle) -arch x64 |
| 71 | 73 |
| 72 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj | 74 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj |
| 73 $(object_setup): setup.wxs | 75 $(object_setup): setup.wxs |
| 74 $(Candle) -ext WixBalExtension | 76 $(Candle) -ext WixBalExtension |
| 75 | 77 |
| 76 #--------------------- | 78 #--------------------- |
| 77 # light .wixobj --> .msi | 79 # light .wixobj --> .msi |
| 78 #--------------------- | 80 #--------------------- |
| 79 | 81 |
| 80 Light = light -notidy -nologo -cultures:en-us -ext WixUIExtension -out $@ | 82 Light = light -notidy -nologo -cultures:en-us -ext WixUIExtension -out $@ |
| 81 | 83 |
| 82 $(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configurat ion)\AdblockPlus.dll" | 84 $(Installer_ia32): $(objects_ia32) $(objects_common) en-us.wxl "..\build\ia32\$( Configuration)\AdblockPlus.dll" |
| 83 $(Light) $(objects_ia32) $(objects_common) -loc en-us.wxl | 85 $(Light) $(objects_ia32) $(objects_common) -loc en-us.wxl |
| 84 | 86 |
| 85 # TODO: Don't ignore errors here (fix install paths) | 87 # TODO: Don't ignore errors here (fix install paths) |
| 86 $(Installer_x64): $(objects_x64) $(objects_common) "..\build\ia32\$(Configuratio n)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll" | 88 $(Installer_x64): $(objects_x64) $(objects_common) en-us.wxl "..\build\ia32\$(Co nfiguration)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll" |
| 87 -$(Light) $(objects_x64) $(objects_common) -loc en-us.wxl | 89 -$(Light) $(objects_x64) $(objects_common) -loc en-us.wxl |
| 88 | 90 |
| 89 #--------------------- | 91 #--------------------- |
| 90 # light .wixobj --> .exe | 92 # light .wixobj --> .exe |
| 91 #--------------------- | 93 #--------------------- |
| 92 | 94 |
| 93 $(Setup): $(object_setup) bootstrap-theme.xml bootstrap-theme.wxl | 95 $(Setup): $(object_setup) bootstrap-theme.xml bootstrap-theme.wxl |
| 94 $(Light) $(object_setup) -ext WixBalExtension -loc bootstrap-theme.wxl | 96 $(Light) $(object_setup) -ext WixBalExtension -loc bootstrap-theme.wxl |
| 95 | 97 |
| 96 #--------------------- | 98 #--------------------- |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 116 | 118 |
| 117 install-setup: $(Setup) | 119 install-setup: $(Setup) |
| 118 $(Setup) -log ..\build\setup.log | 120 $(Setup) -log ..\build\setup.log |
| 119 | 121 |
| 120 #--------------------- | 122 #--------------------- |
| 121 # Miscellaneous | 123 # Miscellaneous |
| 122 #--------------------- | 124 #--------------------- |
| 123 | 125 |
| 124 clean: | 126 clean: |
| 125 del $(objects_ia32) | 127 del $(objects_ia32) |
| LEFT | RIGHT |
« no previous file
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
