From e569f8814767b110ea03f3f3e0b03a841440a35f Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Mon, 22 Oct 2018 11:46:21 +0200 Subject: [PATCH] tizenrt: build: Update TizenRT to 2.0_Public_M2 Because current version of TizenRT in IoT.js docker image is outdated, let's fetch tag from upstream at build time, to speed up build time, this part can be eventually removed if image is updated with latest TizenRT's sources. jerryx extra lib has been dropped for now, this should be reintroduced later (once TizenRT upgraded IoT.js ?) Bug: https://github.com/Samsung/iotjs/issues/1777 Forwarded: https://github.com/Samsung/iotjs/pull/1780 IoT.js-DCO-1.0-Signed-off-by: Philippe Coval p.coval@samsung.com --- tools/travis_script.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/travis_script.py b/tools/travis_script.py index 4bb12c0eaf..7b2e0078f7 100755 --- a/tools/travis_script.py +++ b/tools/travis_script.py @@ -44,7 +44,7 @@ DOCKER_NAME = 'iotjs_docker' BUILDTYPES = ['debug', 'release'] -TIZENRT_TAG = '1.1_Public_Release' +TIZENRT_TAG = '2.0_Public_M2' # Common buildoptions for sanitizer jobs. BUILDOPTIONS_SANITIZER = [ @@ -137,6 +137,7 @@ def build_iotjs(buildtype, args=[], env=[]): '--profile=test/profiles/rpi2-linux.profile']) elif test == 'artik053': + exec_docker(DOCKER_TIZENRT_PATH, ['git', 'fetch', '--tags']) # Checkout specified tag exec_docker(DOCKER_TIZENRT_PATH, ['git', 'checkout', TIZENRT_TAG]) # Set configure @@ -150,10 +151,8 @@ def build_iotjs(buildtype, args=[], env=[]): exec_docker(DOCKER_TIZENRT_OS_PATH, [ 'make', 'IOTJS_ROOT_DIR=' + DOCKER_IOTJS_PATH, 'IOTJS_BUILD_OPTION=' - '--profile=test/profiles/tizenrt.profile', - 'EXTRA_LIBPATHS=-L' + DOCKER_IOTJS_PATH + - '/build/arm-tizenrt/' + buildtype + '/lib/', - 'EXTRA_LIBS=-ljerry-ext']) + '--profile=test/profiles/tizenrt.profile' + ]) elif test == 'stm32f4dis': # Copy the application files to apps/system/iotjs.