riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6981 from robertsipka/update_jerryscript

Browse Source 
pkg/jerryscript: update jerryscript package with the latest version (56802c22)
This commit is contained in:
Emmanuel Baccelli 2017-05-10 21:41:38 +02:00 committed by GitHub
commit 0566adcfe4
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/javascript/main.c
View File

@ -18,6 +18,7 @@
* @} * @}
*/ */
#include <stdio.h>
#include <string.h> #include <string.h>
#include "shell.h" #include "shell.h"
#include "jerryscript.h" #include "jerryscript.h"

3
pkg/jerryscript/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME=jerryscript PKG_NAME=jerryscript
PKG_URL=https://github.com/jerryscript-project/jerryscript.git PKG_URL=https://github.com/jerryscript-project/jerryscript.git
PKG_VERSION=b140158104064ef082ddb58052f8c7c7cee9675c PKG_VERSION=56802c22a10b0d684ac93921ac28df891e320b4a
PKG_LICENSE=Apache-2.0 PKG_LICENSE=Apache-2.0
.PHONY: all .PHONY: all
@ -8,6 +8,5 @@ PKG_LICENSE=Apache-2.0
all: git-download all: git-download
@cp Makefile.jerryscript $(PKG_BUILDDIR)/Makefile @cp Makefile.jerryscript $(PKG_BUILDDIR)/Makefile
$(MAKE) -C $(PKG_BUILDDIR) $(MAKE) -C $(PKG_BUILDDIR)
cp $(PKG_BUILDDIR)/riot/lib/libjerry-core.a ${BINDIR}/libjerrycore.a
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

3
pkg/jerryscript/Makefile.dep Normal file
View File

@ -0,0 +1,3 @@
ifneq (,$(filter jerryscript,$(USEPKG)))
USEMODULE += jerryport-minimal
endif

4
pkg/jerryscript/Makefile.jerryscript
View File

@ -18,6 +18,7 @@ libjerry:
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain_external.cmake \ -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain_external.cmake \
-DJERRY_LIBC=OFF \ -DJERRY_LIBC=OFF \
-DJERRY_CMDLINE=OFF \ -DJERRY_CMDLINE=OFF \
-DJERRY_LIBM=OFF \
-DENABLE_ALL_IN_ONE=OFF \ -DENABLE_ALL_IN_ONE=OFF \
-DEXTERNAL_CMAKE_SYSTEM_PROCESSOR="$(MCPU)" \ -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR="$(MCPU)" \
-DEXTERNAL_CMAKE_C_COMPILER=$(CC) \ -DEXTERNAL_CMAKE_C_COMPILER=$(CC) \
@ -25,7 +26,8 @@ libjerry:
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
-DMEM_HEAP_SIZE_KB=$(JERRYHEAP) -DMEM_HEAP_SIZE_KB=$(JERRYHEAP)
make -C $(BUILD_DIR) jerry-core make -C $(BUILD_DIR) jerry-core jerry-port-default-minimal
cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a
cp $(BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base