sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

interpreters/duktape: Add duktape to global search path

Browse Source 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
This commit is contained in:
Huang Qi 2020-08-29 16:59:44 +08:00 committed by Xiang Xiao
parent 68c8a0f708
commit b989914b16
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interpreters/duktape/.gitignore vendored
View File

@ -1 +1 @@
duktape-* duktape*

7
interpreters/duktape/Make.defs
View File

@ -20,4 +20,11 @@
ifneq ($(CONFIG_INTERPRETERS_DUKTAPE),) ifneq ($(CONFIG_INTERPRETERS_DUKTAPE),)
CONFIGURED_APPS += $(APPDIR)/interpreters/duktape CONFIGURED_APPS += $(APPDIR)/interpreters/duktape
# It allows `<duktape/duktape.h>` import.
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
$(APPDIR)/interpreters/duktape/duktape/src-noline}
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
$(APPDIR)/interpreters/duktape/duktape/src-noline}
endif endif

17
interpreters/duktape/Makefile
View File

@ -21,7 +21,7 @@
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
DUKTAPE_VERSION = 2.5.0 DUKTAPE_VERSION = 2.5.0
DUKTAPE_UNPACK = duktape-$(DUKTAPE_VERSION) DUKTAPE_UNPACK = duktape
DUKTAPE_TARBALL = duktape-$(DUKTAPE_VERSION).tar.xz DUKTAPE_TARBALL = duktape-$(DUKTAPE_VERSION).tar.xz
DUKTAPE_URL_BASE = https://github.com/svaarala/duktape/releases/download/ DUKTAPE_URL_BASE = https://github.com/svaarala/duktape/releases/download/
DUKTAPE_URL = $(DUKTAPE_URL_BASE)v$(DUKTAPE_VERSION)/$(DUKTAPE_TARBALL) DUKTAPE_URL = $(DUKTAPE_URL_BASE)v$(DUKTAPE_VERSION)/$(DUKTAPE_TARBALL)
@ -49,17 +49,18 @@ CFLAGS += -DDUK_CMDLINE_CONSOLE_SUPPORT
CFLAGS += -DDUK_CMDLINE_PRINTALERT_SUPPORT CFLAGS += -DDUK_CMDLINE_PRINTALERT_SUPPORT
$(DUKTAPE_TARBALL): $(DUKTAPE_TARBALL):
@echo "Downloading $(DUKTAPE_TARBALL)" $(Q) echo "Downloading $(DUKTAPE_TARBALL)"
@wget $(DUKTAPE_URL) $(Q) wget $(DUKTAPE_URL)
$(DUKTAPE_UNPACK): $(DUKTAPE_TARBALL) $(DUKTAPE_UNPACK): $(DUKTAPE_TARBALL)
@echo "Unpacking $(DUKTAPE_TARBALL) to $(DUKTAPE_UNPACK)" $(Q) echo "Unpacking $(DUKTAPE_TARBALL) to $(DUKTAPE_UNPACK)"
@tar xvfJ $(DUKTAPE_TARBALL) $(Q) tar xvfJ $(DUKTAPE_TARBALL)
@echo "Patching $(DUKTAPE_UNPACK)" $(Q) mv duktape-$(DUKTAPE_VERSION) $(DUKTAPE_UNPACK)
@patch -p0 < duk_cmdline.patch $(Q) echo "Patching $(DUKTAPE_UNPACK)"
@touch $(DUKTAPE_UNPACK)/.patch $(Q) patch -p0 < duk_cmdline.patch
$(DUKTAPE_UNPACK)/.patch: $(DUKTAPE_UNPACK) $(DUKTAPE_UNPACK)/.patch: $(DUKTAPE_UNPACK)
$(Q) touch $(DUKTAPE_UNPACK)/.patch
context:: $(DUKTAPE_UNPACK)/.patch context:: $(DUKTAPE_UNPACK)/.patch

8
interpreters/duktape/duk_cmdline.patch
View File

@ -1,5 +1,5 @@
diff --color -ur duktape-2.5.0/examples/cmdline/duk_cmdline.c duktape-2.5.0-modifed/examples/cmdline/duk_cmdline.c diff --color -ur duktape/examples/cmdline/duk_cmdline.c duktape-2.5.0-modifed/examples/cmdline/duk_cmdline.c
--- duktape-2.5.0/examples/cmdline/duk_cmdline.c 2019-11-25 06:04:27.000000000 +0800 --- duktape/examples/cmdline/duk_cmdline.c 2019-11-25 06:04:27.000000000 +0800
+++ duktape-2.5.0-modifed/examples/cmdline/duk_cmdline.c 2020-08-07 23:20:27.320000000 +0800 +++ duktape-2.5.0-modifed/examples/cmdline/duk_cmdline.c 2020-08-07 23:20:27.320000000 +0800
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
#define MEM_LIMIT_NORMAL (128*1024*1024) /* 128 MB */ #define MEM_LIMIT_NORMAL (128*1024*1024) /* 128 MB */
@ -25,8 +25,8 @@ diff --color -ur duktape-2.5.0/examples/cmdline/duk_cmdline.c duktape-2.5.0-modi
} else if (idx >= LINEBUF_SIZE) { } else if (idx >= LINEBUF_SIZE) {
fprintf(stderr, "line too long\n"); fprintf(stderr, "line too long\n");
diff --color -ur duktape-2.5.0/src-noline/duk_config.h duktape-2.5.0-modifed/src-noline/duk_config.h diff --color -ur duktape/src-noline/duk_config.h duktape-2.5.0-modifed/src-noline/duk_config.h
--- duktape-2.5.0/src-noline/duk_config.h 2019-11-25 06:04:27.000000000 +0800 --- duktape/src-noline/duk_config.h 2019-11-25 06:04:27.000000000 +0800
+++ duktape-2.5.0-modifed/src-noline/duk_config.h 2020-08-07 23:14:55.880000000 +0800 +++ duktape-2.5.0-modifed/src-noline/duk_config.h 2020-08-07 23:14:55.880000000 +0800
@@ -402,7 +402,7 @@ @@ -402,7 +402,7 @@
/* --- Mac OSX, iPhone, Darwin --- */ /* --- Mac OSX, iPhone, Darwin --- */