| 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 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
| 8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
| 9 }, | 9 }, |
| 10 'includes': [ | 10 'includes': [ |
| 11 '../../build/win_precompile.gypi', | 11 '../../build/win_precompile.gypi', |
| 12 ], | 12 ], |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 ['OS=="win"', { | 14 ['OS=="win"', { |
| 15 'target_defaults': { | 15 'target_defaults': { |
| 16 'dependencies': [ | 16 'dependencies': [ |
| 17 '../chrome.gyp:chrome', | 17 '../chrome.gyp:chrome', |
| 18 '../chrome.gyp:chrome_nacl_win64', | 18 '../chrome.gyp:chrome_nacl_win64', |
| 19 '../chrome.gyp:chrome_dll', | 19 '../chrome.gyp:chrome_dll', |
| 20 '../chrome.gyp:default_extensions', | 20 '../chrome.gyp:default_extensions', |
| 21 '../chrome.gyp:setup', | 21 '../chrome.gyp:setup', |
| 22 ], | 22 ], |
| 23 'include_dirs': [ | 23 'include_dirs': [ |
| 24 '../..', | 24 '../..', |
| 25 '<(PRODUCT_DIR)', | |
| 26 '<(INTERMEDIATE_DIR)', | 25 '<(INTERMEDIATE_DIR)', |
| 27 '<(SHARED_INTERMEDIATE_DIR)/chrome', | 26 '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 28 ], | 27 ], |
| 29 'sources': [ | 28 'sources': [ |
| 30 'mini_installer/appid.h', | 29 'mini_installer/appid.h', |
| 31 'mini_installer/configuration.cc', | 30 'mini_installer/configuration.cc', |
| 32 'mini_installer/configuration.h', | 31 'mini_installer/configuration.h', |
| 33 'mini_installer/decompress.cc', | 32 'mini_installer/decompress.cc', |
| 34 'mini_installer/decompress.h', | 33 'mini_installer/decompress.h', |
| 35 'mini_installer/mini_installer.cc', | 34 'mini_installer/mini_installer.cc', |
| 36 'mini_installer/mini_installer.h', | 35 'mini_installer/mini_installer.h', |
| 37 'mini_installer/mini_installer.ico', | 36 'mini_installer/mini_installer.ico', |
| 38 'mini_installer/mini_installer.rc', | 37 'mini_installer/mini_installer.rc', |
| 39 'mini_installer/mini_installer_exe_version.rc.version', | 38 'mini_installer/mini_installer_exe_version.rc.version', |
| 40 'mini_installer/mini_installer_resource.h', | 39 'mini_installer/mini_installer_resource.h', |
| 41 'mini_installer/mini_string.cc', | 40 'mini_installer/mini_string.cc', |
| 42 'mini_installer/mini_string.h', | 41 'mini_installer/mini_string.h', |
| 43 'mini_installer/pe_resource.cc', | 42 'mini_installer/pe_resource.cc', |
| 44 'mini_installer/pe_resource.h', | 43 'mini_installer/pe_resource.h', |
| 44 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 45 ], | 45 ], |
| 46 'msvs_settings': { | 46 'msvs_settings': { |
| 47 'VCCLCompilerTool': { | 47 'VCCLCompilerTool': { |
| 48 'EnableIntrinsicFunctions': 'true', | 48 'EnableIntrinsicFunctions': 'true', |
| 49 'BufferSecurityCheck': 'false', | 49 'BufferSecurityCheck': 'false', |
| 50 'BasicRuntimeChecks': '0', | 50 'BasicRuntimeChecks': '0', |
| 51 'ExceptionHandling': '0', | 51 'ExceptionHandling': '0', |
| 52 }, | 52 }, |
| 53 'VCLinkerTool': { | 53 'VCLinkerTool': { |
| 54 'RandomizedBaseAddress': '1', | 54 'RandomizedBaseAddress': '1', |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 202 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 203 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 203 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 204 '<(PRODUCT_DIR)/locales/en-US.pak', | 204 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 205 '<(PRODUCT_DIR)/icudt.dll', | 205 '<(PRODUCT_DIR)/icudt.dll', |
| 206 ], | 206 ], |
| 207 'outputs': [ | 207 'outputs': [ |
| 208 'xxx.out', | 208 'xxx.out', |
| 209 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | 209 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', |
| 210 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | 210 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', |
| 211 '<(PRODUCT_DIR)/setup.ex_', | 211 '<(PRODUCT_DIR)/setup.ex_', |
| 212 '<(PRODUCT_DIR)/packed_files.txt', | 212 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 213 ], | 213 ], |
| 214 'action': [ | 214 'action': [ |
| 215 'python', | 215 'python', |
| 216 '<(create_installer_archive_py_path)', | 216 '<(create_installer_archive_py_path)', |
| 217 '--output_dir=<(PRODUCT_DIR)', | 217 '--build_dir', '<(PRODUCT_DIR)', |
| 218 '--input_file=<(RULE_INPUT_PATH)', | 218 '--staging_dir', '<(INTERMEDIATE_DIR)', |
| 219 '--input_file', '<(RULE_INPUT_PATH)', |
| 220 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 219 # TODO(sgk): may just use environment variables | 221 # TODO(sgk): may just use environment variables |
| 220 #'--distribution=$(CHROMIUM_BUILD)', | 222 #'--distribution=$(CHROMIUM_BUILD)', |
| 221 '--distribution=_google_chrome', | 223 '--distribution=_google_chrome', |
| 222 # Optional arguments to generate diff installer | 224 # Optional arguments to generate diff installer |
| 223 #'--last_chrome_installer=C:/Temp/base', | 225 #'--last_chrome_installer=C:/Temp/base', |
| 224 #'--setup_exe_format=DIFF', | 226 #'--setup_exe_format=DIFF', |
| 225 #'--diff_algorithm=COURGETTE', | 227 #'--diff_algorithm=COURGETTE', |
| 226 ], | 228 ], |
| 227 'message': 'Create installer archive' | 229 'message': 'Create installer archive' |
| 228 }, | 230 }, |
| 229 ], | 231 ], |
| 230 }, | 232 }, |
| 231 ], | 233 ], |
| 232 }], | 234 }], |
| 233 [ 'branding == "Chrome"', { | 235 [ 'branding == "Chrome"', { |
| 234 'variables': { | 236 'variables': { |
| 235 'branding_dir': '../app/theme/google_chrome', | 237 'branding_dir': '../app/theme/google_chrome', |
| 236 }, | 238 }, |
| 237 }, { # else branding!="Chrome" | 239 }, { # else branding!="Chrome" |
| 238 'variables': { | 240 'variables': { |
| 239 'branding_dir': '../app/theme/chromium', | 241 'branding_dir': '../app/theme/chromium', |
| 240 }, | 242 }, |
| 241 }], | 243 }], |
| 242 ], | 244 ], |
| 243 } | 245 } |
| OLD | NEW |