Update scripts

This commit is contained in:
fvanroie 2021-01-21 16:38:30 +01:00
parent e845b73290
commit 61d1746c26
2 changed files with 17 additions and 17 deletions

View File

@ -7,15 +7,15 @@ import shutil
buildFlags = env.ParseFlags(env['BUILD_FLAGS'])
def get_fw_version(source, target, env):
global HASP_VERSION_MAJOR
global HASP_VERSION_MINOR
global HASP_VERSION_REVISION
global HASP_VER_MAJ
global HASP_VER_MIN
global HASP_VER_REV
for item in buildFlags.get("CPPDEFINES"):
if (type(item) is list):
if (item[0]=="HASP_VERSION_MAJOR"): HASP_VERSION_MAJOR = item[1]
if (item[0]=="HASP_VERSION_MINOR"): HASP_VERSION_MINOR = item[1]
if (item[0]=="HASP_VERSION_REVISION"): HASP_VERSION_REVISION = item[1]
if (item[0]=="HASP_VER_MAJ"): HASP_VER_MAJ = item[1]
if (item[0]=="HASP_VER_MIN"): HASP_VER_MIN = item[1]
if (item[0]=="HASP_VER_REV"): HASP_VER_REV = item[1]
print(" * %s = %s" % (item[0],item[1]))
else:
print(" * %s" % item)
@ -23,7 +23,7 @@ def get_fw_version(source, target, env):
OUTPUT_DIR = "build_output{}".format(os.path.sep)
def bin_copy_rename(source, target, env):
variant = str(target[0]).split(os.path.sep)[2] + '_v' + str(HASP_VERSION_MAJOR) + '.' + str(HASP_VERSION_MINOR) + '.' + str(HASP_VERSION_REVISION)
variant = str(target[0]).split(os.path.sep)[2] + '_v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV)
# check if output directories exist and create if necessary
if not os.path.isdir(OUTPUT_DIR):

View File

@ -2,9 +2,9 @@ from datetime import datetime
Import("env")
HASP_VERSION_MAJOR=0
HASP_VERSION_MINOR=0
HASP_VERSION_REVISION=0
HASP_VER_MAJ=0
HASP_VER_MIN=0
HASP_VER_REV=0
now = datetime.utcnow() # current date and time
BUILD_TIMESTAMP=now.strftime("%Y-%m-%d %H:%M:%S")
@ -12,9 +12,9 @@ BUILD_TIMESTAMP=now.strftime("%Y-%m-%d %H:%M:%S")
# Setting datetime each time triggers a full recompile always
# env.Append(CPPDEFINES=[('BUILD_TIMESTAMP', BUILD_TIMESTAMP)])
# env.Append(CPPDEFINES=[('HASP_VERSION_MAJOR', HASP_VERSION_MAJOR)])
# env.Append(CPPDEFINES=[('HASP_VERSION_MINOR', HASP_VERSION_MINOR)])
# env.Append(CPPDEFINES=[('HASP_VERSION_REVISION', HASP_VERSION_REVISION)])
# env.Append(CPPDEFINES=[('HASP_VER_MAJ', HASP_VER_MAJ)])
# env.Append(CPPDEFINES=[('HASP_VER_MIN', HASP_VER_MIN)])
# env.Append(CPPDEFINES=[('HASP_VER_REV', HASP_VER_REV)])
buildFlags = env.ParseFlags(env['BUILD_FLAGS'])
# print(buildFlags)
@ -23,9 +23,9 @@ print("*******************************************************")
# Using for loop
for item in buildFlags.get("CPPDEFINES"):
if (type(item) is list):
if (item[0]=="HASP_VERSION_MAJOR"): HASP_VERSION_MAJOR = item[1]
if (item[0]=="HASP_VERSION_MINOR"): HASP_VERSION_MINOR = item[1]
if (item[0]=="HASP_VERSION_REVISION"): HASP_VERSION_REVISION = item[1]
if (item[0]=="HASP_VER_MAJ"): HASP_VER_MAJ = item[1]
if (item[0]=="HASP_VER_MIN"): HASP_VER_MIN = item[1]
if (item[0]=="HASP_VER_REV"): HASP_VER_REV = item[1]
print(" * %s = %s" % (item[0],item[1]))
else:
print(" * %s" % item)
@ -34,4 +34,4 @@ for item in buildFlags.get("CPPDEFINES"):
#print(env.Dump())
print("*******************************************************")
env.Replace(PROGNAME="%s_v%s.%s.%s" % (env['PIOENV'],HASP_VERSION_MAJOR,HASP_VERSION_MINOR,HASP_VERSION_REVISION))
env.Replace(PROGNAME="%s_v%s.%s.%s" % (env['PIOENV'],HASP_VER_MAJ,HASP_VER_MIN,HASP_VER_REV))