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