installer/Makefile - Issue 11258006: Bootstrapper

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 11258006: Bootstrapper (Closed)

Patch Set: Created July 25, 2013, 9:47 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

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 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 $(Candle) -arch x64	70 $(Candle) -arch x64

71	71

72 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj	72 object_setup = $(Build_Dir_common)setup-$(VERSION).wixobj

73 $(object_setup): setup.wxs	73 $(object_setup): setup.wxs

74 $(Candle) -ext WixBalExtension	74 $(Candle) -ext WixBalExtension

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 -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) -loc en-us.wxl

84	84

85 $(Installer_x64): $(objects_x64) $(objects_common) "..\build\ia32\$(Configuratio n)\AdblockPlus.dll" "..\build\x64\$(Configuration)\AdblockPlus.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) -loc en-us.wxl

87	87

88 #---------------------	88 #---------------------

89 # light .wixobj --> .exe	89 # light .wixobj --> .exe

90 #---------------------	90 #---------------------

91	91

92 $(Setup): $(object_setup)	92 $(Setup): $(object_setup) bootstrap-theme.xml bootstrap-theme.wxl

93 $(Light) $(object_setup) -ext WixBalExtension	93 $(Light) $(object_setup) -ext WixBalExtension -loc bootstrap-theme.wxl

94	94

95 #---------------------	95 #---------------------

96 # msiexec .msi --> installed --> uninstalled	96 # msiexec .msi --> installed --> uninstalled

97 #---------------------	97 #---------------------

98	98

99 install-ia32: $(Installer_ia32)	99 install-ia32: $(Installer_ia32)

100 call <<nmake_temporary.bat	100 call <<nmake_temporary.bat

101 pushd $(Build_Dir_ia32)	101 pushd $(Build_Dir_ia32)

102 msiexec /i $(*F) /lv install.log	102 msiexec /i $(*F) /lv install.log

103 popd	103 popd

104 <<	104 <<

105	105

106 install-x64: $(Installer_x64)	106 install-x64: $(Installer_x64)

107 call <<nmake_temporary.bat	107 call <<nmake_temporary.bat

108 pushd $(Build_Dir_x64)	108 pushd $(Build_Dir_x64)

109 msiexec /i $(*F) /lv install.log	109 msiexec /i $(*F) /lv install.log

110 popd	110 popd

111 <<	111 <<

112	112

113 uninstall:	113 uninstall:

114 msiexec /x {4f27c814-5ee0-4b25-b3ab-3ad565551918}	114 msiexec /x {4f27c814-5ee0-4b25-b3ab-3ad565551918}

115	115

116 install-setup: $(Setup)	116 install-setup: $(Setup)

117 $(Setup)	117 $(Setup) -log ..\build\setup.log

118	118

119 #---------------------	119 #---------------------

120 # Miscellaneous	120 # Miscellaneous

121 #---------------------	121 #---------------------

122	122

123 clean:	123 clean:

124 del $(objects_ia32)	124 del $(objects_ia32)

OLD	NEW

« installer/1031/bootstrap-theme.wxl ('K') | « installer/1031/bootstrap-theme.wxl ('k') | installer/abp-64.png » ('j') | installer/bootstrap-theme.wxl » ('J')