Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: installer/Makefile

Issue 10945039: Switch to gyp (Closed)
Patch Set: Final version Created June 21, 2013, 2:16 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
« no previous file with comments | « defaults.gypi ('k') | installer/adblockplusie.wxs » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #----------------------------------
11 11
12 .SUFFIXES: .msi .wixobj .wxs 12 .SUFFIXES: .msi .wixobj .wxs
13 13
14 Build_Dir_common = ..\build\ # 14 Build_Dir_common = ..\build\ #
15 Build_Dir_ia32 = ..\build\ia32\ # comment prevents newline 15 Build_Dir_ia32 = ..\build\ia32\ # comment prevents newline
16 Build_Dir_x64 = ..\build\x64\ # 16 Build_Dir_x64 = ..\build\x64\ #
17 17
18 !ifndef Configuration 18 !ifndef Configuration
19 Configuration = Release Test 19 Configuration = Release
20 !endif 20 !endif
21 21
22 !ifndef VERSION 22 !ifndef VERSION
23 VERSION = 99.9 23 VERSION = 99.9
24 !endif 24 !endif
25 25
26 #--------------------- 26 #---------------------
27 # Default Targets 27 # Default Targets
28 # 28 #
29 # We change the default rule depending upon the ARCH (architecture) definition. 29 # We change the default rule depending upon the ARCH (architecture) definition.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 #--------------------- 76 #---------------------
77 # light .wixobj --> .msi 77 # light .wixobj --> .msi
78 #--------------------- 78 #---------------------
79 79
80 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@ 80 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@
81 81
82 $(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configurat ion)\AdblockPlus.dll" 82 $(Installer_ia32): $(objects_ia32) $(objects_common) "..\build\ia32\$(Configurat ion)\AdblockPlus.dll"
83 $(Light) $(objects_ia32) $(objects_common) 83 $(Light) $(objects_ia32) $(objects_common)
84 84
85 $(Installer_x64): $(objects_x64) $(objects_common) "..\build\x64\$(Configuration )\AdblockPlusx64.dll" 85 $(Installer_x64): $(objects_x64) $(objects_common) "..\build\ia32\$(Configuratio n)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.dll"
86 $(Light) $(objects_x64) $(objects_common) 86 $(Light) $(objects_x64) $(objects_common)
87 87
88 #--------------------- 88 #---------------------
89 # light .wixobj --> .exe 89 # light .wixobj --> .exe
90 #--------------------- 90 #---------------------
91 91
92 $(Setup): $(object_setup) 92 $(Setup): $(object_setup)
93 $(Light) $(object_setup) -ext WixBalExtension 93 $(Light) $(object_setup) -ext WixBalExtension
94 94
95 #--------------------- 95 #---------------------
(...skipping 19 matching lines...) Expand all
115 115
116 install-setup: $(Setup) 116 install-setup: $(Setup)
117 $(Setup) 117 $(Setup)
118 118
119 #--------------------- 119 #---------------------
120 # Miscellaneous 120 # Miscellaneous
121 #--------------------- 121 #---------------------
122 122
123 clean: 123 clean:
124 del $(objects_ia32) 124 del $(objects_ia32)
OLDNEW
« no previous file with comments | « defaults.gypi ('k') | installer/adblockplusie.wxs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld