Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove path entirely from marlin_config.json in mc.zip #25706

Merged
merged 2 commits into from
Apr 19, 2023
Merged

remove path entirely from marlin_config.json in mc.zip #25706

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1709e4d
remove path from stored marlin_config.json
ellensp Apr 18, 2023
d9c27d7
add spaces
ellensp Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions buildroot/share/PlatformIO/scripts/signature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ def get_file_sha256sum(filepath):
# Compress a JSON file into a zip file
#
import zipfile
def compress_file(filepath, outpath):
def compress_file(filepath, storedname, outpath):
with zipfile.ZipFile(outpath, 'w', compression=zipfile.ZIP_BZIP2, compresslevel=9) as zipf:
zipf.write(filepath, compress_type=zipfile.ZIP_BZIP2, compresslevel=9)
zipf.write(filepath, arcname=storedname, compress_type=zipfile.ZIP_BZIP2, compresslevel=9)

#
# Compute the build signature. The idea is to extract all defines in the configuration headers
Expand All @@ -56,14 +56,13 @@ def compute_build_signature(env):
files_to_keep = [ 'Marlin/Configuration.h', 'Marlin/Configuration_adv.h' ]

build_path = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
build_path_relative = Path('.pio', 'build', env['PIOENV'])

# Check if we can skip processing
hashes = ''
for header in files_to_keep:
hashes += get_file_sha256sum(header)[0:10]

marlin_json = build_path_relative / 'marlin_config.json'
marlin_json = build_path / 'marlin_config.json'
marlin_zip = build_path / 'mc.zip'

# Read existing config file
Expand All @@ -72,7 +71,7 @@ def compute_build_signature(env):
conf = json.load(infile)
if conf['__INITIAL_HASH'] == hashes:
# Same configuration, skip recomputing the building signature
compress_file(marlin_json, marlin_zip)
compress_file(marlin_json, 'marlin_config.json', marlin_zip)
return
except:
pass
Expand Down Expand Up @@ -256,7 +255,7 @@ def tryint(key):
return

# Compress the JSON file as much as we can
compress_file(marlin_json, marlin_zip)
compress_file(marlin_json, 'marlin_config.json', marlin_zip)

# Generate a C source file for storing this array
with open('Marlin/src/mczip.h','wb') as result_file:
Expand Down