Skip to content

Commit 127d0d0

Browse files
committed
Merge branch 'issue-6526' into 'master'
Issue 6526 - show warnings about deprecated V8 API See merge request eyeo/adblockplus/libadblockplus!6
2 parents ccfb633 + 12fbe57 commit 127d0d0

5 files changed

Lines changed: 18 additions & 2 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ env:
2424
global:
2525
- URL_PREFIX=https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b541792669a/
2626
- ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b
27+
- libv8_show_warnings="true"
2728
matrix:
2829
- BUILD_ACTION=test
2930
- BUILD_ACTION=all TARGET_OS=android Configuration=release ABP_TARGET_ARCH=arm

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ endif
5151

5252
GYP_PARAMETERS=host_arch=${HOST_ARCH} OS=${TARGET_OS} target_arch=${ABP_TARGET_ARCH}
5353
ifneq "$(and ${LIBV8_LIB_DIR}, ${LIBV8_INCLUDE_DIR})" ""
54-
GYP_PARAMETERS+= libv8_lib_dir=${LIBV8_LIB_DIR} libv8_include_dir=${LIBV8_INCLUDE_DIR}
54+
GYP_PARAMETERS+= libv8_lib_dir=${LIBV8_LIB_DIR} libv8_include_dir=${LIBV8_INCLUDE_DIR} libv8_show_warnings=${libv8_show_warnings}
5555
else
5656
$(error "V8 directories are not specified")
5757
endif

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,3 +313,8 @@ You can lint the code using [ESLint](http://eslint.org).
313313
In order to set up ESLint and
314314
[configuration eslint-config-eyeo](https://hg.adblockplus.org/codingtools/file/tip/eslint-config-eyeo) you need [Node.js 7 or higher](https://nodejs.org/) and once it is installed please run `npm install` in the repository directory.
315315

316+
In order to learn about the usage of deprecated V8 API please set `libv8_show_warnings` to `"true"` on *nix, e.g.
317+
318+
make libv8_show_warnings="true"
319+
320+
or on Windows add it to `GYP_DEFINES`.

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install:
1818
environment:
1919
URL_PREFIX: https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b541792669a/
2020
before_build:
21-
- cmd: set "GYP_DEFINES=libv8_include_dir=third_party/prebuilt-v8/include libv8_lib_dir=../../third_party/prebuilt-v8"
21+
- cmd: set "GYP_DEFINES=libv8_include_dir=third_party/prebuilt-v8/include libv8_lib_dir=../../third_party/prebuilt-v8 libv8_show_warnings=true"
2222
- cmd: createsolution.bat
2323
- cmd: >-
2424
if "%Platform%"=="Win32" set arch="ia32"

v8.gypi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,14 @@
1515
}]
1616
]
1717
},
18+
'target_defaults': {
19+
'conditions': [[
20+
'libv8_show_warnings=="true"', {
21+
'defines': [
22+
'V8_DEPRECATION_WARNINGS',
23+
'V8_IMMINENT_DEPRECATION_WARNINGS'
24+
]
25+
}
26+
]]
27+
}
1828
}

0 commit comments

Comments
 (0)