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

Disable debuger code if not enabled

Observed build issue on TizenRT (master):

    iotjs.c:58: undefined reference to `jerryx_debugger_tcp_create'
    iotjs.c:59: undefined reference to `jerryx_debugger_ws_create'
    iotjs.c:58: undefined reference to `jerryx_debugger_after_connect'

The whole part is disabled,
even if only jerry-ext functions are not linked (on Tizen:RT master).

Change-Id: Id88c745c9712f6f620bbd200f493397572174ce6
Forwarded: #1749
Origin: https://github.com/TizenTeam/iotjs/
IoT.js-DCO-1.0-Signed-off-by: Philippe Coval philippe.coval@osg.samsung.com

tizenrt: Update defconfig from TizenRT 2.0

Align to TizenRT default config, but disable SSS for ARTIK053

Bug: #1777
IoT.js-DCO-1.0-Signed-off-by: Philippe Coval p.coval@samsung.com

tizenrt: Relocate downstream Makefile to config dir (along Kconfig)

[Philippe Coval]

After some (recent) refactoring in build script,
This file was over imported iotjs module in TizenRT.

Like done previously with Kconfig file,
it will be better to minimize downstream patches.

One benefit to have those build related files,
is that then IoT.js can be upgraded into TizenRT
by just cloning iotjs's again into subdir:
TizenRT/external/iotjs

Note: Extra minor changes has been done over TizenRT's patch
to make some options overridable from env var (profile file...)

[Sunghan Chang]

Makefile: move IoT.js-specific build step to IoT.js folder

Because Makefile.unix has TizenRT-common build step,
it is not good including IoT.js-specific step.
Let's add Makefile in IoT.js and execute all of step in it.

Thanks-to: sunghan-chang <sh924.chang@samsung.com>
Change-Id: Iddeb272dc6ad6c283ccad9f92bf02754f9ba3240
Bug-TizenRT: Samsung/TizenRT#2111
Origin: Samsung/TizenRT@bbd3cdb
Relate-to: #1726
Forwarded: #1732
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 98bc5a5
Show file tree
Hide file tree
Showing 4 changed files with 430 additions and 271 deletions.
54 changes: 54 additions & 0 deletions config/tizenrt/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
###########################################################################
#
# Copyright 2018 Samsung Electronics All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
# either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
#
###########################################################################

-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs

IOTJS_ROOT_DIR ?= $(TOPDIR)/$(EXTDIR)/iotjs
IOTJS_BUILD_OPTION ?=
ifeq ($(CONFIG_DEBUG),y)
IOTJS_BUILDTYPE = debug
else
IOTJS_BUILDTYPE = release
endif
IOTJS_OS ?= tizenrt
IOTJS_ARCH ?= arm
IOTJS_BUILDCONFIG ?= ${IOTJS_ARCH}-${IOTJS_OS}
IOTJS_LIB_DIR ?= $(IOTJS_ROOT_DIR)/build/${IOTJS_BUILDCONFIG}/$(IOTJS_BUILDTYPE)/lib
IOTJS_ROOT_DIR ?= .
IOTJS_PROFILE_FILE ?= ${IOTJS_ROOT_DIR}/test/profiles/tizenrt.profile

all: build
.PHONY: depend clean distclean

build: $(IOTJS_ROOT_DIR)/tools/build.py ${IOTJS_PROFILE_FILE}
$(Q) python $< \
--target-arch=$(CONFIG_ARCH) \
--target-os=${IOTJS_OS} \
--sysroot=$(TOPDIR) --target-board=$(CONFIG_ARCH_BOARD) --jerry-heaplimit=$(CONFIG_IOTJS_JERRY_HEAP) \
--buildtype=$(IOTJS_BUILDTYPE) --no-init-submodule $(IOTJS_BUILD_OPTION) \
--profile ${IOTJS_PROFILE_FILE}
$(Q) cp $(IOTJS_LIB_DIR)/*.a $(IOTJS_ROOT_DIR)

depend:

clean:
$(Q) $(call DELDIR, $(IOTJS_ROOT_DIR)/build)
$(Q) $(call DELFILE, $(IOTJS_ROOT_DIR)/*.a)

distclean:
Loading

0 comments on commit 98bc5a5

Please sign in to comment.