Chromium Code Reviews| 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': [ |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 168 'variables': { | 168 'variables': { |
| 169 'branding_dir': '../app/theme/chromium', | 169 'branding_dir': '../app/theme/chromium', |
| 170 }, | 170 }, |
| 171 }], | 171 }], |
| 172 ], | 172 ], |
| 173 }, | 173 }, |
| 174 'targets': [ | 174 'targets': [ |
| 175 { | 175 { |
| 176 'target_name': 'mini_installer', | 176 'target_name': 'mini_installer', |
| 177 'type': 'executable', | 177 'type': 'executable', |
| 178 'configurations': { | |
| 179 'Debug': { | |
| 180 # Disable precompiled headers for this project, to avoid | |
| 181 # linker errors when building with VS 2008. | |
| 182 # | |
| 183 # Note that putting this in the 'target_defaults' | |
| 184 # section earlier in the file does not successfully | |
| 185 # override the 'target_defaults' brought in by the | |
| 186 # build/win_precompile.gypi file, so the overriding | |
| 187 # needs to be done here, directly in the mini_installer | |
| 188 # target. | |
| 189 'msvs_precompiled_header': '', | |
| 190 'msvs_precompiled_source': '', | |
| 191 }, | |
| 192 }, | |
| 178 'sources': [ | 193 'sources': [ |
| 179 'mini_installer/chrome.release', | 194 'mini_installer/chrome.release', |
| 180 'mini_installer/chrome_appid.cc', | 195 'mini_installer/chrome_appid.cc', |
| 181 ], | 196 ], |
| 182 'rules': [ | 197 'rules': [ |
| 183 { | 198 { |
| 184 'rule_name': 'installer_archive', | 199 'rule_name': 'installer_archive', |
| 185 'extension': 'release', | 200 'extension': 'release', |
| 186 'variables': { | 201 'variables': { |
| 187 'create_installer_archive_py_path': | 202 'create_installer_archive_py_path': |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 201 'outputs': [ | 216 'outputs': [ |
| 202 'xxx.out', | 217 'xxx.out', |
| 203 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | 218 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', |
| 204 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | 219 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', |
| 205 '<(PRODUCT_DIR)/setup.ex_', | 220 '<(PRODUCT_DIR)/setup.ex_', |
| 206 '<(PRODUCT_DIR)/packed_files.txt', | 221 '<(PRODUCT_DIR)/packed_files.txt', |
| 207 ], | 222 ], |
| 208 'action': [ | 223 'action': [ |
| 209 'python', | 224 'python', |
| 210 '<(create_installer_archive_py_path)', | 225 '<(create_installer_archive_py_path)', |
| 226 | |
|
jeanluc1
2011/09/20 16:54:25
Extra line on purpose?
Jói
2011/09/20 21:44:06
No, fixed.
| |
| 211 '--output_dir=<(PRODUCT_DIR)', | 227 '--output_dir=<(PRODUCT_DIR)', |
| 212 '--input_file=<(RULE_INPUT_PATH)', | 228 '--input_file=<(RULE_INPUT_PATH)', |
| 213 # TODO(sgk): may just use environment variables | 229 # TODO(sgk): may just use environment variables |
| 214 #'--distribution=$(CHROMIUM_BUILD)', | 230 #'--distribution=$(CHROMIUM_BUILD)', |
| 215 '--distribution=_google_chrome', | 231 '--distribution=_google_chrome', |
| 216 # Optional arguments to generate diff installer | 232 # Optional arguments to generate diff installer |
| 217 #'--last_chrome_installer=C:/Temp/base', | 233 #'--last_chrome_installer=C:/Temp/base', |
| 218 #'--setup_exe_format=DIFF', | 234 #'--setup_exe_format=DIFF', |
| 219 #'--diff_algorithm=COURGETTE', | 235 #'--diff_algorithm=COURGETTE', |
| 220 ], | 236 ], |
| 221 'message': 'Create installer archive' | 237 'message': 'Create installer archive' |
| 222 }, | 238 }, |
| 223 ], | 239 ], |
| 224 }, | 240 }, |
| 225 ], | 241 ], |
| 226 }], | 242 }], |
| 227 [ 'branding == "Chrome"', { | 243 [ 'branding == "Chrome"', { |
| 228 'variables': { | 244 'variables': { |
| 229 'branding_dir': '../app/theme/google_chrome', | 245 'branding_dir': '../app/theme/google_chrome', |
| 230 }, | 246 }, |
| 231 }, { # else branding!="Chrome" | 247 }, { # else branding!="Chrome" |
| 232 'variables': { | 248 'variables': { |
| 233 'branding_dir': '../app/theme/chromium', | 249 'branding_dir': '../app/theme/chromium', |
| 234 }, | 250 }, |
| 235 }], | 251 }], |
| 236 ], | 252 ], |
| 237 } | 253 } |
| OLD | NEW |