Index: libadblockplus.gyp |
=================================================================== |
--- a/libadblockplus.gyp |
+++ b/libadblockplus.gyp |
@@ -6,28 +6,29 @@ |
'shell/shell.gyp'], |
'targets': [{ |
'target_name': 'libadblockplus', |
'type': '<(library)', |
'include_dirs': [ |
'include', |
'third_party/v8/include' |
], |
- 'defines': ['FILTER_ENGINE_STUBS=1'], |
+ 'defines': ['FILTER_ENGINE_STUBS=0'], |
'all_dependent_settings': { |
- 'defines': ['FILTER_ENGINE_STUBS=1'] |
+ 'defines': ['FILTER_ENGINE_STUBS=0'] |
}, |
'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
'sources': [ |
'src/ConsoleJsObject.cpp', |
'src/ErrorCallback.cpp', |
'src/FileReader.cpp', |
'src/FilterEngine.cpp', |
'src/GlobalJsObject.cpp', |
'src/JsEngine.cpp', |
+ 'src/JsValue.cpp', |
'src/Thread.cpp', |
'src/WebRequestJsObject.cpp', |
'<(INTERMEDIATE_DIR)/adblockplus.js.cc' |
], |
'direct_dependent_settings': { |
'include_dirs': ['include'] |
}, |
'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
@@ -49,49 +50,53 @@ |
'src/DefaultWebRequestDummy.cpp', |
] |
} |
] |
], |
'actions': [{ |
'action_name': 'convert_js', |
'variables': { |
- 'core_library_files': [ |
+ 'library_files': [ |
'lib/info.js', |
'lib/io.js', |
'lib/prefs.js', |
'lib/utils.js', |
'lib/elemHideHitRegistration.js', |
'adblockplus/lib/filterNotifier.js', |
'adblockplus/lib/filterClasses.js', |
'adblockplus/lib/subscriptionClasses.js', |
'adblockplus/lib/filterStorage.js', |
'adblockplus/lib/elemHide.js', |
'adblockplus/lib/matcher.js', |
'adblockplus/lib/filterListener.js', |
'adblockplus/lib/synchronizer.js', |
], |
- 'additional_library_files': [ |
+ 'load_before_files': [ |
'lib/compat.js' |
], |
+ 'load_after_files': [ |
+ 'lib/api.js' |
+ ], |
}, |
'inputs': [ |
'convert_js.py', |
- '<@(core_library_files)', |
- '<@(additional_library_files)', |
+ '<@(library_files)', |
+ '<@(load_before_files)', |
+ '<@(load_after_files)', |
], |
'outputs': [ |
'<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
], |
'action': [ |
'python', |
'convert_js.py', |
- '<@(core_library_files)', |
- '--', |
- '<@(additional_library_files)', |
+ 'before=<@(load_before_files)', |
+ '<@(library_files)', |
+ 'after=<@(load_after_files)', |
'<@(_outputs)', |
] |
}] |
}, |
{ |
'target_name': 'tests', |
'type': 'executable', |
'dependencies': [ |