| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 }, | 7 }, |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../../build/common.gypi', | 9 '../../build/common.gypi', |
| 10 ], | 10 ], |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 'msvs_cygwin_shell': 0, | 300 'msvs_cygwin_shell': 0, |
| 301 }, | 301 }, |
| 302 ], | 302 ], |
| 303 'direct_dependent_settings': { | 303 'direct_dependent_settings': { |
| 304 'include_dirs': [ | 304 'include_dirs': [ |
| 305 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', | 305 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings', |
| 306 ], | 306 ], |
| 307 }, | 307 }, |
| 308 }, | 308 }, |
| 309 { | 309 { |
| 310 'target_name': 'mini_installer', | |
| 311 'type': 'executable', | |
| 312 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7', | |
| 313 'dependencies': [ | |
| 314 '../chrome.gyp:chrome', | |
| 315 '../chrome.gyp:chrome_dll', | |
| 316 '../../testing/gtest.gyp:gtest', | |
| 317 'setup', | |
| 318 ], | |
| 319 'include_dirs': [ | |
| 320 '../..', | |
| 321 '<(PRODUCT_DIR)', | |
| 322 '<(INTERMEDIATE_DIR)', | |
| 323 ], | |
| 324 'sources': [ | |
| 325 'mini_installer/chrome.release', | |
| 326 'mini_installer/mini_installer.cc', | |
| 327 'mini_installer/mini_installer.h', | |
| 328 'mini_installer/mini_installer.ico', | |
| 329 'mini_installer/mini_installer.rc', | |
| 330 'mini_installer/mini_installer_exe_version.rc.version', | |
| 331 'mini_installer/mini_installer_resource.h', | |
| 332 'mini_installer/pe_resource.cc', | |
| 333 'mini_installer/pe_resource.h', | |
| 334 ], | |
| 335 'msvs_settings': { | |
| 336 'VCCLCompilerTool': { | |
| 337 'EnableIntrinsicFunctions': 'true', | |
| 338 'BufferSecurityCheck': 'false', | |
| 339 }, | |
| 340 'VCLinkerTool': { | |
| 341 'RandomizedBaseAddress': '1', | |
| 342 'DataExecutionPrevention': '0', | |
| 343 'AdditionalDependencies': [ | |
| 344 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', | |
| 345 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', | |
| 346 'shlwapi.lib', | |
| 347 ], | |
| 348 'AdditionalLibraryDirectories': | |
| 349 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib;<(PRODU
CT_DIR)/lib'], | |
| 350 'DelayLoadDLLs=': [], | |
| 351 'EntryPointSymbol': 'MainEntryPoint', | |
| 352 'GenerateMapFile': 'true', | |
| 353 'IgnoreAllDefaultLibraries': 'true', | |
| 354 'OptimizeForWindows98': '1', | |
| 355 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | |
| 356 }, | |
| 357 }, | |
| 358 'configurations': { | |
| 359 'Debug': { | |
| 360 'msvs_settings': { | |
| 361 'VCCLCompilerTool': { | |
| 362 'BasicRuntimeChecks': '0', | |
| 363 }, | |
| 364 }, | |
| 365 }, | |
| 366 'Release': { | |
| 367 'msvs_settings': { | |
| 368 'VCCLCompilerTool': { | |
| 369 'BasicRuntimeChecks': '0', | |
| 370 }, | |
| 371 }, | |
| 372 }, | |
| 373 }, | |
| 374 'rules': [ | |
| 375 { | |
| 376 'rule_name': 'mini_installer_version', | |
| 377 'extension': 'version', | |
| 378 'variables': { | |
| 379 'template_input_path': 'mini_installer/mini_installer_exe_versio
n.rc.version', | |
| 380 }, | |
| 381 'inputs': [ | |
| 382 '<(template_input_path)', | |
| 383 '<(version_path)', | |
| 384 '<(lastchange_path)', | |
| 385 '<(branding_dir)/BRANDING', | |
| 386 ], | |
| 387 'outputs': [ | |
| 388 '<(INTERMEDIATE_DIR)/mini_installer_exe_version.rc', | |
| 389 ], | |
| 390 'action': [ | |
| 391 'python', '<(version_py)', | |
| 392 '-f', '<(version_path)', | |
| 393 '-f', '<(lastchange_path)', | |
| 394 '-f', '<(branding_dir)/BRANDING', | |
| 395 '<(template_input_path)', | |
| 396 '<@(_outputs)', | |
| 397 ], | |
| 398 'process_outputs_as_sources': 1, | |
| 399 'message': 'Generating version information' | |
| 400 }, | |
| 401 { | |
| 402 'rule_name': 'installer_archive', | |
| 403 'extension': 'release', | |
| 404 'variables': { | |
| 405 'create_installer_archive_py_path': | |
| 406 '../tools/build/win/create_installer_archive.py', | |
| 407 }, | |
| 408 'inputs': [ | |
| 409 '<(create_installer_archive_py_path)', | |
| 410 '<(PRODUCT_DIR)/chrome.exe', | |
| 411 '<(PRODUCT_DIR)/chrome.dll', | |
| 412 '<(PRODUCT_DIR)/locales/en-US.dll', | |
| 413 '<(PRODUCT_DIR)/icudt38.dll', | |
| 414 ], | |
| 415 'outputs': [ | |
| 416 'xxx.out', | |
| 417 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | |
| 418 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | |
| 419 '<(PRODUCT_DIR)/setup.ex_', | |
| 420 '<(PRODUCT_DIR)/packed_files.txt', | |
| 421 ], | |
| 422 'action': [ | |
| 423 'python', | |
| 424 '<(create_installer_archive_py_path)', | |
| 425 '--output_dir=<(PRODUCT_DIR)', | |
| 426 '--input_file=<(RULE_INPUT_PATH)', | |
| 427 # TODO(sgk): may just use environment variables | |
| 428 #'--distribution=$(CHROMIUM_BUILD)', | |
| 429 '--distribution=_google_chrome', | |
| 430 ], | |
| 431 'message': 'Create installer archive' | |
| 432 }, | |
| 433 ], | |
| 434 # TODO(mark): <(branding_dir) should be defined by the | |
| 435 # global condition block at the bottom of the file, but | |
| 436 # this doesn't work due to the following issue: | |
| 437 # | |
| 438 # http://code.google.com/p/gyp/issues/detail?id=22 | |
| 439 # | |
| 440 # Remove this block once the above issue is fixed. | |
| 441 'conditions': [ | |
| 442 [ 'branding == "Chrome"', { | |
| 443 'variables': { | |
| 444 'branding_dir': '../app/theme/google_chrome', | |
| 445 }, | |
| 446 }, { # else branding!="Chrome" | |
| 447 'variables': { | |
| 448 'branding_dir': '../app/theme/chromium', | |
| 449 }, | |
| 450 }], | |
| 451 ], | |
| 452 }, | |
| 453 { | |
| 454 'target_name': 'mini_installer_test', | 310 'target_name': 'mini_installer_test', |
| 455 'type': 'executable', | 311 'type': 'executable', |
| 456 'msvs_guid': '4B6E199A-034A-49BD-AB93-458DD37E45B1', | 312 'msvs_guid': '4B6E199A-034A-49BD-AB93-458DD37E45B1', |
| 457 'dependencies': [ | 313 'dependencies': [ |
| 458 'installer_util', | 314 'installer_util', |
| 459 '../../base/base.gyp:base', | 315 '../../base/base.gyp:base', |
| 460 '../../testing/gtest.gyp:gtest', | 316 '../../testing/gtest.gyp:gtest', |
| 461 ], | 317 ], |
| 462 'include_dirs': [ | 318 'include_dirs': [ |
| 463 '../..', | 319 '../..', |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 'variables': { | 474 'variables': { |
| 619 'branding_dir': '../app/theme/google_chrome', | 475 'branding_dir': '../app/theme/google_chrome', |
| 620 }, | 476 }, |
| 621 }, { # else branding!="Chrome" | 477 }, { # else branding!="Chrome" |
| 622 'variables': { | 478 'variables': { |
| 623 'branding_dir': '../app/theme/chromium', | 479 'branding_dir': '../app/theme/chromium', |
| 624 }, | 480 }, |
| 625 }], | 481 }], |
| 626 ], | 482 ], |
| 627 } | 483 } |
| OLD | NEW |