Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: chrome/SConscript

Issue 19683: Create a stub chrome executable that crashes when run. (Closed)
Patch Set: rebase Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/idle_timer_none.cc ('k') | chrome/app/chrome_exe_main.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 6
7 Import(['env']) 7 Import(['env'])
8 8
9 env_res = env.Clone() 9 env_res = env.Clone()
10 env_test = env.Clone() 10 env_test = env.Clone()
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 env_dll.Prepend( 136 env_dll.Prepend(
137 CPPPATH = [ 137 CPPPATH = [
138 "..", 138 "..",
139 ], 139 ],
140 CPPDEFINES = [ 140 CPPDEFINES = [
141 'U_STATIC_IMPLEMENTATION', 141 'U_STATIC_IMPLEMENTATION',
142 'PNG_USER_CONFIG', 142 'PNG_USER_CONFIG',
143 'CHROME_PNG_WRITE_SUPPORT', 143 'CHROME_PNG_WRITE_SUPPORT',
144 'LIBXSLT_STATIC', 144 'LIBXSLT_STATIC',
145 'LIBXML_STATIC', 145 'LIBXML_STATIC',
146 '_WINDLL',
147 'BROWSER_DLL',
148 'RENDERER_DLL',
149 'PLUGIN_DLL',
150 ],
151 CCFLAGS = [
152 '/TP',
153 '/Wp64',
154 ], 146 ],
155 ) 147 )
156 148
157 env_dll.Append( 149 env_dll.Append(
158 CPPPATH = [ 150 CPPPATH = [
159 '$CHROME_DIR/app', 151 '$CHROME_DIR/app',
160 '$LIBPNG_DIR', 152 '$LIBPNG_DIR',
161 '$SKIA_DIR/include', 153 '$SKIA_DIR/include',
162 '$SKIA_DIR/include/corecg', 154 '$SKIA_DIR/include/corecg',
163 '$SKIA_DIR/platform', 155 '$SKIA_DIR/platform',
(...skipping 11 matching lines...) Expand all
175 'net', 167 'net',
176 'skia', 168 'skia',
177 'bzip2', 169 'bzip2',
178 'libjpeg', 170 'libjpeg',
179 'libpng', 171 'libpng',
180 'libxml', 172 'libxml',
181 'libxslt', 173 'libxslt',
182 'modp_b64', 174 'modp_b64',
183 'zlib', 175 'zlib',
184 176
185 'activex_shim',
186 'WTF', 177 'WTF',
187 'V8Bindings', 178 'V8Bindings',
188 'WebCore', 179 'WebCore',
189 'default_plugin', 180 'default_plugin',
190 'glue', 181 'glue',
191 'JavaScriptCore_pcre', 182 'JavaScriptCore_pcre',
192 'port', 183 'port',
193 184
194 'browser', 185 'browser',
195 'browser_views', 186 'browser_views',
196 'debugger', 187 'debugger',
197 'common', 188 'common',
198 'util', 189 'util',
199 #'jscre',
200 'plugin', 190 'plugin',
201 'renderer', 191 'renderer',
202 'hunspell', 192 'hunspell',
203 # TODO(sgk): Windows doesn't use libevent, revisit when Linux gets here 193 'sdch',
204 #'libevent',
205 'sqlite', 194 'sqlite',
206 'views', 195 'views',
207 'v8_snapshot', 196 'v8_snapshot',
208 ], 197 ],
209 ) 198 )
210 199
211 if env_dll.Bit('windows'): 200 if env_dll.Bit('windows'):
212 env_dll.Append( 201 env_dll.Append(
202 CCFLAGS = [
203 '/TP',
204 '/Wp64',
205 ],
206 CPPDEFINES = [
207 '_WINDLL',
208 'CHROME_DLL',
209 'BROWSER_DLL',
210 'RENDERER_DLL',
211 'PLUGIN_DLL',
212 ],
213 LIBS = [ 213 LIBS = [
214 # TODO(sgk): to be ported to Mac and Linux 214 'activex_shim',
215 'sdch',
216 215
217 #'comctl32.lib', 216 #'comctl32.lib',
218 #'dwmapi.lib', 217 #'dwmapi.lib',
219 #'rpcrt4.lib', 218 #'rpcrt4.lib',
220 #'shlwapi.lib', 219 #'shlwapi.lib',
221 #'winmm.lib', 220 #'winmm.lib',
222 #'wsock32.lib', 221 #'wsock32.lib',
223 222
224 'Urlmon', 223 'Urlmon',
225 ], 224 ],
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 '$WEBKIT_DIR/glue/resources/row_resize.cur', 280 '$WEBKIT_DIR/glue/resources/row_resize.cur',
282 '$WEBKIT_DIR/glue/resources/vertical_text.cur', 281 '$WEBKIT_DIR/glue/resources/vertical_text.cur',
283 Derived(env_dll.File('$TARGET_ROOT/' 282 Derived(env_dll.File('$TARGET_ROOT/'
284 + 'grit_derived_sources/webkit_resources.rc')), 283 + 'grit_derived_sources/webkit_resources.rc')),
285 '$WEBKIT_DIR/glue/resources/zoom_in.cur', 284 '$WEBKIT_DIR/glue/resources/zoom_in.cur',
286 '$WEBKIT_DIR/glue/resources/zoom_out.cur', 285 '$WEBKIT_DIR/glue/resources/zoom_out.cur',
287 ]), 286 ]),
288 'app/chrome_dll_main.cc', 287 'app/chrome_dll_main.cc',
289 ]) 288 ])
290 289
291 # TODO(port)
292 if env_dll.Bit('windows'): 290 if env_dll.Bit('windows'):
293 additional = [ 291 additional = [
294 '$V8_DIR/snapshot-empty$OBJSUFFIX' 292 '$V8_DIR/snapshot-empty$OBJSUFFIX'
295 ] 293 ]
296 dll_targets = env_dll.ChromeSharedLibrary('app/chrome_dll/chrome', 294 dll_targets = env_dll.ChromeSharedLibrary('app/chrome_dll/chrome',
297 #dll_resources + input_files, 295 #dll_resources + input_files,
298 input_files + additional, 296 input_files + additional,
299 PDB='chrome_dll.pdb') 297 PDB='chrome_dll.pdb')
300 install_targets.extend(dll_targets) 298 install_targets.extend(dll_targets)
301 299
(...skipping 16 matching lines...) Expand all
318 316
319 chrome_exe_version_res = env_res.RES(chrome_exe_version_rc) 317 chrome_exe_version_res = env_res.RES(chrome_exe_version_rc)
320 chrome_dll_version_res = env_res.RES(chrome_dll_version_rc) 318 chrome_dll_version_res = env_res.RES(chrome_dll_version_rc)
321 319
322 install_targets.extend(chrome_exe_version_rc) 320 install_targets.extend(chrome_exe_version_rc)
323 install_targets.extend(chrome_exe_version_res) 321 install_targets.extend(chrome_exe_version_res)
324 322
325 install_targets.extend(chrome_dll_version_rc) 323 install_targets.extend(chrome_dll_version_rc)
326 install_targets.extend(chrome_dll_version_res) 324 install_targets.extend(chrome_dll_version_res)
327 325
326 if env_dll.Bit('linux'):
327 input_files = [
328 'app/chrome_dll_main.cc',
329 'app/chrome_exe_main_gtk.cc',
330 ]
331
332 env_dll.Append(
333 LIBS = [
334 'event',
335 ]
336 )
337 chrome = env_dll.ChromeProgram('app/chrome', input_files)
338
339
328 p = env.ChromeMSVSProject('app/chrome_dll.vcproj', 340 p = env.ChromeMSVSProject('app/chrome_dll.vcproj',
329 dest='$CHROME_SRC_DIR/chrome/app/chrome_dll.vcproj', 341 dest='$CHROME_SRC_DIR/chrome/app/chrome_dll.vcproj',
330 guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}', 342 guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}',
331 keyword='Win32Proj', 343 keyword='Win32Proj',
332 dependencies = [ 344 dependencies = [
333 '$BASE_DIR/build/base.vcproj', 345 '$BASE_DIR/build/base.vcproj',
334 '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', 346 '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
335 '$CHROME_DIR/plugin/plugin.vcproj', 347 '$CHROME_DIR/plugin/plugin.vcproj',
336 '$LIBJPEG_DIR/libjpeg.vcproj', 348 '$LIBJPEG_DIR/libjpeg.vcproj',
337 '$BZIP2_DIR/bzip2.vcproj', 349 '$BZIP2_DIR/bzip2.vcproj',
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 'common/chrome_switches$OBJSUFFIX', 522 'common/chrome_switches$OBJSUFFIX',
511 'app/client_util.cc', 523 'app/client_util.cc',
512 'app/client_util.h', 524 'app/client_util.h',
513 'common/env_vars$OBJSUFFIX', 525 'common/env_vars$OBJSUFFIX',
514 'common/env_vars.h', 526 'common/env_vars.h',
515 'app/google_update_client.cc', 527 'app/google_update_client.cc',
516 'app/google_update_client.h', 528 'app/google_update_client.h',
517 'app/result_codes.h', 529 'app/result_codes.h',
518 ]) 530 ])
519 531
520 # TODO(port) 532 # We only use a separate exe/dll on Windows.
521 if env.Bit('windows'): 533 if env.Bit('windows'):
522 chrome_exe = env_exe.ChromeProgram('chrome_exe/chrome', input_files) 534 chrome_exe = env_exe.ChromeProgram('chrome_exe/chrome', input_files)
523 535
524 install_targets.append(chrome_exe[0]) 536 install_targets.append(chrome_exe[0])
525 537
526 env.Requires('$DESTINATION_ROOT/chrome.exe', 538 env.Requires('$DESTINATION_ROOT/chrome.exe',
527 ['$DESTINATION_ROOT/chrome.dll', 539 ['$DESTINATION_ROOT/chrome.dll',
528 '$DESTINATION_ROOT/icudt38.dll', 540 '$DESTINATION_ROOT/icudt38.dll',
529 '$DESTINATION_ROOT/rlz.dll', 541 '$DESTINATION_ROOT/rlz.dll',
530 '$DESTINATION_ROOT/First Run', 542 '$DESTINATION_ROOT/First Run',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 ] 776 ]
765 777
766 # TODO(port) 778 # TODO(port)
767 if env.Bit('windows'): 779 if env.Bit('windows'):
768 env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins) 780 env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins)
769 781
770 env.Command('$DESTINATION_ROOT/resources/inspector', 782 env.Command('$DESTINATION_ROOT/resources/inspector',
771 '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end', 783 '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end',
772 Copy('$TARGET', '$SOURCE'), 784 Copy('$TARGET', '$SOURCE'),
773 source_scanner=DirScanner) 785 source_scanner=DirScanner)
OLDNEW
« no previous file with comments | « base/idle_timer_none.cc ('k') | chrome/app/chrome_exe_main.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698