| OLD | NEW | 
|---|
| 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   ], | 
|  | 16   [ | 
|  | 17     'OS=="win"', { | 
|  | 18       'targets': [{ | 
|  | 19         'target_name': 'build-v8', | 
|  | 20         'type': 'none', | 
|  | 21         'actions': [{ | 
|  | 22           'action_name': 'build-v8', | 
|  | 23           'inputs': ['build-v8.cmd'], | 
|  | 24           'outputs': [ | 
|  | 25             'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libplatform.
     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', | 
|  | 28             'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_2.lib', | 
|  | 29             'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_3.lib', | 
|  | 30             'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib'
     , | 
|  | 31             'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.l
     ib', | 
|  | 32             'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib
     ', | 
|  | 33           ], | 
|  | 34           'action': [ | 
|  | 35             'cmd', | 
|  | 36             '/C', | 
|  | 37             'build-v8.cmd', | 
|  | 38             '$(MSBuildBinPath)', | 
|  | 39             '<(target_arch)', | 
|  | 40             '<(CONFIGURATION_NAME)', | 
|  | 41             '$(PlatformToolset)' | 
|  | 42           ] | 
|  | 43         }], | 
|  | 44       }] | 
|  | 45     } | 
| 15   ]], | 46   ]], | 
| 16   'includes': ['third_party/v8/build/features.gypi', | 47   'includes': ['shell/shell.gyp'], | 
| 17                'third_party/v8/build/toolchain.gypi', |  | 
| 18                'shell/shell.gyp'], |  | 
| 19   'targets': [{ | 48   'targets': [{ | 
| 20     'target_name': 'ensure_dependencies', |  | 
| 21     'type': 'none', |  | 
| 22     'actions': [{ |  | 
| 23       'action_name': 'ensure_dependencies', |  | 
| 24       'inputs': ['ensure_dependencies.py'], |  | 
| 25       'outputs': ['ensure_dependencies_phony_output'], |  | 
| 26       'action': ['python', 'ensure_dependencies.py'], |  | 
| 27     }], |  | 
| 28   }, |  | 
| 29   { |  | 
| 30     'target_name': 'libadblockplus', | 49     'target_name': 'libadblockplus', | 
| 31     'type': '<(library)', | 50     'type': '<(library)', | 
| 32     'dependencies': ['ensure_dependencies'], | 51     'xcode_settings':{}, | 
| 33     'include_dirs': [ | 52     'include_dirs': [ | 
| 34       'include', | 53       'include', | 
| 35       'third_party/v8/include', | 54       'third_party/v8/include', | 
|  | 55       'third_party/v8', | 
| 36     ], | 56     ], | 
| 37     'sources': [ | 57     'sources': [ | 
| 38       'include/AdblockPlus/ITimer.h', | 58       'include/AdblockPlus/ITimer.h', | 
| 39       'include/AdblockPlus/IWebRequest.h', | 59       'include/AdblockPlus/IWebRequest.h', | 
| 40       'include/AdblockPlus/DefaultWebRequest.h', | 60       'include/AdblockPlus/DefaultWebRequest.h', | 
| 41       'src/AppInfoJsObject.cpp', | 61       'src/AppInfoJsObject.cpp', | 
| 42       'src/ConsoleJsObject.cpp', | 62       'src/ConsoleJsObject.cpp', | 
| 43       'src/DefaultLogSystem.cpp', | 63       'src/DefaultLogSystem.cpp', | 
| 44       'src/DefaultFileSystem.cpp', | 64       'src/DefaultFileSystem.cpp', | 
| 45       'src/DefaultTimer.cpp', | 65       'src/DefaultTimer.cpp', | 
| 46       'src/DefaultTimer.h', | 66       'src/DefaultTimer.h', | 
| 47       'src/DefaultWebRequest.cpp', | 67       'src/DefaultWebRequest.cpp', | 
| 48       'src/FileSystemJsObject.cpp', | 68       'src/FileSystemJsObject.cpp', | 
| 49       'src/FilterEngine.cpp', | 69       'src/FilterEngine.cpp', | 
| 50       'src/GlobalJsObject.cpp', | 70       'src/GlobalJsObject.cpp', | 
| 51       'src/JsContext.cpp', | 71       'src/JsContext.cpp', | 
| 52       'src/JsEngine.cpp', | 72       'src/JsEngine.cpp', | 
| 53       'src/JsError.cpp', | 73       'src/JsError.cpp', | 
| 54       'src/JsValue.cpp', | 74       'src/JsValue.cpp', | 
| 55       'src/Notification.cpp', | 75       'src/Notification.cpp', | 
| 56       'src/ReferrerMapping.cpp', | 76       'src/ReferrerMapping.cpp', | 
| 57       'src/Thread.cpp', | 77       'src/Thread.cpp', | 
| 58       'src/Utils.cpp', | 78       'src/Utils.cpp', | 
| 59       'src/WebRequestJsObject.cpp', | 79       'src/WebRequestJsObject.cpp', | 
| 60       '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 80       '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 
| 61     ], | 81     ], | 
| 62     'direct_dependent_settings': { | 82     'direct_dependent_settings': { | 
| 63       'include_dirs': ['include'] | 83       'include_dirs': ['include'], | 
|  | 84       'msvs_settings': { | 
|  | 85         'VCLinkerTool': { | 
|  | 86           'AdditionalLibraryDirectories': ['v8/build/<(CONFIGURATION_NAME)'], | 
|  | 87         } | 
|  | 88       }, | 
| 64     }, | 89     }, | 
| 65     'conditions': [ | 90     'conditions': [ | 
| 66       ['OS=="android"', { | 91       ['OS=="linux" or OS=="mac"', { | 
| 67         'link_settings': { | 92         'link_settings': { | 
| 68           'libraries': [ | 93           'libraries': [ | 
| 69             'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_base.<(A
     NDROID_ARCH).a', | 94             'v8/out/<(CONFIGURATION_NAME)/libv8_libplatform.a', | 
| 70             'android_<(ANDROID_ARCH).release/obj.target/tools/gyp/libv8_snapshot
     .a', | 95             'v8/out/<(CONFIGURATION_NAME)/libv8_base.a', | 
|  | 96             'v8/out/<(CONFIGURATION_NAME)/libv8_snapshot.a', | 
|  | 97             'v8/out/<(CONFIGURATION_NAME)/libv8_libbase.a', | 
|  | 98             'v8/out/<(CONFIGURATION_NAME)/libv8_libsampler.a', | 
|  | 99           ] | 
|  | 100         } | 
|  | 101       }], | 
|  | 102       ['OS=="win"', { | 
|  | 103         'dependencies': ['build-v8'], | 
|  | 104         'link_settings': { | 
|  | 105           'libraries': [ | 
|  | 106             '-lv8_libplatform', | 
|  | 107             '-lv8_base_0', | 
|  | 108             '-lv8_base_1', | 
|  | 109             '-lv8_base_2', | 
|  | 110             '-lv8_base_3', | 
|  | 111             '-lv8_libbase', | 
|  | 112             '-lv8_libsampler', | 
|  | 113             '-lv8_snapshot', | 
|  | 114             '-lwinmm' | 
| 71           ], | 115           ], | 
| 72         }, | 116         }, | 
|  | 117       }], | 
|  | 118       ['OS=="android"', { | 
|  | 119         'user_libraries': [ | 
|  | 120           'android_<(target_arch).release/libv8_libplatform.a', | 
|  | 121           'android_<(target_arch).release/libv8_base.a', | 
|  | 122           'android_<(target_arch).release/libv8_snapshot.a', | 
|  | 123           'android_<(target_arch).release/libv8_libbase.a', | 
|  | 124           'android_<(target_arch).release/libv8_libsampler.a', | 
|  | 125         ], | 
| 73         'standalone_static_library': 1, # disable thin archives | 126         'standalone_static_library': 1, # disable thin archives | 
| 74       }, { |  | 
| 75         'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], |  | 
| 76         'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |  | 
| 77       }], | 127       }], | 
| 78       ['have_curl==1', | 128       ['have_curl==1', | 
| 79         { | 129         { | 
| 80           'sources': [ | 130           'sources': [ | 
| 81             'src/DefaultWebRequestCurl.cpp', | 131             'src/DefaultWebRequestCurl.cpp', | 
| 82           ], | 132           ], | 
| 83           'link_settings': { | 133           'link_settings': { | 
| 84             'libraries': ['-lcurl'] | 134             'libraries': ['-lcurl'] | 
| 85           }, | 135           }, | 
| 86           'all_dependent_settings': { | 136           'all_dependent_settings': { | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 159         '<@(_outputs)', | 209         '<@(_outputs)', | 
| 160         '--before', '<@(load_before_files)', | 210         '--before', '<@(load_before_files)', | 
| 161         '--convert', '<@(library_files)', | 211         '--convert', '<@(library_files)', | 
| 162         '--after', '<@(load_after_files)', | 212         '--after', '<@(load_after_files)', | 
| 163       ] | 213       ] | 
| 164     }] | 214     }] | 
| 165   }, | 215   }, | 
| 166   { | 216   { | 
| 167     'target_name': 'tests', | 217     'target_name': 'tests', | 
| 168     'type': 'executable', | 218     'type': 'executable', | 
|  | 219     'xcode_settings': {}, | 
| 169     'dependencies': [ | 220     'dependencies': [ | 
| 170       'third_party/googletest.gyp:googletest_main', | 221       'googletest.gyp:googletest_main', | 
| 171       'libadblockplus' | 222       'libadblockplus' | 
| 172     ], | 223     ], | 
| 173     'sources': [ | 224     'sources': [ | 
| 174       'test/BaseJsTest.h', | 225       'test/BaseJsTest.h', | 
| 175       'test/BaseJsTest.cpp', | 226       'test/BaseJsTest.cpp', | 
| 176       'test/AppInfoJsObject.cpp', | 227       'test/AppInfoJsObject.cpp', | 
| 177       'test/ConsoleJsObject.cpp', | 228       'test/ConsoleJsObject.cpp', | 
| 178       'test/DefaultFileSystem.cpp', | 229       'test/DefaultFileSystem.cpp', | 
| 179       'test/FileSystemJsObject.cpp', | 230       'test/FileSystemJsObject.cpp', | 
| 180       'test/FilterEngine.cpp', | 231       'test/FilterEngine.cpp', | 
| 181       'test/GlobalJsObject.cpp', | 232       'test/GlobalJsObject.cpp', | 
| 182       'test/JsEngine.cpp', | 233       'test/JsEngine.cpp', | 
| 183       'test/JsValue.cpp', | 234       'test/JsValue.cpp', | 
| 184       'test/Notification.cpp', | 235       'test/Notification.cpp', | 
| 185       'test/Prefs.cpp', | 236       'test/Prefs.cpp', | 
| 186       'test/ReferrerMapping.cpp', | 237       'test/ReferrerMapping.cpp', | 
| 187       'test/Thread.cpp', | 238       'test/Thread.cpp', | 
| 188       'test/UpdateCheck.cpp', | 239       'test/UpdateCheck.cpp', | 
| 189       'test/WebRequest.cpp' | 240       'test/WebRequest.cpp' | 
| 190     ], | 241     ], | 
| 191     'msvs_settings': { | 242     'msvs_settings': { | 
| 192       'VCLinkerTool': { | 243       'VCLinkerTool': { | 
| 193         'SubSystem': '1',   # Console | 244         'SubSystem': '1',   # Console | 
| 194         'EntryPointSymbol': 'mainCRTStartup', | 245         'EntryPointSymbol': 'mainCRTStartup', | 
| 195       }, | 246       }, | 
| 196     }, | 247     }, | 
| 197   }] | 248   }] | 
| 198 } | 249 } | 
| OLD | NEW | 
|---|