| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 1 { | 1 { |
| 2 'conditions': [[ | 2 'conditions': [[ |
| 3 # We don't want to use curl on Windows and Android, skip the check there | 3 # We don't want to use curl on Windows and Android, skip the check there |
| 4 'OS=="win" or OS=="android"', | 4 'OS=="win" or OS=="android"', |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'have_curl': 0 | 7 'have_curl': 0 |
| 8 } | 8 } |
| 9 }, | 9 }, |
| 10 { | 10 { |
| 11 'variables': { | 11 'variables': { |
| 12 'have_curl': '<!(python check_curl.py)' | 12 'have_curl': '<!(python check_curl.py)' |
| 13 } | 13 } |
| 14 } | 14 } |
| 15 ], | 15 ], |
| 16 [ | 16 [ |
| 17 'OS=="win"', { | 17 'OS=="win"', { |
| 18 'targets': [{ | 18 'targets': [{ |
| 19 'target_name': 'build-v8', | 19 'target_name': 'build-v8', |
| 20 'type': 'none', | 20 'type': 'none', |
| 21 'actions': [{ | 21 'actions': [{ |
| 22 'action_name': 'build-v8', | 22 'action_name': 'build-v8', |
| 23 'inputs': ['build-v8.cmd'], | 23 'inputs': ['build-v8.cmd'], |
| 24 'outputs': [ | 24 'outputs': [ |
| 25 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libplatform. lib', | 25 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libplatform. lib', |
|
Eric
2017/05/30 17:31:40
Is there a reason for the explicit build instructi
sergei
2017/05/31 12:47:12
Now it does not work because gyp messes the config
| |
| 26 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_0.lib', | 26 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_0.lib', |
| 27 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_1.lib', | 27 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_1.lib', |
| 28 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_2.lib', | 28 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_2.lib', |
| 29 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_3.lib', | 29 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_3.lib', |
| 30 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib' , | 30 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib' , |
| 31 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.l ib', | 31 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.l ib', |
| 32 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib ', | 32 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib ', |
| 33 ], | 33 ], |
| 34 'action': [ | 34 'action': [ |
| 35 'cmd', | 35 'cmd', |
| 36 '/C', | 36 '/C', |
| 37 'build-v8.cmd', | 37 'build-v8.cmd', |
| 38 '$(MSBuildBinPath)', | |
| 38 '<(target_arch)', | 39 '<(target_arch)', |
| 39 '<(CONFIGURATION_NAME)' | 40 '<(CONFIGURATION_NAME)', |
| 41 '$(PlatformToolset)' | |
| 40 ] | 42 ] |
| 41 }], | 43 }], |
| 42 }] | 44 }] |
| 43 } | 45 } |
| 44 ]], | 46 ]], |
| 45 'includes': ['shell/shell.gyp'], | 47 'includes': ['shell/shell.gyp'], |
| 46 'targets': [{ | 48 'targets': [{ |
| 47 'target_name': 'libadblockplus', | 49 'target_name': 'libadblockplus', |
| 48 'type': '<(library)', | 50 'type': '<(library)', |
| 49 'xcode_settings':{}, | 51 'xcode_settings':{}, |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 '--convert', '<@(library_files)', | 211 '--convert', '<@(library_files)', |
| 210 '--after', '<@(load_after_files)', | 212 '--after', '<@(load_after_files)', |
| 211 ] | 213 ] |
| 212 }] | 214 }] |
| 213 }, | 215 }, |
| 214 { | 216 { |
| 215 'target_name': 'tests', | 217 'target_name': 'tests', |
| 216 'type': 'executable', | 218 'type': 'executable', |
| 217 'xcode_settings': {}, | 219 'xcode_settings': {}, |
| 218 'dependencies': [ | 220 'dependencies': [ |
| 219 'third_party/googletest.gyp:googletest_main', | 221 'googletest.gyp:googletest_main', |
| 220 'libadblockplus' | 222 'libadblockplus' |
| 221 ], | 223 ], |
| 222 'sources': [ | 224 'sources': [ |
| 223 'test/BaseJsTest.h', | 225 'test/BaseJsTest.h', |
| 224 'test/BaseJsTest.cpp', | 226 'test/BaseJsTest.cpp', |
| 225 'test/AppInfoJsObject.cpp', | 227 'test/AppInfoJsObject.cpp', |
| 226 'test/ConsoleJsObject.cpp', | 228 'test/ConsoleJsObject.cpp', |
| 227 'test/DefaultFileSystem.cpp', | 229 'test/DefaultFileSystem.cpp', |
| 228 'test/FileSystemJsObject.cpp', | 230 'test/FileSystemJsObject.cpp', |
| 229 'test/FilterEngine.cpp', | 231 'test/FilterEngine.cpp', |
| 230 'test/GlobalJsObject.cpp', | 232 'test/GlobalJsObject.cpp', |
| 231 'test/JsEngine.cpp', | 233 'test/JsEngine.cpp', |
| 232 'test/JsValue.cpp', | 234 'test/JsValue.cpp', |
| 233 'test/Notification.cpp', | 235 'test/Notification.cpp', |
| 234 'test/Prefs.cpp', | 236 'test/Prefs.cpp', |
| 235 'test/ReferrerMapping.cpp', | 237 'test/ReferrerMapping.cpp', |
| 236 'test/Thread.cpp', | 238 'test/Thread.cpp', |
| 237 'test/UpdateCheck.cpp', | 239 'test/UpdateCheck.cpp', |
| 238 'test/WebRequest.cpp' | 240 'test/WebRequest.cpp' |
| 239 ], | 241 ], |
| 240 'msvs_settings': { | 242 'msvs_settings': { |
| 241 'VCLinkerTool': { | 243 'VCLinkerTool': { |
| 242 'SubSystem': '1', # Console | 244 'SubSystem': '1', # Console |
| 243 'EntryPointSymbol': 'mainCRTStartup', | 245 'EntryPointSymbol': 'mainCRTStartup', |
| 244 }, | 246 }, |
| 245 }, | 247 }, |
| 246 }] | 248 }] |
| 247 } | 249 } |
| LEFT | RIGHT |