Hello,
This updates makeEspArduino to 5.0.2.
Changelog:
- add support for visual studio code
- extract perl scripts
- couple of post fixes from 5.0.0
Ok?
--
Tracey Emery
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/makeesparduino/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- Makefile 23 Apr 2020 14:31:06 -0000 1.1.1.1
+++ Makefile 18 May 2020 19:03:37 -0000
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2020/04/23 14:31:06 tracey Exp $
+# $OpenBSD$
COMMENT = makefile for ESP8266 and ESP32 Arduino projects
GH_ACCOUNT = plerup
GH_PROJECT = makeEspArduino
-GH_TAGNAME = 4.22.0
+GH_TAGNAME = 5.0.2
PKGNAME = makeesparduino-${GH_TAGNAME}
@@ -27,5 +27,6 @@ post-patch:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/makeEspArduino
cp -r ${WRKDIST}/*.mk ${PREFIX}/share/makeEspArduino/
+ cp -r ${WRKDIST}/tools ${PREFIX}/share/makeEspArduino/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/makeesparduino/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo 23 Apr 2020 14:31:06 -0000 1.1.1.1
+++ distinfo 18 May 2020 19:03:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (makeEspArduino-4.22.0.tar.gz) =
uqUhHKeLx0rrW+xoXm2A7l6LTfM2Jqegf4g49tnjM7w=
-SIZE (makeEspArduino-4.22.0.tar.gz) = 22314
+SHA256 (makeEspArduino-5.0.2.tar.gz) =
Xm/HwKIToQ2zJxLkSOvSNJh9jUkAf2MQqD0WCGCAdYk=
+SIZE (makeEspArduino-5.0.2.tar.gz) = 25007
Index: patches/patch-makeEspArduino_mk
===================================================================
RCS file: /cvs/ports/devel/makeesparduino/patches/patch-makeEspArduino_mk,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-makeEspArduino_mk
--- patches/patch-makeEspArduino_mk 23 Apr 2020 14:31:06 -0000 1.1.1.1
+++ patches/patch-makeEspArduino_mk 18 May 2020 19:03:37 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-makeEspArduino_mk,v 1.1.1.1 2020/04/23 14:31:06 tracey Exp $
+$OpenBSD$
Index: makeEspArduino.mk
--- makeEspArduino.mk.orig
+++ makeEspArduino.mk
-@@ -26,8 +26,13 @@ CHIP ?= esp8266
- BOARD ?= $(if $(filter $(CHIP), esp32),esp32,generic)
+@@ -26,8 +26,13 @@ __TOOLS_DIR := $(dir $(__THIS_FILE))tools
+ CHIP ?= esp8266
# Serial flashing parameters
-UPLOAD_PORT ?= $(shell ls -1tr /dev/tty*USB* 2>/dev/null | tail -1)
@@ -76,7 +76,7 @@ Index: makeEspArduino.mk
else
# Location defined, assume it is a git clone
ESP_ARDUINO_VERSION = $(call git_description,$(ESP_ROOT))
-@@ -213,6 +233,8 @@ LWIP_VARIANT ?= $(shell cat $(ESP_ROOT)/boards.txt | p
+@@ -215,6 +235,8 @@ LWIP_VARIANT ?= $(shell $(BOARD_OP) $(BOARD) first_lwi
# Handle possible changed state i.e. make command line parameters or changed
git versions
ifeq ($(OS), Darwin)
CMD_LINE := $(shell ps $$PPID -o command | tail -1)
@@ -85,8 +85,8 @@ Index: makeEspArduino.mk
else
CMD_LINE := $(shell tr "\0" " " </proc/$$PPID/cmdline)
endif
-@@ -496,6 +518,8 @@ DEFAULT_GOAL ?= all
-
+@@ -515,6 +537,8 @@ DEFAULT_GOAL ?= all
+ # Build threads, default is using all cpus
ifeq ($(OS), Darwin)
BUILD_THREADS ?= $(shell sysctl -n hw.ncpu)
+else ifeq ($(OS), OpenBSD)
@@ -94,11 +94,3 @@ Index: makeEspArduino.mk
else
BUILD_THREADS ?= $(shell nproc)
endif
-@@ -516,6 +540,7 @@ my $$os = shift;
- $$os =~ s/Windows_NT/windows/;
- $$os =~ s/Linux/linux/;
- $$os =~ s/Darwin/macosx/;
-+$$os =~ s/OpenBSD/openbsd/;
- my $$lwipvariant = shift;
- my %v;
-
Index: patches/patch-tools_parse_arduino_pl
===================================================================
RCS file: patches/patch-tools_parse_arduino_pl
diff -N patches/patch-tools_parse_arduino_pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_parse_arduino_pl 18 May 2020 19:03:37 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: tools/parse_arduino.pl
+--- tools/parse_arduino.pl.orig
++++ tools/parse_arduino.pl
+@@ -22,6 +22,7 @@ my $os = shift;
+ $os =~ s/Windows_NT/windows/;
+ $os =~ s/Linux/linux/;
+ $os =~ s/Darwin/macosx/;
++$os =~ s/OpenBSD/openbsd/;
+ my $lwipvariant = shift;
+ my %vars;
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/makeesparduino/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 23 Apr 2020 14:31:07 -0000 1.1.1.1
+++ pkg/PLIST 18 May 2020 19:03:37 -0000
@@ -1,3 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2020/04/23 14:31:07 tracey Exp $
+@comment $OpenBSD: PLIST,v$
share/makeEspArduino/
share/makeEspArduino/makeEspArduino.mk
+share/makeEspArduino/tools/
+share/makeEspArduino/tools/board_op.pl
+share/makeEspArduino/tools/find_inc.pl
+share/makeEspArduino/tools/mem_use.pl
+share/makeEspArduino/tools/parse_arduino.pl
+share/makeEspArduino/tools/vscode.pl