Skip to content

Commit 067fc3a

Browse files
tgtakaokatgtakaoka
committed
[platformio] Fix pio ci dependency library option
1 parent d000753 commit 067fc3a

File tree

25 files changed

+200
-50
lines changed

25 files changed

+200
-50
lines changed

‎examples/Makefile.common

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/cdp1802/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/f3850/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/i8048/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/i8051/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/i8080/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/i8086/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/i8096/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/ins8060/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/ins8070/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/mc6800/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/mc68000/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/mc6809/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/mn1610/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/mos6502/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

‎examples/ns32000/Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARDUINO_FLAGS += --no-color
3232
endif
3333
endif
3434

35-
PIO_CI_FLAGS = -l ~/.platformio/lib/libcli
35+
PIO_CI_FLAGS =
3636
ARDUINO_CI_FLAGS = --warnings all --library $(CURDIR)/../../
3737

3838
ENVS = $(shell grep -Po '^\[env:\K[^]]+' platformio.ini)
@@ -43,8 +43,14 @@ BOARD ?= $(firstword $(BOARDS))
4343

4444
EXAMPLE = $(shell basename $(CURDIR))
4545

46+
define pio-libdep-path # env libdep
47+
-l .pio/libdeps/$(1)/$(2)
48+
endef
49+
4650
define pio-ci # board
47-
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(PIO_CI_FLAGS) -b $(1) $(EXAMPLE).ino
51+
ENV=$(shell awk 'BEGIN{RS="\n\n"} /$(1)/' platformio.ini | grep -Po '(?<=env:)[^]]+')
52+
pio pkg install
53+
pio $(PIO_FLAGS) ci -l $(CURDIR)/../.. $(call pio-libdep-path,$(ENV),libcli) -b $(1) $(EXAMPLE).ino
4854

4955
endef
5056

0 commit comments

Comments
 (0)