[platformio] Fix pio ci dependency library option

tgtakaoka · Jun 8, 2024 · 998072d · 998072d
1 parent 6b76892
commit 998072d
Show file tree

Hide file tree

Showing 25 changed files with 200 additions and 50 deletions.
diff --git a/examples/Makefile.common b/examples/Makefile.common
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/cdp1802/Makefile b/examples/cdp1802/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/f3850/Makefile b/examples/f3850/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/i8048/Makefile b/examples/i8048/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/i8051/Makefile b/examples/i8051/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/i8080/Makefile b/examples/i8080/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/i8086/Makefile b/examples/i8086/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/i8096/Makefile b/examples/i8096/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/ins8060/Makefile b/examples/ins8060/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/ins8070/Makefile b/examples/ins8070/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/mc6800/Makefile b/examples/mc6800/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/mc68000/Makefile b/examples/mc68000/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/mc6809/Makefile b/examples/mc6809/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/mn1610/Makefile b/examples/mn1610/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/mos6502/Makefile b/examples/mos6502/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef
 

diff --git a/examples/ns32000/Makefile b/examples/ns32000/Makefile
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
 endif
 endif
 
-PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
+PIO_CI_FLAGS =
 ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
 
 ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
 
 EXAMPLE = $(shell basename $(CURDIR))
 
+define pio-libdep-path # env libdep
+-l .pio/libdeps/$(1)/$(2)
+endef
+
 define pio-ci # board
-	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
+	ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
+	pio $(PIO_FLAGS) pkg install
+	pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
 
 endef