installer/Makefile - Issue 4660775054475264: Issue #1222 - make sure the installer version is set correctly

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: installer/Makefile

Issue 4660775054475264: Issue #1222 - make sure the installer version is set correctly (Closed)

Patch Set: Created Nov. 27, 2014, 1:15 a.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 | « build_release.py ('k') | no next file » | no next file with comments »

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

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

3 #	3 #

4 # Argument: VERSION	4 # Argument: VERSION

5 # Version number to incorporate into the file names of targets	5 # Version number to incorporate into the file names of targets

6 # Defaults to 99.9 if not specified.	6 # Defaults to 99.9 if not specified.

7 #	7 #

8 # Target: ia32	8 # Target: ia32

9 # Release version of the multilanguage, 32-bit MSI	9 # Release version of the multilanguage, 32-bit MSI

10 # File name = adblockplusie-VERSION-multilanguage-ia32.msi	10 # File name = adblockplusie-VERSION-multilanguage-ia32.msi

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66	66

67 #	67 #

68 # NMAKE has no way of specifying that these MSBuild rules have their own	68 # NMAKE has no way of specifying that these MSBuild rules have their own

69 # dependencies and thus should be considered the moral equivalent of part of the	69 # dependencies and thus should be considered the moral equivalent of part of the

70 # Makefile. For -a (all) builds, this isn't a problem. For incremental builds,	70 # Makefile. For -a (all) builds, this isn't a problem. For incremental builds,

71 # use the 'clean-*' targets below to delete the MSBuild outputs. This forces an	71 # use the 'clean-*' targets below to delete the MSBuild outputs. This forces an

72 # invocation of MSBuild because its targets are absent. The last step of the	72 # invocation of MSBuild because its targets are absent. The last step of the

73 # MSBuild process is a file copy, so it's not expensive to clean and build.	73 # MSBuild process is a file copy, so it's not expensive to clean and build.

74 #	74 #

75 $(Build_Dir_ia32)installer.sln $(Build_Dir_x64)installer.sln:	75 $(Build_Dir_ia32)installer.sln $(Build_Dir_x64)installer.sln:

76 createsolutions.bat	76 createsolutions.bat $(VERSION)

77	77

78 $(MSBuild_Output_ia32): $(Build_Dir_ia32)installer.sln	78 $(MSBuild_Output_ia32): $(Build_Dir_ia32)installer.sln

79 msbuild /p:Configuration=Release $(Build_Dir_ia32)installer.sln	79 msbuild /p:Configuration=Release $(Build_Dir_ia32)installer.sln

80	80

81 $(MSBuild_Output_x64): $(Build_Dir_x64)installer.sln	81 $(MSBuild_Output_x64): $(Build_Dir_x64)installer.sln

82 msbuild /p:Configuration=Release $(Build_Dir_x64)installer.sln	82 msbuild /p:Configuration=Release $(Build_Dir_x64)installer.sln

83	83

84 $(Installer_ia32_msi): $(MSBuild_Output_ia32)	84 $(Installer_ia32_msi): $(MSBuild_Output_ia32)

85 copy $(MSBuild_Output_ia32) $(Installer_ia32_msi)	85 copy $(MSBuild_Output_ia32) $(Installer_ia32_msi)

86	86

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129 # 7-Zip can't help but store directories (no command line switch to do otherwise ).	129 # 7-Zip can't help but store directories (no command line switch to do otherwise ).

130 #	130 #

131 $(Installer_ia32_exe): $(Installer_ia32_msi) $(Source_Dir_setup)self-extract-con fig-ia32.txt	131 $(Installer_ia32_exe): $(Installer_ia32_msi) $(Source_Dir_setup)self-extract-con fig-ia32.txt

132 cd $(Build_Dir_ia32) & 7z a -t7z $(Installer_ia32_name).7z ..\..\$(MSBuild_O utput_ia32)	132 cd $(Build_Dir_ia32) & 7z a -t7z $(Installer_ia32_name).7z ..\..\$(MSBuild_O utput_ia32)

133 copy /b $(Source_Dir_setup)7zS.sfx + $(Source_Dir_setup)self-extract-config- ia32.txt + $(Installer_ia32_archive) $(Installer_ia32_exe)	133 copy /b $(Source_Dir_setup)7zS.sfx + $(Source_Dir_setup)self-extract-config- ia32.txt + $(Installer_ia32_archive) $(Installer_ia32_exe)

134	134

135 $(Installer_x64_exe): $(Installer_x64_msi) $(Source_Dir_setup)self-extract-confi g-x64.txt	135 $(Installer_x64_exe): $(Installer_x64_msi) $(Source_Dir_setup)self-extract-confi g-x64.txt

136 cd $(Build_Dir_x64) & 7z a -t7z $(Installer_x64_name).7z ..\..\$(MSBuild_Out put_x64)	136 cd $(Build_Dir_x64) & 7z a -t7z $(Installer_x64_name).7z ..\..\$(MSBuild_Out put_x64)

137 copy /b $(Source_Dir_setup)7zS.sfx + $(Source_Dir_setup)self-extract-config- x64.txt + $(Installer_x64_archive) $(Installer_x64_exe)	137 copy /b $(Source_Dir_setup)7zS.sfx + $(Source_Dir_setup)self-extract-config- x64.txt + $(Installer_x64_archive) $(Installer_x64_exe)

138	138

OLD	NEW