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

Delta Between Two Patch Sets: WixInstaller/Makefile

Issue 10879048: Use minor upgrade mechanism for updates, set installer versionautomatically (Closed)
Left Patch Set: Added default version Created June 12, 2013, 9:37 a.m.
Right Patch Set: Looks like I misunderstood nmake documentation, previous change made settings VERSION parameter ext… Created June 12, 2013, 2:02 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« 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') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
18 !ifndef Configuration
17 Configuration = Release Test 19 Configuration = Release Test
20 !endif
21
22 !ifndef VERSION
18 VERSION = 99.9 23 VERSION = 99.9
24 !endif
19 25
20 #--------------------- 26 #---------------------
21 # Default Targets 27 # Default Targets
22 # 28 #
23 # We change the default rule depending upon the ARCH (architecture) definition. 29 # We change the default rule depending upon the ARCH (architecture) definition.
24 #--------------------- 30 #---------------------
25 31
26 Installer_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION)-en-us-ia32.msi 32 Installer_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION)-en-us-ia32.msi
27 Installer_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION)-en-us-x64.msi 33 Installer_x64 = $(Build_Dir_x64)adblockplusie-$(VERSION)-en-us-x64.msi
28 Setup = $(Build_Dir_common)setup-$(VERSION).exe 34 Setup = $(Build_Dir_common)setup-$(VERSION).exe
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 113
108 install-setup: $(Setup) 114 install-setup: $(Setup)
109 $(Setup) 115 $(Setup)
110 116
111 #--------------------- 117 #---------------------
112 # Miscellaneous 118 # Miscellaneous
113 #--------------------- 119 #---------------------
114 120
115 clean: 121 clean:
116 del $(objects_ia32) 122 del $(objects_ia32)
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld