adblockplus.gyp - Issue 11521026: initial custom action library, "hello, world" quality

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: adblockplus.gyp

Issue 11521026: initial custom action library, "hello, world" quality (Closed)

Patch Set: Created Sept. 3, 2013, 12:48 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 'includes': ['defaults.gypi'],	2 'includes': ['defaults.gypi'],

3	3

4 'variables': {	4 'variables': {

5 'build_type%': 'devbuild',	5 'build_type%': 'devbuild',

6 'build_version%': '',	6 'build_version%': '',

7 'shared_files': [	7 'shared_files': [

8 'src/shared/AutoHandle.cpp',	8 'src/shared/AutoHandle.cpp',

9 'src/shared/Communication.cpp',	9 'src/shared/Communication.cpp',

10 'src/shared/Dictionary.cpp',	10 'src/shared/Dictionary.cpp',

(...skipping 147 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 'defines': ['WINVER=0x0501'],	158 'defines': ['WINVER=0x0501'],

159 'link_settings': {	159 'link_settings': {

160 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],	160 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],

161 },	161 },

162 'msvs_settings': {	162 'msvs_settings': {

163 'VCLinkerTool': {	163 'VCLinkerTool': {

164 'SubSystem': '1', # Console	164 'SubSystem': '1', # Console

165 'EntryPointSymbol': 'mainCRTStartup',	165 'EntryPointSymbol': 'mainCRTStartup',

166 },	166 },

167 },	167 },

168 }]	168 },
	Felix Dahlke 2013/09/06 16:59:03 I'd rather see this custom action code elsewhere, I'd rather see this custom action code elsewhere, not in src. Likewise, I'd rather see the target in a separate GYP file. How about something like this? /installer/ca/ca.gyp /installer/ca/src/abp_ca.cpp ... Or maybe a fancier name: /installer/abp_wix_util Naming's up to you.
	169

	170 #############

	171 # Custom Action library for the installer

	172 #############

	173 {

	174 'target_name': 'installer-ca',

	175 'type': 'shared_library',

	176 'sources': [

	177 'src/installer-ca/abp_ca.cpp',

	178 'src/installer-ca/abp_ca.def',

	179 'src/installer-ca/abp_ca.rc',

	180 'src/installer-ca/caSuffix.h',

	181 'src/installer-ca/close_application.cpp',

	182 'src/installer-ca/cost.h',

	183 'src/installer-ca/precomp.h',

	184 'src/installer-ca/wcalog.cpp',

	185 'src/installer-ca/wcalog.h',

	186 'src/installer-ca/wcautil.cpp',

	187 'src/installer-ca/wcautil.h',

	188 'src/installer-ca/wcawrap.cpp',

	189 #

	190 # From src/dutil

	191 #

	192 'src/installer-ca/dutil/dutil.cpp',

	193 'src/installer-ca/dutil/dutil.h',

	194 'src/installer-ca/dutil/fileutil.cpp',

	195 'src/installer-ca/dutil/fileutil.h',

	196 'src/installer-ca/dutil/memutil.cpp',

	197 'src/installer-ca/dutil/memutil.h',

	198 'src/installer-ca/dutil/procutil.cpp',

	199 'src/installer-ca/dutil/proc2utl.cpp',

	200 'src/installer-ca/dutil/procutil.h',

	201 'src/installer-ca/dutil/strutil.cpp',

	202 'src/installer-ca/dutil/strutil.h',

	203 ],

	204 'link_settings': {

	205 'libraries': [ 'user32.lib', 'Shell32.lib', 'advapi32.lib', 'msi.lib', 'Ve rsion.lib' ]

	206 },

	207 'msvs_settings': {

	208 'VCLinkerTool': {

	209 }

	210 }

	211 },

	212 ]

169 }	213 }

OLD	NEW

« no previous file with comments | « no previous file | installer/adblockplusie.wxs » ('j') | installer/adblockplusie.wxs » ('J')