Skip to content

Commit

Permalink
build: Update TizenRT to 2.0_Public_M2
Browse files Browse the repository at this point in the history
Because current version of TizenRT in IoT.js docker image is oudated,
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.

Use iotjs's defconfig as default config instead of file:
"tizenrt_release_config"
from container:
https://hub.docker.com/r/iotjs/ubuntu/

Is this file tracked anywhere?

Later debug, release configs can tracked in IoT.js's source tree,
and used as desired, for performance benchmarking.

jerryx extra lib has been dropped for now,
this should be reintroduced later (once TizenRT upgrade IoT.js ?)

Bug: #1777
IoT.js-DCO-1.0-Signed-off-by: Philippe Coval p.coval@samsung.com
  • Loading branch information
rzr committed Oct 22, 2018
1 parent 5da1758 commit c0fbcb2
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions tools/travis_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -90,9 +90,10 @@ def start_mosquitto_server():
def start_node_server():
exec_docker(DOCKER_NODE_SERVER_PATH, ['node', 'server.js'], [], True)

def set_release_config_tizenrt():
def set_config_tizenrt():
exec_docker(DOCKER_ROOT_PATH, [
'cp', 'tizenrt_release_config',
'cp',
fs.join(DOCKER_IOTJS_PATH, 'config/tizenrt/artik05x/configs/defconfig'),
fs.join(DOCKER_TIZENRT_OS_PATH, '.config')])

def build_iotjs(buildtype, args=[], env=[]):
Expand Down Expand Up @@ -128,24 +129,20 @@ 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
exec_docker(DOCKER_TIZENRT_OS_TOOLS_PATH, [
'./configure.sh', 'artik053/iotjs'])

for buildtype in BUILDTYPES:
if buildtype == 'release':
set_release_config_tizenrt()
# FIXME: EXTRA_LIBPATHS and EXTRA_LIB can be deleted
# when TizenRT uses jerry-ext.
set_config_tizenrt()
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.
Expand Down

0 comments on commit c0fbcb2

Please sign in to comment.