Skip to content

Commit 9f9c661

Browse files
everslickd-a-v
authored andcommitted
emulation on host: Make non essential ARDUINO LIBS optional. (#5771)
This patch splits ARDUINO_LIBS into two variables. The second variable is called OPT_ARDUINO_LIBS and can be overridden by the caller as it uses the ?= assignment operator. Additionally it unifies and simplifies collecting the files in common/ by using the addprefix macro. All changes should be 100% backwards compatible.
1 parent 2be374c commit 9f9c661

File tree

1 file changed

+47
-42
lines changed

1 file changed

+47
-42
lines changed

tests/host/Makefile

+47-42
Original file line numberDiff line numberDiff line change
@@ -216,57 +216,61 @@ ARDUINO_LIBS := \
216216
Updater.cpp \
217217
base64.cpp \
218218
) \
219-
$(addprefix ../../libraries/,\
220-
$(addprefix ESP8266WiFi/src/,\
221-
ESP8266WiFi.cpp \
222-
ESP8266WiFiAP.cpp \
223-
ESP8266WiFiGeneric.cpp \
224-
ESP8266WiFiMulti.cpp \
225-
ESP8266WiFiSTA-WPS.cpp \
226-
ESP8266WiFiSTA.cpp \
227-
ESP8266WiFiScan.cpp \
228-
WiFiClient.cpp \
229-
WiFiUdp.cpp \
230-
WiFiClientSecureBearSSL.cpp \
231-
WiFiServerSecureBearSSL.cpp \
232-
BearSSLHelpers.cpp \
233-
CertStoreBearSSL.cpp \
234-
) \
235-
$(addprefix ESP8266WebServer/src/,\
236-
ESP8266WebServer.cpp \
237-
Parsing.cpp \
238-
detail/mimetable.cpp \
239-
) \
240-
ESP8266mDNS/src/LEAmDNS.cpp \
241-
ESP8266mDNS/src/LEAmDNS_Control.cpp \
242-
ESP8266mDNS/src/LEAmDNS_Helpers.cpp \
243-
ESP8266mDNS/src/LEAmDNS_Structs.cpp \
244-
ESP8266mDNS/src/LEAmDNS_Transfer.cpp \
245-
ESP8266mDNS/src/ESP8266mDNS.cpp \
246-
ArduinoOTA/ArduinoOTA.cpp \
247-
DNSServer/src/DNSServer.cpp \
248-
ESP8266AVRISP/src/ESP8266AVRISP.cpp \
249-
ESP8266HTTPClient/src/ESP8266HTTPClient.cpp \
219+
$(addprefix ../../libraries/ESP8266WiFi/src/,\
220+
ESP8266WiFi.cpp \
221+
ESP8266WiFiAP.cpp \
222+
ESP8266WiFiGeneric.cpp \
223+
ESP8266WiFiMulti.cpp \
224+
ESP8266WiFiSTA-WPS.cpp \
225+
ESP8266WiFiSTA.cpp \
226+
ESP8266WiFiScan.cpp \
227+
WiFiClient.cpp \
228+
WiFiUdp.cpp \
229+
WiFiClientSecureBearSSL.cpp \
230+
WiFiServerSecureBearSSL.cpp \
231+
BearSSLHelpers.cpp \
232+
CertStoreBearSSL.cpp \
250233
) \
251234

252-
MOCK_ARDUINO_LIBS := \
253-
common/ClientContextSocket.cpp \
254-
common/ClientContextTools.cpp \
255-
common/MockWiFiServerSocket.cpp \
256-
common/MockWiFiServer.cpp \
257-
common/UdpContextSocket.cpp \
258-
common/HostWiring.cpp \
259-
common/MockEsp.cpp \
260-
common/MockEEPROM.cpp \
261-
common/MockSPI.cpp \
235+
OPT_ARDUINO_LIBS ?= $(addprefix ../../libraries/,\
236+
$(addprefix ESP8266WebServer/src/,\
237+
ESP8266WebServer.cpp \
238+
Parsing.cpp \
239+
detail/mimetable.cpp \
240+
) \
241+
$(addprefix ESP8266mDNS/src/,\
242+
LEAmDNS.cpp \
243+
LEAmDNS_Control.cpp \
244+
LEAmDNS_Helpers.cpp \
245+
LEAmDNS_Structs.cpp \
246+
LEAmDNS_Transfer.cpp \
247+
ESP8266mDNS.cpp \
248+
) \
249+
ArduinoOTA/ArduinoOTA.cpp \
250+
DNSServer/src/DNSServer.cpp \
251+
ESP8266AVRISP/src/ESP8266AVRISP.cpp \
252+
ESP8266HTTPClient/src/ESP8266HTTPClient.cpp \
253+
) \
254+
255+
MOCK_ARDUINO_LIBS := $(addprefix common/,\
256+
ClientContextSocket.cpp \
257+
ClientContextTools.cpp \
258+
MockWiFiServerSocket.cpp \
259+
MockWiFiServer.cpp \
260+
UdpContextSocket.cpp \
261+
HostWiring.cpp \
262+
MockEsp.cpp \
263+
MockEEPROM.cpp \
264+
MockSPI.cpp \
265+
) \
262266

263267
CPP_SOURCES_CORE_EMU = \
264268
$(MOCK_CPP_FILES_EMU) \
265269
$(CORE_CPP_FILES) \
266270
$(MOCK_ARDUINO_LIBS) \
271+
$(OPT_ARDUINO_LIBS) \
267272
$(ARDUINO_LIBS) \
268273

269-
270274
LIBSSLFILE = ../../tools/sdk/ssl/bearssl/build$(N32)/libbearssl.a
271275
ifeq (,$(wildcard $(LIBSSLFILE)))
272276
LIBSSL =
@@ -340,3 +344,4 @@ help:
340344
@echo ""
341345
@sed -rne 's,([^: \t]*):[^=#]*#[\t ]*(.*),\1 - \2,p' $(MAKEFILE)
342346
@echo ""
347+

0 commit comments

Comments
 (0)