jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename PC build envs

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2024-02-12 18:33:04 +01:00
parent 55f39f02d0
commit 37e66cdf5b
No known key found for this signature in database
GPG Key ID: 43037AC62A600562
9 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yaml vendored
View File

@ -158,7 +158,7 @@ jobs:
- name: Enable Linux platform from platformio_override.ini - name: Enable Linux platform from platformio_override.ini
run: | run: |
sed 's/; user_setups\/linux/user_setups\/linux/g' platformio_override-template.ini > platformio_override.ini sed 's/; user_setups\/linux/user_setups\/linux/g' platformio_override-template.ini > platformio_override.ini
mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src mkdir -p .pio/libdeps/linux_sdl/paho/src
- name: Install SDL2 library - name: Install SDL2 library
run: | run: |
sudo apt-get update sudo apt-get update
@ -172,10 +172,10 @@ jobs:
- name: Enable Linux platform from platformio_override.ini - name: Enable Linux platform from platformio_override.ini
run: | run: |
sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini
mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src mkdir -p .pio/libdeps/linux_sdl/paho/src
- name: Install SDL2 library - name: Install SDL2 library
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install libsdl2-dev sudo apt-get install libsdl2-dev
- name: Run PlatformIO - name: Run PlatformIO
run: pio run -e linux_sdl_64bits run: pio run -e linux_sdl

4
.github/workflows/build_linux.yaml vendored
View File

@ -11,7 +11,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
environments: environments:
- linux_sdl_64bits - linux_sdl
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -43,7 +43,7 @@ jobs:
- name: Enable Linux platform from platformio_override.ini - name: Enable Linux platform from platformio_override.ini
run: | run: |
sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini
mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src mkdir -p .pio/libdeps/linux_sdl/paho/src
- name: Install SDL2 library - name: Install SDL2 library
run: | run: |
sudo apt-get update sudo apt-get update

2
.github/workflows/release.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
- name: Enable Linux platform from platformio_override.ini - name: Enable Linux platform from platformio_override.ini
run: | run: |
sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini sed -i 's/; user_setups\/linux/user_setups\/linux/g' platformio_override.ini
mkdir -p .pio/libdeps/linux_sdl_64bits/paho/src mkdir -p .pio/libdeps/linux_sdl/paho/src
- name: Install SDL2 library - name: Install SDL2 library
run: | run: |
sudo apt-get update sudo apt-get update

4
platformio_override-template.ini
View File

@ -6,11 +6,11 @@
[platformio] [platformio]
extra_configs = extra_configs =
; Uncomment or edit the lines to show more User Setups in the PIO sidebar ; Uncomment or edit the lines to show more User Setups in the PIO sidebar
; user_setups/darwin_sdl/*.ini ; user_setups/darwin/*.ini
; user_setups/esp32/*.ini ; user_setups/esp32/*.ini
; user_setups/esp32s2/*.ini ; user_setups/esp32s2/*.ini
; user_setups/esp32s3/*.ini ; user_setups/esp32s3/*.ini
; user_setups/linux_sdl/*.ini ; user_setups/linux/*.ini
; user_setups/stm32f4xx/*.ini ; user_setups/stm32f4xx/*.ini
; user_setups/win32/*.ini ; user_setups/win32/*.ini

20
user_setups/darwin_sdl/darwin_sdl_64bits.ini → user_setups/darwin/darwin_sdl.ini
View File

@ -1,4 +1,4 @@
[env:darwin_sdl_64bits] [env:darwin_sdl]
lib_archive = false lib_archive = false
platform = native@^1.1.4 platform = native@^1.1.4
extra_scripts = extra_scripts =
@ -49,8 +49,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE ;-D NO_PERSISTENCE
-I.pio/libdeps/darwin_sdl_64bits/paho/src -I.pio/libdeps/darwin_sdl/paho/src
-I.pio/libdeps/darwin_sdl_64bits/ArduinoJson/src -I.pio/libdeps/darwin_sdl/ArduinoJson/src
-I lib/ArduinoJson/src -I lib/ArduinoJson/src
-I lib/lv_fs_if -I lib/lv_fs_if
!python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))" !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
@ -85,12 +85,12 @@ lib_ignore =
build_src_filter = build_src_filter =
+<*> +<*>
-<*.h> -<*.h>
+<../.pio/libdeps/darwin_sdl_64bits/paho/src/*.c> +<../.pio/libdeps/darwin_sdl/paho/src/*.c>
-<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTClient.c> -<../.pio/libdeps/darwin_sdl/paho/src/MQTTClient.c>
+<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTAsync.c> +<../.pio/libdeps/darwin_sdl/paho/src/MQTTAsync.c>
+<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTAsyncUtils.c> +<../.pio/libdeps/darwin_sdl/paho/src/MQTTAsyncUtils.c>
-<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTVersion.c> -<../.pio/libdeps/darwin_sdl/paho/src/MQTTVersion.c>
-<../.pio/libdeps/darwin_sdl_64bits/paho/src/SSLSocket.c> -<../.pio/libdeps/darwin_sdl/paho/src/SSLSocket.c>
-<MQTTClient.c> -<MQTTClient.c>
+<MQTTAsync.c> +<MQTTAsync.c>
+<MQTTAsyncUtils.c> +<MQTTAsyncUtils.c>
@ -112,4 +112,4 @@ build_src_filter =
+<lang/> +<lang/>
-<log/> -<log/>
+<mqtt/> +<mqtt/>
+<../.pio/libdeps/darwin_sdl_64bits/ArduinoJson/src/ArduinoJson.h> +<../.pio/libdeps/darwin_sdl/ArduinoJson/src/ArduinoJson.h>

20
user_setups/linux_sdl/linux_fbdev_64bits.ini → user_setups/linux/linux_fbdev.ini
View File

@ -1,4 +1,4 @@
[env:linux_fbdev_64bits] [env:linux_fbdev]
platform = native@^1.1.4 platform = native@^1.1.4
extra_scripts = extra_scripts =
tools/linux_build_extra.py tools/linux_build_extra.py
@ -46,8 +46,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE ;-D NO_PERSISTENCE
-I.pio/libdeps/linux_fbdev_64bits/paho/src -I.pio/libdeps/linux_fbdev/paho/src
-I.pio/libdeps/linux_fbdev_64bits/ArduinoJson/src -I.pio/libdeps/linux_fbdev/ArduinoJson/src
; ----- Statically linked libraries -------------------- ; ----- Statically linked libraries --------------------
-lm -lm
@ -71,12 +71,12 @@ lib_ignore =
build_src_filter = build_src_filter =
+<*> +<*>
-<*.h> -<*.h>
+<../.pio/libdeps/linux_fbdev_64bits/paho/src/*.c> +<../.pio/libdeps/linux_fbdev/paho/src/*.c>
-<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTClient.c> -<../.pio/libdeps/linux_fbdev/paho/src/MQTTClient.c>
+<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTAsync.c> +<../.pio/libdeps/linux_fbdev/paho/src/MQTTAsync.c>
+<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTAsyncUtils.c> +<../.pio/libdeps/linux_fbdev/paho/src/MQTTAsyncUtils.c>
-<../.pio/libdeps/linux_fbdev_64bits/paho/src/MQTTVersion.c> -<../.pio/libdeps/linux_fbdev/paho/src/MQTTVersion.c>
-<../.pio/libdeps/linux_fbdev_64bits/paho/src/SSLSocket.c> -<../.pio/libdeps/linux_fbdev/paho/src/SSLSocket.c>
-<MQTTClient.c> -<MQTTClient.c>
+<MQTTAsync.c> +<MQTTAsync.c>
+<MQTTAsyncUtils.c> +<MQTTAsyncUtils.c>
@ -98,4 +98,4 @@ build_src_filter =
+<lang/> +<lang/>
-<log/> -<log/>
+<mqtt/> +<mqtt/>
+<../.pio/libdeps/linux_fbdev_64bits/ArduinoJson/src/ArduinoJson.h> +<../.pio/libdeps/linux_fbdev/ArduinoJson/src/ArduinoJson.h>

20
user_setups/linux_sdl/linux_sdl_64bits.ini → user_setups/linux/linux_sdl.ini
View File

@ -1,4 +1,4 @@
[env:linux_sdl_64bits] [env:linux_sdl]
platform = native@^1.1.4 platform = native@^1.1.4
extra_scripts = extra_scripts =
tools/sdl2_build_extra.py tools/sdl2_build_extra.py
@ -49,8 +49,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE ;-D NO_PERSISTENCE
-I.pio/libdeps/linux_sdl_64bits/paho/src -I.pio/libdeps/linux_sdl/paho/src
-I.pio/libdeps/linux_sdl_64bits/ArduinoJson/src -I.pio/libdeps/linux_sdl/ArduinoJson/src
!python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))" !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
; ----- Statically linked libraries -------------------- ; ----- Statically linked libraries --------------------
@ -76,12 +76,12 @@ lib_ignore =
build_src_filter = build_src_filter =
+<*> +<*>
-<*.h> -<*.h>
+<../.pio/libdeps/linux_sdl_64bits/paho/src/*.c> +<../.pio/libdeps/linux_sdl/paho/src/*.c>
-<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTClient.c> -<../.pio/libdeps/linux_sdl/paho/src/MQTTClient.c>
+<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTAsync.c> +<../.pio/libdeps/linux_sdl/paho/src/MQTTAsync.c>
+<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTAsyncUtils.c> +<../.pio/libdeps/linux_sdl/paho/src/MQTTAsyncUtils.c>
-<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTVersion.c> -<../.pio/libdeps/linux_sdl/paho/src/MQTTVersion.c>
-<../.pio/libdeps/linux_sdl_64bits/paho/src/SSLSocket.c> -<../.pio/libdeps/linux_sdl/paho/src/SSLSocket.c>
-<MQTTClient.c> -<MQTTClient.c>
+<MQTTAsync.c> +<MQTTAsync.c>
+<MQTTAsyncUtils.c> +<MQTTAsyncUtils.c>
@ -103,4 +103,4 @@ build_src_filter =
+<lang/> +<lang/>
-<log/> -<log/>
+<mqtt/> +<mqtt/>
+<../.pio/libdeps/linux_sdl_64bits/ArduinoJson/src/ArduinoJson.h> +<../.pio/libdeps/linux_sdl/ArduinoJson/src/ArduinoJson.h>

20
user_setups/win32/windows_gdi_64bits.ini → user_setups/win32/windows_gdi.ini
View File

@ -1,4 +1,4 @@
[env:windows_gdi_64bits] [env:windows_gdi]
platform = native@^1.1.4 platform = native@^1.1.4
extra_scripts = extra_scripts =
tools/windows_build_extra.py tools/windows_build_extra.py
@ -55,8 +55,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE ;-D NO_PERSISTENCE
-I.pio/libdeps/windows_gdi_64bits/paho/src -I.pio/libdeps/windows_gdi/paho/src
-I.pio/libdeps/windows_gdi_64bits/ArduinoJson/src -I.pio/libdeps/windows_gdi/ArduinoJson/src
-I lib/lv_fs_if -I lib/lv_fs_if
-I lib/lv_datetime -I lib/lv_datetime
-mconsole -mconsole
@ -100,12 +100,12 @@ lib_ignore =
build_src_filter = build_src_filter =
+<*> +<*>
-<*.h> -<*.h>
+<../.pio/libdeps/windows_gdi_64bits/paho/src/*.c> +<../.pio/libdeps/windows_gdi/paho/src/*.c>
-<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTClient.c> -<../.pio/libdeps/windows_gdi/paho/src/MQTTClient.c>
+<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTAsync.c> +<../.pio/libdeps/windows_gdi/paho/src/MQTTAsync.c>
+<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTAsyncUtils.c> +<../.pio/libdeps/windows_gdi/paho/src/MQTTAsyncUtils.c>
-<../.pio/libdeps/windows_gdi_64bits/paho/src/MQTTVersion.c> -<../.pio/libdeps/windows_gdi/paho/src/MQTTVersion.c>
-<../.pio/libdeps/windows_gdi_64bits/paho/src/SSLSocket.c> -<../.pio/libdeps/windows_gdi/paho/src/SSLSocket.c>
-<MQTTClient.c> -<MQTTClient.c>
+<MQTTAsync.c> +<MQTTAsync.c>
+<MQTTAsyncUtils.c> +<MQTTAsyncUtils.c>
@ -127,5 +127,5 @@ build_src_filter =
+<lang/> +<lang/>
-<log/> -<log/>
+<mqtt/> +<mqtt/>
+<../.pio/libdeps/windows_gdi_64bits/ArduinoJson/src/ArduinoJson.h> +<../.pio/libdeps/windows_gdi/ArduinoJson/src/ArduinoJson.h>
+<lib/lv_datetime> +<lib/lv_datetime>

20
user_setups/win32/windows_sdl_64bits.ini → user_setups/win32/windows_sdl.ini
View File

@ -1,4 +1,4 @@
[env:windows_sdl_64bits] [env:windows_sdl]
platform = native@^1.1.4 platform = native@^1.1.4
extra_scripts = extra_scripts =
tools/sdl2_build_extra.py tools/sdl2_build_extra.py
@ -59,8 +59,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE ;-D NO_PERSISTENCE
-I.pio/libdeps/windows_sdl_64bits/paho/src -I.pio/libdeps/windows_sdl/paho/src
-I.pio/libdeps/windows_sdl_64bits/ArduinoJson/src -I.pio/libdeps/windows_sdl/ArduinoJson/src
-I lib/lv_fs_if -I lib/lv_fs_if
-I lib/lv_datetime -I lib/lv_datetime
!python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))" !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
@ -106,12 +106,12 @@ lib_ignore =
build_src_filter = build_src_filter =
+<*> +<*>
-<*.h> -<*.h>
+<../.pio/libdeps/windows_sdl_64bits/paho/src/*.c> +<../.pio/libdeps/windows_sdl/paho/src/*.c>
-<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTClient.c> -<../.pio/libdeps/windows_sdl/paho/src/MQTTClient.c>
+<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsync.c> +<../.pio/libdeps/windows_sdl/paho/src/MQTTAsync.c>
+<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsyncUtils.c> +<../.pio/libdeps/windows_sdl/paho/src/MQTTAsyncUtils.c>
-<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTVersion.c> -<../.pio/libdeps/windows_sdl/paho/src/MQTTVersion.c>
-<../.pio/libdeps/windows_sdl_64bits/paho/src/SSLSocket.c> -<../.pio/libdeps/windows_sdl/paho/src/SSLSocket.c>
-<MQTTClient.c> -<MQTTClient.c>
+<MQTTAsync.c> +<MQTTAsync.c>
+<MQTTAsyncUtils.c> +<MQTTAsyncUtils.c>
@ -133,5 +133,5 @@ build_src_filter =
+<lang/> +<lang/>
-<log/> -<log/>
+<mqtt/> +<mqtt/>
+<../.pio/libdeps/windows_sdl_64bits/ArduinoJson/src/ArduinoJson.h> +<../.pio/libdeps/windows_sdl/ArduinoJson/src/ArduinoJson.h>
+<lib/lv_datetime> +<lib/lv_datetime>