vendor Catch2 and ETL
This commit is contained in:
@ -0,0 +1 @@
|
||||
python .\generator_test.py
|
||||
45
contrib/fsfw_contrib/etl-20.39.4/scripts/generator_test.py
Normal file
45
contrib/fsfw_contrib/etl-20.39.4/scripts/generator_test.py
Normal file
@ -0,0 +1,45 @@
|
||||
import subprocess
|
||||
from os.path import abspath
|
||||
from pathlib import Path
|
||||
import filecmp
|
||||
|
||||
root_path = Path(abspath(__file__)).parent.parent
|
||||
generator_folder = root_path/"include" / "etl" / "generators"
|
||||
|
||||
# Create folder where generator outputs can go for purpose of comparison
|
||||
test_folder = root_path / "build" / "generator_tmp"
|
||||
test_folder.mkdir(parents=True, exist_ok= True)
|
||||
|
||||
all_ok = True
|
||||
for generator in generator_folder.iterdir():
|
||||
if generator.suffix != ".h":
|
||||
continue
|
||||
generator_path = str(generator_folder / generator)
|
||||
output_name = generator.name[:-12] + ".h"
|
||||
output_path = str(test_folder / output_name)
|
||||
|
||||
cog_cmd = [
|
||||
"cog",
|
||||
"-d",
|
||||
"-e",
|
||||
f"-o{output_path}",
|
||||
"-DHandlers=16",
|
||||
"-DNTypes=16",
|
||||
"-DIsOneOf=16",
|
||||
generator_path
|
||||
]
|
||||
|
||||
subprocess.run(cog_cmd)
|
||||
|
||||
# Compare generator output against actual file output
|
||||
actual_path = str(generator_folder.parent / output_name)
|
||||
if not filecmp.cmp(actual_path, output_path):
|
||||
print(f"Generator for {output_name} does not match file contents")
|
||||
all_ok = False
|
||||
|
||||
if all_ok:
|
||||
print(f"\nAll generator tests passed\n")
|
||||
exit(0)
|
||||
else:
|
||||
print(f"\nGenerator tests failed\n")
|
||||
exit(1)
|
||||
@ -0,0 +1 @@
|
||||
python .\update_release.py
|
||||
237
contrib/fsfw_contrib/etl-20.39.4/scripts/update_release.py
Normal file
237
contrib/fsfw_contrib/etl-20.39.4/scripts/update_release.py
Normal file
@ -0,0 +1,237 @@
|
||||
|
||||
import shutil
|
||||
import os
|
||||
|
||||
# Get the current path of the script
|
||||
script_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
# Get the root folder of the ETL
|
||||
etl_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
|
||||
|
||||
# Get the ETL repository folder
|
||||
include_dir = os.path.join(etl_dir, 'include')
|
||||
|
||||
# Get the ETL headers folder
|
||||
headers_dir = os.path.join(include_dir, 'etl')
|
||||
|
||||
# Get the Arduino folder
|
||||
arduino_dir = os.path.join(etl_dir, 'arduino')
|
||||
|
||||
# Get the ETL arduino_examples folder
|
||||
arduino_examples_dir = os.path.join(arduino_dir, 'examples')
|
||||
|
||||
# Get the root folder of both repositories
|
||||
common_dir = os.path.abspath(os.path.join(etl_dir, os.pardir))
|
||||
|
||||
# Get the ETL Arduino repository folder
|
||||
etl_arduino_dir = os.path.join(common_dir, 'etl-arduino')
|
||||
|
||||
# Get the ETL Arduino src repository folder
|
||||
etl_arduino_src_dir = os.path.join(etl_arduino_dir, 'src')
|
||||
|
||||
# Get the ETL Arduino examples repository folder
|
||||
etl_arduino_examples_dir = os.path.join(etl_arduino_dir, 'examples')
|
||||
|
||||
major_version = ''
|
||||
minor_version = ''
|
||||
patch_version = ''
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Assumes this folder structure.
|
||||
# Folder Variable
|
||||
# ---------------------------------------
|
||||
# etl etl_dir
|
||||
# arduino arduino_dir
|
||||
# include include_dir
|
||||
# etl-arduino etl_arduino_dir
|
||||
# src etl_arduino_src_dir
|
||||
def create_arduino_variant():
|
||||
print('')
|
||||
print('Copy ETL files to the etl-arduino repository')
|
||||
print('')
|
||||
|
||||
print('script_dir = ', script_dir)
|
||||
print('etl_dir = ', etl_dir)
|
||||
print('include_dir = ', include_dir)
|
||||
print('headers_dir = ', headers_dir)
|
||||
print('arduino_dir = ', arduino_dir)
|
||||
print('examples_dir = ', arduino_examples_dir)
|
||||
print('common_dir = ', common_dir)
|
||||
print('etl_arduino_dir = ', etl_arduino_dir)
|
||||
print('etl_arduino_src_dir = ', etl_arduino_src_dir)
|
||||
print('etl_arduino_examples_dir = ', etl_arduino_examples_dir)
|
||||
|
||||
print('')
|
||||
|
||||
# Copy the library properties
|
||||
src_filename = 'library-arduino.properties'
|
||||
dst_filename = 'library.properties'
|
||||
source = os.path.join(arduino_dir, src_filename)
|
||||
destination = os.path.join(etl_arduino_dir, dst_filename)
|
||||
print('Copy the library properties')
|
||||
print(' From :', source)
|
||||
print(' To :', destination)
|
||||
shutil.copyfile(source, destination)
|
||||
|
||||
print('')
|
||||
|
||||
# Copy the library json
|
||||
src_filename = 'library-arduino.json'
|
||||
dst_filename = 'library.json'
|
||||
source = os.path.join(arduino_dir, src_filename)
|
||||
destination = os.path.join(etl_arduino_dir, dst_filename)
|
||||
print('Copy the library json')
|
||||
print(' From :', source)
|
||||
print(' To :', destination)
|
||||
shutil.copyfile(source, destination)
|
||||
|
||||
print('')
|
||||
|
||||
# Copy the Arduino ETL header
|
||||
filename = 'Embedded_Template_Library.h'
|
||||
source = os.path.join(arduino_dir, filename)
|
||||
destination = os.path.join(etl_arduino_src_dir, filename)
|
||||
print('Copy the Arduino ETL header')
|
||||
print(' From :', source)
|
||||
print(' To :', destination)
|
||||
shutil.copyfile(source, destination)
|
||||
|
||||
print('')
|
||||
|
||||
# Copy the ETL headers
|
||||
source = include_dir
|
||||
destination = etl_arduino_src_dir
|
||||
print('Copy the ETL headers')
|
||||
print(' From :', source)
|
||||
print(' To :', destination)
|
||||
shutil.copytree(source, destination, dirs_exist_ok = True)
|
||||
|
||||
print('')
|
||||
|
||||
# Copy the ETL arduino_examples
|
||||
source = arduino_examples_dir
|
||||
destination = etl_arduino_examples_dir
|
||||
print('Copy the ETL Arduino examples')
|
||||
print(' From :', source)
|
||||
print(' To :', destination)
|
||||
shutil.copytree(source, destination, dirs_exist_ok = True)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def get_version():
|
||||
version_file = os.path.join(etl_dir, 'version.txt')
|
||||
print('')
|
||||
print('version_file = ', version_file)
|
||||
|
||||
with open(version_file) as f:
|
||||
version = f.read().splitlines()
|
||||
|
||||
elements = version[0].split('.', 3)
|
||||
|
||||
return version[0], elements[0], elements[1], elements[2]
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_version_h():
|
||||
print('')
|
||||
print('Creating version.h')
|
||||
|
||||
version_h = os.path.join(headers_dir, 'version.h')
|
||||
|
||||
with open(version_h) as f:
|
||||
text = f.read().splitlines()
|
||||
|
||||
search_major = '#define ETL_VERSION_MAJOR '
|
||||
search_minor = '#define ETL_VERSION_MINOR '
|
||||
search_patch = '#define ETL_VERSION_PATCH '
|
||||
|
||||
length_major = len(search_major)
|
||||
length_minor = len(search_minor)
|
||||
length_patch = len(search_patch)
|
||||
|
||||
for i in range(len(text) - 1):
|
||||
|
||||
index = text[i].find(search_major)
|
||||
if index != -1:
|
||||
text[i] = text[i][index:length_major] + major_version
|
||||
print(text[i])
|
||||
|
||||
index = text[i].find(search_minor)
|
||||
if index != -1:
|
||||
text[i] = text[i][index:length_minor] + minor_version
|
||||
print(text[i])
|
||||
|
||||
index = text[i].find(search_patch)
|
||||
if index != -1:
|
||||
text[i] = text[i][index:length_patch] + patch_version
|
||||
print(text[i])
|
||||
|
||||
with open(version_h, 'w') as f:
|
||||
for line in text:
|
||||
f.write(line)
|
||||
f.write('\n')
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_library_json(filename):
|
||||
print('')
|
||||
print('Creating %s' % filename)
|
||||
|
||||
with open(filename) as f:
|
||||
text = f.read().splitlines()
|
||||
|
||||
search = 'version'
|
||||
|
||||
for i in range(len(text) - 1):
|
||||
index = text[i].find(search)
|
||||
if index != -1:
|
||||
text[i] = ' \"version\": \"' + full_version + '\",'
|
||||
|
||||
with open(filename, 'w') as f:
|
||||
for line in text:
|
||||
f.write(line)
|
||||
f.write('\n')
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_library_properties(filename):
|
||||
print('')
|
||||
print('Creating %s' % filename)
|
||||
|
||||
with open(filename, 'r') as f:
|
||||
text = f.read().splitlines()
|
||||
|
||||
search = 'version'
|
||||
|
||||
for i in range(len(text) - 1):
|
||||
index = text[i].find(search)
|
||||
if index != -1:
|
||||
text[i] = 'version=' + full_version
|
||||
|
||||
with open(filename, 'w') as f:
|
||||
for line in text:
|
||||
f.write(line)
|
||||
f.write('\n')
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_versions():
|
||||
print('')
|
||||
print('Update Versions')
|
||||
|
||||
global full_version
|
||||
global major_version
|
||||
global minor_version
|
||||
global patch_version
|
||||
|
||||
full_version, major_version, minor_version, patch_version = get_version()
|
||||
|
||||
print("Version = %s.%s.%s" % (major_version, minor_version, patch_version ))
|
||||
|
||||
update_version_h()
|
||||
|
||||
update_library_json(os.path.join(etl_dir, 'library.json'))
|
||||
update_library_json(os.path.join(arduino_dir, 'library-arduino.json'))
|
||||
|
||||
update_library_properties(os.path.join(etl_dir, 'library.properties'))
|
||||
update_library_properties(os.path.join(arduino_dir, 'library-arduino.properties'))
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
if __name__ == "__main__":
|
||||
update_versions()
|
||||
create_arduino_variant()
|
||||
@ -0,0 +1 @@
|
||||
python .\update_version.py
|
||||
154
contrib/fsfw_contrib/etl-20.39.4/scripts/update_version.py
Normal file
154
contrib/fsfw_contrib/etl-20.39.4/scripts/update_version.py
Normal file
@ -0,0 +1,154 @@
|
||||
|
||||
import shutil
|
||||
import os
|
||||
|
||||
# Get the current path of the script
|
||||
script_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
# Get the root folder of the ETL
|
||||
etl_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
|
||||
|
||||
# Get the ETL repository folder
|
||||
include_dir = os.path.join(etl_dir, 'include')
|
||||
|
||||
# Get the ETL headers folder
|
||||
headers_dir = os.path.join(include_dir, 'etl')
|
||||
|
||||
# Get the Arduino folder
|
||||
arduino_dir = os.path.join(etl_dir, 'arduino')
|
||||
|
||||
# Get the ETL arduino_examples folder
|
||||
arduino_examples_dir = os.path.join(arduino_dir, 'examples')
|
||||
|
||||
# Get the root folder of both repositories
|
||||
common_dir = os.path.abspath(os.path.join(etl_dir, os.pardir))
|
||||
|
||||
# Get the ETL Arduino repository folder
|
||||
etl_arduino_dir = os.path.join(common_dir, 'etl-arduino')
|
||||
|
||||
# Get the ETL Arduino src repository folder
|
||||
etl_arduino_src_dir = os.path.join(etl_arduino_dir, 'src')
|
||||
|
||||
# Get the ETL Arduino examples repository folder
|
||||
etl_arduino_examples_dir = os.path.join(etl_arduino_dir, 'examples')
|
||||
|
||||
major_version = ''
|
||||
minor_version = ''
|
||||
patch_version = ''
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def get_version():
|
||||
version_file = os.path.join(etl_dir, 'version.txt')
|
||||
print('')
|
||||
print('version_file = ', version_file)
|
||||
|
||||
with open(version_file) as f:
|
||||
version = f.read().splitlines()
|
||||
|
||||
elements = version[0].split('.', 3)
|
||||
|
||||
return version[0], elements[0], elements[1], elements[2]
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_version_h():
|
||||
print('')
|
||||
print('Creating version.h')
|
||||
|
||||
version_h = os.path.join(headers_dir, 'version.h')
|
||||
|
||||
with open(version_h) as f:
|
||||
text = f.read().splitlines()
|
||||
|
||||
search_major = '#define ETL_VERSION_MAJOR '
|
||||
search_minor = '#define ETL_VERSION_MINOR '
|
||||
search_patch = '#define ETL_VERSION_PATCH '
|
||||
|
||||
length_major = len(search_major)
|
||||
length_minor = len(search_minor)
|
||||
length_patch = len(search_patch)
|
||||
|
||||
for i in range(len(text) - 1):
|
||||
|
||||
index = text[i].find(search_major)
|
||||
if index != -1:
|
||||
text[i] = text[i][index:length_major] + major_version
|
||||
print(text[i])
|
||||
|
||||
index = text[i].find(search_minor)
|
||||
if index != -1:
|
||||
text[i] = text[i][index:length_minor] + minor_version
|
||||
print(text[i])
|
||||
|
||||
index = text[i].find(search_patch)
|
||||
if index != -1:
|
||||
text[i] = text[i][index:length_patch] + patch_version
|
||||
print(text[i])
|
||||
|
||||
with open(version_h, 'w') as f:
|
||||
for line in text:
|
||||
f.write(line)
|
||||
f.write('\n')
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_library_json(filename):
|
||||
print('')
|
||||
print('Creating %s' % filename)
|
||||
|
||||
with open(filename) as f:
|
||||
text = f.read().splitlines()
|
||||
|
||||
search = 'version'
|
||||
|
||||
for i in range(len(text) - 1):
|
||||
index = text[i].find(search)
|
||||
if index != -1:
|
||||
text[i] = ' \"version\": \"' + full_version + '\",'
|
||||
|
||||
with open(filename, 'w') as f:
|
||||
for line in text:
|
||||
f.write(line)
|
||||
f.write('\n')
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_library_properties(filename):
|
||||
print('')
|
||||
print('Creating %s' % filename)
|
||||
|
||||
with open(filename, 'r') as f:
|
||||
text = f.read().splitlines()
|
||||
|
||||
search = 'version'
|
||||
|
||||
for i in range(len(text) - 1):
|
||||
index = text[i].find(search)
|
||||
if index != -1:
|
||||
text[i] = 'version=' + full_version
|
||||
|
||||
with open(filename, 'w') as f:
|
||||
for line in text:
|
||||
f.write(line)
|
||||
f.write('\n')
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
def update_versions():
|
||||
print('')
|
||||
print('Update Versions')
|
||||
|
||||
global full_version
|
||||
global major_version
|
||||
global minor_version
|
||||
global patch_version
|
||||
|
||||
full_version, major_version, minor_version, patch_version = get_version()
|
||||
|
||||
print("Version = %s.%s.%s" % (major_version, minor_version, patch_version ))
|
||||
|
||||
update_version_h()
|
||||
|
||||
update_library_json(os.path.join(etl_dir, 'library.json'))
|
||||
|
||||
update_library_properties(os.path.join(etl_dir, 'library.properties'))
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
if __name__ == "__main__":
|
||||
update_versions()
|
||||
Reference in New Issue
Block a user