diff --git a/.gitignore b/.gitignore index 7b22078b8..5fd84dbbd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ tmp/ *.axf *.S19 *.bin +*.hex *.dep *.FLM diff --git a/test/info.py b/test/info.py index c8a8a40d6..7b948ca5e 100644 --- a/test/info.py +++ b/test/info.py @@ -59,7 +59,7 @@ ("k20dx_mimxrt1050_evk_hyper_if", True, 0x8000, "bin" ), ("k20dx_mimxrt1050_evk_qspi_if", True, 0x8000, "bin" ), ('k20dx_ep_agora_if', True, 0x0000, "bin" ), - ('k20dx_ep_kairos_if', True, 0x0000, "bin" ), + ('k20dx_ep_kairos_if', True, 0x0000, "bin" ), ("k26f_frdmk32w042_if", False, 0x8000, "bin" ), ("lpc11u35_archble_if", False, 0x0000, "bin" ), ("lpc11u35_archpro_if", False, 0x0000, "bin" ), diff --git a/tools/package_release_files.py b/tools/package_release_files.py index 5ae31cf34..00208ce23 100644 --- a/tools/package_release_files.py +++ b/tools/package_release_files.py @@ -84,7 +84,7 @@ def package_release_files(source, dest, version, toolchain, release_info, suppor for fw_name_key in InstructionsText: if fw_name_key in dest_name.lower(): fw_instuction = InstructionsText[fw_name_key] - break; + break if extension == 'bin': update_yml_entries.append({target_name:TargetList([ @@ -92,7 +92,7 @@ def package_release_files(source, dest, version, toolchain, release_info, suppor ('product_code', "'" + format(product_code, '04x') + "'"), ('fw_name', host_mcu + "_" + base_name + dest_offset_str), ('instructions', fw_instuction) - ])}); + ])}) make_bin_zip(output_dir, build_number + '_release_package_' + subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode().strip() + '.zip') diff --git a/tools/pre_build_script.sh b/tools/pre_build_script.sh index 7dcc5fa76..bc640a155 100755 --- a/tools/pre_build_script.sh +++ b/tools/pre_build_script.sh @@ -21,7 +21,7 @@ export TOOLS=../../../tools export DIR=../../../source/daplink # Create dsion_git_tmpl.txt ${DIR}\version_git.h -python --version 2> nul +# python --version # Run python script to delete default version_git.h and create the real one python ${TOOLS}/pre_build_script.py