| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'have_curl': '<!(python check_curl.py)' | 3 'have_curl': '<!(python check_curl.py)' |
| 4 }, | 4 }, |
| 5 'includes': ['third_party/v8/build/common.gypi', | 5 'includes': ['third_party/v8/build/common.gypi', |
| 6 'shell/shell.gyp'], | 6 'shell/shell.gyp'], |
| 7 'targets': [{ | 7 'targets': [{ |
| 8 'target_name': 'libadblockplus', | 8 'target_name': 'libadblockplus', |
| 9 'type': '<(library)', | 9 'type': '<(library)', |
| 10 'include_dirs': [ | 10 'include_dirs': [ |
| 11 'include', | 11 'include', |
| 12 'third_party/v8/include' | 12 'third_party/v8/include' |
| 13 ], | 13 ], |
| 14 'defines': ['FILTER_ENGINE_STUBS=1'], | 14 'defines': ['FILTER_ENGINE_STUBS=0'], |
| 15 'all_dependent_settings': { | 15 'all_dependent_settings': { |
| 16 'defines': ['FILTER_ENGINE_STUBS=1'] | 16 'defines': ['FILTER_ENGINE_STUBS=0'] |
| 17 }, | 17 }, |
| 18 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 18 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 19 'sources': [ | 19 'sources': [ |
| 20 'src/ConsoleJsObject.cpp', | 20 'src/ConsoleJsObject.cpp', |
| 21 'src/DefaultFileSystem.cpp', | 21 'src/DefaultFileSystem.cpp', |
| 22 'src/ErrorCallback.cpp', | 22 'src/ErrorCallback.cpp', |
| 23 'src/FileSystemJsObject.cpp', | 23 'src/FileSystemJsObject.cpp', |
| 24 'src/FilterEngine.cpp', | 24 'src/FilterEngine.cpp', |
| 25 'src/GlobalJsObject.cpp', | 25 'src/GlobalJsObject.cpp', |
| 26 'src/JsEngine.cpp', | 26 'src/JsEngine.cpp', |
| 27 'src/JsValue.cpp', |
| 27 'src/Thread.cpp', | 28 'src/Thread.cpp', |
| 28 'src/Utils.cpp', | 29 'src/Utils.cpp', |
| 29 'src/WebRequestJsObject.cpp', | 30 'src/WebRequestJsObject.cpp', |
| 30 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' | 31 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' |
| 31 ], | 32 ], |
| 32 'direct_dependent_settings': { | 33 'direct_dependent_settings': { |
| 33 'include_dirs': ['include'] | 34 'include_dirs': ['include'] |
| 34 }, | 35 }, |
| 35 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 36 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 36 'conditions': [ | 37 'conditions': [ |
| (...skipping 12 matching lines...) Expand all Loading... |
| 49 { | 50 { |
| 50 'sources': [ | 51 'sources': [ |
| 51 'src/DefaultWebRequestDummy.cpp', | 52 'src/DefaultWebRequestDummy.cpp', |
| 52 ] | 53 ] |
| 53 } | 54 } |
| 54 ] | 55 ] |
| 55 ], | 56 ], |
| 56 'actions': [{ | 57 'actions': [{ |
| 57 'action_name': 'convert_js', | 58 'action_name': 'convert_js', |
| 58 'variables': { | 59 'variables': { |
| 59 'core_library_files': [ | 60 'library_files': [ |
| 60 'lib/info.js', | 61 'lib/info.js', |
| 61 'lib/io.js', | 62 'lib/io.js', |
| 62 'lib/prefs.js', | 63 'lib/prefs.js', |
| 63 'lib/utils.js', | 64 'lib/utils.js', |
| 64 'lib/elemHideHitRegistration.js', | 65 'lib/elemHideHitRegistration.js', |
| 65 'adblockplus/lib/filterNotifier.js', | 66 'adblockplus/lib/filterNotifier.js', |
| 66 'adblockplus/lib/filterClasses.js', | 67 'adblockplus/lib/filterClasses.js', |
| 67 'adblockplus/lib/subscriptionClasses.js', | 68 'adblockplus/lib/subscriptionClasses.js', |
| 68 'adblockplus/lib/filterStorage.js', | 69 'adblockplus/lib/filterStorage.js', |
| 69 'adblockplus/lib/elemHide.js', | 70 'adblockplus/lib/elemHide.js', |
| 70 'adblockplus/lib/matcher.js', | 71 'adblockplus/lib/matcher.js', |
| 71 'adblockplus/lib/filterListener.js', | 72 'adblockplus/lib/filterListener.js', |
| 72 'adblockplus/lib/synchronizer.js', | 73 'adblockplus/lib/synchronizer.js', |
| 73 ], | 74 ], |
| 74 'additional_library_files': [ | 75 'load_before_files': [ |
| 75 'lib/compat.js' | 76 'lib/compat.js' |
| 76 ], | 77 ], |
| 78 'load_after_files': [ |
| 79 'lib/api.js' |
| 80 ], |
| 77 }, | 81 }, |
| 78 'inputs': [ | 82 'inputs': [ |
| 79 'convert_js.py', | 83 'convert_js.py', |
| 80 '<@(core_library_files)', | 84 '<@(library_files)', |
| 81 '<@(additional_library_files)', | 85 '<@(load_before_files)', |
| 86 '<@(load_after_files)', |
| 82 ], | 87 ], |
| 83 'outputs': [ | 88 'outputs': [ |
| 84 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 89 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
| 85 ], | 90 ], |
| 86 'action': [ | 91 'action': [ |
| 87 'python', | 92 'python', |
| 88 'convert_js.py', | 93 'convert_js.py', |
| 89 '<@(core_library_files)', | 94 'before=<@(load_before_files)', |
| 90 '--', | 95 '<@(library_files)', |
| 91 '<@(additional_library_files)', | 96 'after=<@(load_after_files)', |
| 92 '<@(_outputs)', | 97 '<@(_outputs)', |
| 93 ] | 98 ] |
| 94 }] | 99 }] |
| 95 }, | 100 }, |
| 96 { | 101 { |
| 97 'target_name': 'tests', | 102 'target_name': 'tests', |
| 98 'type': 'executable', | 103 'type': 'executable', |
| 99 'dependencies': [ | 104 'dependencies': [ |
| 100 'third_party/googletest.gyp:googletest_main', | 105 'third_party/googletest.gyp:googletest_main', |
| 101 'libadblockplus' | 106 'libadblockplus' |
| 102 ], | 107 ], |
| 103 'sources': [ | 108 'sources': [ |
| 104 'test/ConsoleJsObject.cpp', | 109 'test/ConsoleJsObject.cpp', |
| 105 'test/DefaultFileSystem.cpp', | 110 'test/DefaultFileSystem.cpp', |
| 106 'test/FileSystemJsObject.cpp', | 111 'test/FileSystemJsObject.cpp', |
| 107 'test/FilterEngineStubs.cpp', | 112 'test/FilterEngineStubs.cpp', |
| 108 'test/GlobalJsObject.cpp', | 113 'test/GlobalJsObject.cpp', |
| 109 'test/JsEngine.cpp', | 114 'test/JsEngine.cpp', |
| 115 'test/JsValue.cpp', |
| 110 'test/Thread.cpp', | 116 'test/Thread.cpp', |
| 111 'test/WebRequest.cpp' | 117 'test/WebRequest.cpp' |
| 112 ] | 118 ] |
| 113 }] | 119 }] |
| 114 } | 120 } |
| OLD | NEW |