Side by Side Diff: installer/Makefile
Issue 22887001:
Custom action library, initial version (Closed)
Patch Set:
Created Oct. 28, 2013, 9:37 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« installer/Doxyfile ('k')
|
installer/adblockplusie.wxs » ('j')
|
installer/installer.gyp » ('J')
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')
| 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 25 matching lines...) Expand all Loading... | |
| 36 !ifndef ARCH | 36 !ifndef ARCH |
| 37 default: $(Installer_ia32) $(Installer_x64) | 37 default: $(Installer_ia32) $(Installer_x64) |
| 38 !elseif "$(ARCH)"=="ia32" | 38 !elseif "$(ARCH)"=="ia32" |
| 39 default: $(Installer_ia32) | 39 default: $(Installer_ia32) |
| 40 !elseif "$(ARCH)"=="x64" | 40 !elseif "$(ARCH)"=="x64" |
| 41 default: $(Installer_x64) | 41 default: $(Installer_x64) |
| 42 !else | 42 !else |
| 43 !error Unknown variable ARCH=$(ARCH) | 43 !error Unknown variable ARCH=$(ARCH) |
| 44 !endif | 44 !endif |
| 45 | 45 |
| 46 default: | |
| 47 @echo Available targets | |
| 48 @echo - ia32 | |
| 49 @echo - x64 | |
| 50 @echo - setup | |
| 51 @echo - install-ia32 | |
| 52 @echo - install-x64 | |
| 53 | |
| 46 all: ia32 x64 setup | 54 all: ia32 x64 setup |
| 47 | 55 |
| 48 ia32: $(Installer_ia32) | 56 ia32: $(Installer_ia32) |
| 49 | 57 |
| 50 x64: $(Installer_x64) | 58 x64: $(Installer_x64) |
| 51 | 59 |
| 52 setup: $(Setup) | 60 setup: $(Setup) |
| 53 | 61 |
| 54 #--------------------- | 62 #--------------------- |
| 55 # candle .wxs --> .wixobj | 63 # candle .wxs --> .wixobj |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 72 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj | 80 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj |
| 73 $(object_setup): setup.wxs | 81 $(object_setup): setup.wxs |
| 74 $(Candle) -ext WixBalExtension | 82 $(Candle) -ext WixBalExtension |
| 75 | 83 |
| 76 #--------------------- | 84 #--------------------- |
| 77 # light .wixobj --> .msi | 85 # light .wixobj --> .msi |
| 78 #--------------------- | 86 #--------------------- |
| 79 | 87 |
| 80 Light = light -notidy -nologo -cultures:en-us -ext WixUIExtension -out $@ | 88 Light = light -notidy -nologo -cultures:en-us -ext WixUIExtension -out $@ |
| 81 | 89 |
| 82 $(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configurat ion)\AdblockPlus.dll" | 90 $(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configurat ion)\AdblockPlus.dll" "build\ia32\Debug\installer-ca.dll" |
| 83 $(Light) $(objects_ia32) $(objects_common) -loc en-us.wxl | 91 $(Light) $(objects_ia32) $(objects_common) -loc en-us.wxl -sval |
| 84 | 92 |
| 85 # TODO: Don't ignore errors here (fix install paths) | 93 # 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" | 94 $(Installer_x64): $(objects_x64) $(objects_common) "..\build\ia32\$(Configuratio n)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll" |
| 87 -$(Light) $(objects_x64) $(objects_common) -loc en-us.wxl | 95 -$(Light) $(objects_x64) $(objects_common) -loc en-us.wxl |
| 88 | 96 |
| 89 #--------------------- | 97 #--------------------- |
| 90 # light .wixobj --> .exe | 98 # light .wixobj --> .exe |
| 91 #--------------------- | 99 #--------------------- |
| 92 | 100 |
| 93 $(Setup): $(object_setup) bootstrap-theme.xml bootstrap-theme.wxl | 101 $(Setup): $(object_setup) bootstrap-theme.xml bootstrap-theme.wxl |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 116 | 124 |
| 117 install-setup: $(Setup) | 125 install-setup: $(Setup) |
| 118 $(Setup) -log ..\build\setup.log | 126 $(Setup) -log ..\build\setup.log |
| 119 | 127 |
| 120 #--------------------- | 128 #--------------------- |
| 121 # Miscellaneous | 129 # Miscellaneous |
| 122 #--------------------- | 130 #--------------------- |
| 123 | 131 |
| 124 clean: | 132 clean: |
| 125 del $(objects_ia32) | 133 del $(objects_ia32) |
| OLD | NEW |
« no previous file with comments
|
« installer/Doxyfile ('k')
|
installer/adblockplusie.wxs » ('j')
|
installer/installer.gyp » ('J')
