diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml index 60fc037ac..f33b5c004 100644 --- a/.github/workflows/pre_release.yml +++ b/.github/workflows/pre_release.yml @@ -30,7 +30,7 @@ jobs: - name: Get EMS-ESP version id: build_info run: | - version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'` + version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'` echo "VERSION=$version" >> $GITHUB_OUTPUT - name: Install PlatformIO diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index 8891d6bc0..742e82484 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -28,7 +28,7 @@ jobs: - name: Get EMS-ESP source code and version id: build_info run: | - version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'` + version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'` echo "VERSION=$version" >> $GITHUB_OUTPUT - name: Install PlatformIO diff --git a/scripts/rename_fw.py b/scripts/rename_fw.py index ab3bec5bb..93fd1f5f7 100755 --- a/scripts/rename_fw.py +++ b/scripts/rename_fw.py @@ -9,10 +9,10 @@ OUTPUT_DIR = "build{}".format(os.path.sep) def bin_copy(source, target, env): - # get the application version from version.h + # get the application version from emsesp_version.h bag = {} exprs = [(re.compile(r'^#define EMSESP_APP_VERSION\s+"(\S+)"'), 'app_version')] - with open('./src/version.h', 'r') as f: + with open('./src/emsesp_version.h', 'r') as f: for l in f.readlines(): for expr, var in exprs: m = expr.match(l) diff --git a/scripts/run_native.py b/scripts/run_native.py index ed741a5e0..d79f835d0 100644 --- a/scripts/run_native.py +++ b/scripts/run_native.py @@ -11,7 +11,7 @@ def move_file(source, target, env): # get the build info bag = {} exprs = [(re.compile(r'^#define EMSESP_APP_VERSION\s+"(\S+)"'), 'app_version')] - with open('./src/version.h', 'r') as f: + with open('./src/emsesp_version.h', 'r') as f: for l in f.readlines(): for expr, var in exprs: m = expr.match(l) diff --git a/src/core/emsesp.h b/src/core/emsesp.h index 7ae4915d0..f1a952b53 100644 --- a/src/core/emsesp.h +++ b/src/core/emsesp.h @@ -71,7 +71,7 @@ #include "roomcontrol.h" #include "command.h" -#include "../version.h" +#include "../emsesp_version.h" // Load external modules class Module {}; // forward declaration diff --git a/src/version.h b/src/emsesp_version.h similarity index 100% rename from src/version.h rename to src/emsesp_version.h