-
Notifications
You must be signed in to change notification settings - Fork 117
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #538 from KipK/build_version
dynamically set build version using current git tag/shorthash
- Loading branch information
Showing
5 changed files
with
66 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,6 @@ data_dir = src/data | |
| default_envs = openevse_wifi_v1 | ||
|
|
||
| [common] | ||
| version = -D BUILD_TAG=4.1.8 | ||
| lib_deps = | ||
| bblanchon/[email protected] | ||
| jeremypoulter/[email protected] | ||
|
|
@@ -42,7 +41,9 @@ lib_deps = | |
| matth-x/[email protected] | ||
| matth-x/[email protected] | ||
| lib_ignore = WebSockets ; ArduinoOcpp: don't compile built-in WS library | ||
| extra_scripts = scripts/extra_script.py | ||
| extra_scripts = | ||
| pre:scripts/auto_fw_version.py | ||
| scripts/extra_script.py | ||
| debug_flags = | ||
| -ggdb | ||
| -D ENABLE_DEBUG | ||
|
|
@@ -116,8 +117,7 @@ platform = [email protected] | |
| framework = arduino | ||
| lib_deps = ${common.lib_deps} | ||
| lib_ignore = ${common.lib_ignore} | ||
| build_flags = | ||
| ${common.build_flags} | ||
| build_flags = ${common.build_flags} | ||
| #upload_port = openevse.local | ||
| upload_speed = 921600 | ||
| extra_scripts = ${common.extra_scripts} | ||
|
|
@@ -134,7 +134,6 @@ monitor_filters = | |
| board = nodemcu-32s | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version}.dev | ||
| ${common.src_build_flags} | ||
| ${common.debug_flags} | ||
| -D WIFI_LED=2 | ||
|
|
@@ -148,7 +147,6 @@ lib_deps = | |
| ${common.neopixel_lib} | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version}.dev | ||
| ${common.src_build_flags} | ||
| ${common.debug_flags} | ||
| -D WIFI_BUTTON=2 | ||
|
|
@@ -179,7 +177,6 @@ platform = espressif32 | |
| [env:openevse_huzzah32_dev] | ||
| board = featheresp32 | ||
| build_flags = | ||
| ${common.version}.dev | ||
| ${common.build_flags} | ||
| ${common.src_build_flags} | ||
| ${common.debug_flags} | ||
|
|
@@ -194,7 +191,6 @@ build_flags = | |
| board = featheresp32 | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version} | ||
| ${common.src_build_flags} | ||
| -D WIFI_LED=13 | ||
| -D WIFI_LED_ON_STATE=HIGH | ||
|
|
@@ -207,7 +203,6 @@ build_flags = | |
| board = featheresp32 | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version}.dev | ||
| ${common.src_build_flags} | ||
| ${common.debug_flags} | ||
| -D WIFI_LED=LED_BUILTIN | ||
|
|
@@ -223,7 +218,6 @@ lib_deps = | |
| adafruit/Adafruit MCP9808 Library @ 1.1.2 | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version} | ||
| ${common.src_build_flags} | ||
| ${common.debug_flags} | ||
| -D NEO_PIXEL_PIN=17 | ||
|
|
@@ -245,7 +239,6 @@ upload_command = curl -F firmware=@$SOURCE http://$UPLOAD_PORT/update --progress | |
| board = esp32-gateway | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version} | ||
| ${common.src_build_flags} | ||
| -D WIFI_LED=33 | ||
| -D WIFI_LED_ON_STATE=HIGH | ||
|
|
@@ -262,7 +255,6 @@ build_flags = | |
| board = esp32-gateway | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version} | ||
| ${common.src_build_flags} | ||
| -D WIFI_LED=33 | ||
| -D WIFI_LED_ON_STATE=HIGH | ||
|
|
@@ -306,7 +298,6 @@ board_build.partitions = ${common.build_partitions_debug} | |
| board = esp32-poe-iso | ||
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.version} | ||
| ${common.src_build_flags} | ||
| -D WIFI_BUTTON=34 | ||
| -D WIFI_BUTTON_PRESSED_STATE=LOW | ||
|
|
@@ -321,7 +312,6 @@ board = heltec_wifi_lora_32_V2 | |
| build_flags = | ||
| ${common.build_flags} | ||
| ${common.src_build_flags} | ||
| ${common.version}.dev | ||
| -D DEBUG_PORT=Serial | ||
| -D WIFI_LED=25 | ||
| -D WIFI_LED_ON_STATE=HIGH | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import subprocess | ||
| import os | ||
|
|
||
| Import("env") | ||
|
|
||
|
|
||
|
|
||
| def get_build_flag(): | ||
| #ret = subprocess.run(["git", "describe"], stdout=subprocess.PIPE, text=True) #Uses only annotated tags | ||
| ret = subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE, text=True) #Uses any tags | ||
| build_version = ret.stdout.strip() | ||
| build_flag = "-D BUILD_TAG=" + build_version | ||
| print ("Firmware Revision: " + build_flag) | ||
| return (build_flag) | ||
|
|
||
| env.Append( | ||
| BUILD_FLAGS=[get_build_flag()] | ||
| ) |