Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: Makefile

Issue 29807589: Issue 6695 - Allow automatically downloading V8 (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Created June 15, 2018, 1:52 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « .hgignore ('k') | README.md » ('j') | README.md » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,25 @@
HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py)
ifndef HOST_OS
raw_OS = $(shell uname -s)
ifeq (${raw_OS},Linux)
HOST_OS=linux
+ TRAVIS_OS_NAME=linux
else ifeq (${raw_OS},Darwin)
HOST_OS=mac
+ TRAVIS_OS_NAME=osx
endif
endif
+# Default V8 directories
+LIBV8_INCLUDE_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/include
+LIBV8_LIB_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/
+
TARGET_OS ?= ${HOST_OS}
TARGET_ARCH ?= ${HOST_ARCH}
Configuration ?= debug
BUILD_DIR ?=$(shell pwd -L)/build
ifeq (${TARGET_OS},android)
Configuration ?= release
@@ -61,16 +67,22 @@
$(TEST_EXECUTABLE) --gtest_filter=$(FILTER)
else
$(TEST_EXECUTABLE)
endif
docs:
doxygen
+v8prebuild:
sergei 2018/06/18 10:16:25 What about renaming it to get-prebuilt-v8?
hub 2018/06/18 12:51:10 Done.
+ URL_PREFIX="https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b541792669a/" \
+ TARGET_OS=${TARGET_OS} TARGET_ARCH=${TARGET_ARCH} \
+ TRAVIS_OS_NAME=${TRAVIS_OS_NAME} Configuration=${Configuration} \
+ bash .travis/prepare-prebuilt-v8.sh
+
clean:
$(RM) -r ${BUILD_DIR} docs
ifeq ($(TARGET_OS),android)
all: ensure_dependencies
GYP_DEFINES="${GYP_PARAMETERS}" \
python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.gypi --generator-output=${BUILD_DIR} -Gandroid_ndk_version=r16b libadblockplus.gyp
$(ANDROID_NDK_ROOT)/ndk-build -C ${BUILD_DIR} installed_modules \
« no previous file with comments | « .hgignore ('k') | README.md » ('j') | README.md » ('J')

Powered by Google App Engine
This is Rietveld