Work in progress

Updates version.h
This commit is contained in:
John Wellbelove 2022-04-01 12:22:00 +02:00
parent 10da3ac9e5
commit 1399c0d0d9
5 changed files with 222 additions and 107 deletions

View File

@ -1,103 +0,0 @@
import shutil
import os
# 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
print('')
print('Copy ETL files to the etl-arduino repository')
print('')
# Get the current path of the script
arduino_dir = os.path.dirname(__file__)
print('arduino_dir = ', arduino_dir)
# Get the root folder of the ETL
etl_dir = os.path.dirname(arduino_dir)
print('etl_dir = ', etl_dir)
# Get the ETL repository folder
include_dir = os.path.join(etl_dir, 'include')
print('include_dir = ', include_dir)
# Get the ETL arduino_examples folder
arduino_examples_dir = os.path.join(arduino_dir, 'examples')
print('examples_dir = ', arduino_examples_dir)
# Get the root folder of both repositories
common_dir = os.path.dirname(etl_dir)
print('common_dir = ', common_dir)
# Get the ETL Arduino repository folder
etl_arduino_dir = os.path.join(common_dir, 'etl-arduino')
print('etl_arduino_dir = ', etl_arduino_dir)
# Get the ETL Arduino src repository folder
etl_arduino_src_dir = os.path.join(etl_arduino_dir, 'src')
print('etl_arduino_src_dir = ', etl_arduino_src_dir)
# Get the ETL Arduino examples repository folder
etl_arduino_examples_dir = os.path.join(etl_arduino_dir, 'examples')
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)

198
scripts/update_release.py Normal file
View File

@ -0,0 +1,198 @@
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()
elements = version.split('.', 3)
return elements[0], elements[1], elements[2]
#------------------------------------------------------------------------------
def create_version_h():
print('')
print('Creating version.h')
version_h = os.path.join(headers_dir, 'version.h')
with open(version_h) as f:
text = f.readlines()
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])
#------------------------------------------------------------------------------
def create_library_json():
print('')
print('Creating library.json')
#------------------------------------------------------------------------------
def create_library_properties():
print('')
print('Creating library.properties')
#------------------------------------------------------------------------------
def update_versions():
print('')
print('Update Versions')
print('')
global major_version
global minor_version
global patch_version
major_version, minor_version, patch_version = get_version()
print("Version = %s.%s.%s" % ( major_version, minor_version, patch_version ))
create_version_h()
create_library_json()
create_library_properties()
#------------------------------------------------------------------------------
if __name__ == "__main__":
create_arduino_variant()
update_versions()

View File

@ -11499,6 +11499,9 @@
<None Include="..\..\arduino\create_arduino_library.py" />
<None Include="..\..\arduino\library-arduino.json" />
<None Include="..\..\arduino\library-arduino.properties" />
<None Include="..\..\cmake\GetGitRevisionDescription.cmake" />
<None Include="..\..\cmake\GetGitRevisionDescription.cmake.in" />
<None Include="..\..\cmake\helpers.cmake" />
<None Include="..\..\etl.pspimage" />
<None Include="..\..\etl.xar" />
<None Include="..\..\include\etl\generators\generate.bat" />
@ -11515,7 +11518,7 @@
<None Include="..\..\library.properties" />
<None Include="..\..\meson.build" />
<None Include="..\..\README.md" />
<None Include="..\cmake\unit-test_external_project.cmake" />
<None Include="..\..\scripts\update_release.py" />
<None Include="..\runsanitychecks.sh" />
<None Include="..\runtests.sh" />
<None Include="cpp.hint" />
@ -11524,6 +11527,7 @@
<Text Include="..\..\CMakeLists.txt" />
<Text Include="..\..\support\Release notes.txt" />
<Text Include="..\..\todo.txt" />
<Text Include="..\..\version.txt" />
<Text Include="..\CMakeLists.txt" />
<Text Include="..\sanity-check\c++03\CMakeLists.txt" />
<Text Include="..\sanity-check\c++11\CMakeLists.txt" />

View File

@ -193,6 +193,9 @@
<Filter Include="UnitTest++\Source Files\Win32">
<UniqueIdentifier>{107d7e33-580f-4dc5-be11-a4b2076c2c10}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files\Scripts">
<UniqueIdentifier>{4ee68175-3bc2-4d30-b8bf-be7261124979}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\etl\enum_type.h">
@ -3289,9 +3292,6 @@
<None Include="..\..\.circleci\config.yml">
<Filter>Resource Files\CI\CircleCI</Filter>
</None>
<None Include="..\cmake\unit-test_external_project.cmake">
<Filter>Resource Files\CMake</Filter>
</None>
<None Include="..\..\appveyor.yml">
<Filter>Resource Files\CI\Appveyor</Filter>
</None>
@ -3334,6 +3334,18 @@
<None Include="..\..\arduino\create_arduino_library.py">
<Filter>Resource Files\Arduino</Filter>
</None>
<None Include="..\..\cmake\GetGitRevisionDescription.cmake">
<Filter>Resource Files\CMake</Filter>
</None>
<None Include="..\..\cmake\GetGitRevisionDescription.cmake.in">
<Filter>Resource Files\CMake</Filter>
</None>
<None Include="..\..\cmake\helpers.cmake">
<Filter>Resource Files\CMake</Filter>
</None>
<None Include="..\..\scripts\update_release.py">
<Filter>Resource Files\Scripts</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\support\Release notes.txt">
@ -3363,6 +3375,9 @@
<Text Include="..\CMakeLists.txt">
<Filter>Tests\Test Support</Filter>
</Text>
<Text Include="..\..\version.txt">
<Filter>Resource Files</Filter>
</Text>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\etl.ico">

1
version.txt Normal file
View File

@ -0,0 +1 @@
20.27.1