mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 14:26:00 +00:00
build: vendor pinned SDL3 bridge sources
This commit is contained in:
1 parent
5115b4416a
commit
6d6b6726fa
42 files changed
+1111
-27
No files matched your search
@@ -0,0 +1,70 @@
|
||||
import argparse
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
|
||||
|
||||
def contained(directory, relative):
|
||||
path = directory / relative
|
||||
if path.is_symlink() or not path.resolve().is_relative_to(directory.resolve()):
|
||||
raise ValueError('Controller source path escapes its directory: ' + relative)
|
||||
return path
|
||||
|
||||
|
||||
def prepare(root=ROOT, output=None):
|
||||
root = root.resolve()
|
||||
build = root / 'app/build'
|
||||
output = output or build / 'controller-sources'
|
||||
if output.is_symlink() or output.resolve() == build.resolve() or not output.resolve().is_relative_to(build.resolve()):
|
||||
raise ValueError('Controller sources must be generated below app/build')
|
||||
output.parent.mkdir(parents=True, exist_ok=True)
|
||||
with tempfile.TemporaryDirectory(prefix='controller-sources-', dir=output.parent) as temporary:
|
||||
stage = Path(temporary)
|
||||
for name in ('sdlbridge', 'sdl3'):
|
||||
vendor = root / 'third_party' / name
|
||||
manifest = json.loads((vendor / 'upstream.json').read_text(encoding='utf-8'))
|
||||
if manifest.get('version') != 1:
|
||||
raise ValueError('Unsupported controller source manifest: ' + name)
|
||||
source = vendor / 'upstream'
|
||||
files = manifest['files']
|
||||
actual = {p.relative_to(source).as_posix() for p in source.rglob('*') if p.is_file()}
|
||||
if set(files) != actual:
|
||||
raise ValueError('Vendored controller source inventory changed: ' + name)
|
||||
for relative, metadata in files.items():
|
||||
original = contained(source, relative)
|
||||
if hashlib.sha256(original.read_bytes()).hexdigest() != metadata['sha256']:
|
||||
raise ValueError('Vendored controller source hash changed: ' + name + '/' + relative)
|
||||
destination = contained(stage / name, relative)
|
||||
destination.parent.mkdir(parents=True, exist_ok=True)
|
||||
shutil.copyfile(original, destination)
|
||||
shutil.copyfile(vendor / 'upstream.json', stage / name / 'upstream.json')
|
||||
for relative in manifest['patches']:
|
||||
patch = contained(vendor, relative)
|
||||
for line in patch.read_text(encoding='utf-8').splitlines():
|
||||
if line.startswith(('--- ', '+++ ')):
|
||||
filename = line[4:].split('\t', 1)[0]
|
||||
if filename[:2] not in ('a/', 'b/') or filename[2:] not in files:
|
||||
raise ValueError('Patch modifies an unlisted controller source: ' + filename)
|
||||
result = subprocess.run(['git', '-c', 'core.autocrlf=false', '-c', 'core.eol=lf',
|
||||
'apply', '--no-index', '--whitespace=nowarn',
|
||||
'--directory=' + (stage / name).relative_to(root).as_posix(), str(patch)],
|
||||
cwd=root, capture_output=True, text=True)
|
||||
if result.returncode:
|
||||
raise ValueError(name + '/' + relative + ': ' + result.stderr.strip())
|
||||
if output.exists():
|
||||
shutil.rmtree(output)
|
||||
shutil.copytree(stage, output)
|
||||
print('Verified and prepared pinned SDL3 and bridge sources.')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(description='Verify vendored controller snapshots and apply local patches.')
|
||||
parser.add_argument('--output', type=Path)
|
||||
args = parser.parse_args()
|
||||
prepare(output=args.output)
|
||||
@@ -0,0 +1,61 @@
|
||||
import difflib
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
from tools.prepare_controller_sources import prepare
|
||||
|
||||
|
||||
class ControllerSourcesTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.temporary = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(self.temporary.cleanup)
|
||||
self.root = Path(self.temporary.name)
|
||||
for name in ('sdlbridge', 'sdl3'):
|
||||
vendor = self.root / 'third_party' / name
|
||||
(vendor / 'upstream/java').mkdir(parents=True)
|
||||
(vendor / 'patches').mkdir()
|
||||
(vendor / 'upstream/java/Input.java').write_bytes(b'upstream\n')
|
||||
patch = ''.join(difflib.unified_diff(['upstream\n'], ['embedded\n'],
|
||||
fromfile='a/java/Input.java', tofile='b/java/Input.java'))
|
||||
(vendor / 'patches/embed.patch').write_text(patch, encoding='utf-8', newline='\n')
|
||||
manifest = {'version': 1, 'source': {'commit': 'a' * 40},
|
||||
'files': {'java/Input.java': {'sha256': hashlib.sha256(b'upstream\n').hexdigest()}},
|
||||
'patches': ['patches/embed.patch']}
|
||||
(vendor / 'upstream.json').write_text(json.dumps(manifest), encoding='utf-8')
|
||||
|
||||
def test_prepares_patched_sources_without_changing_snapshots(self):
|
||||
prepare(self.root)
|
||||
for name in ('sdlbridge', 'sdl3'):
|
||||
self.assertEqual(b'embedded\n', (self.root / 'app/build/controller-sources' / name / 'java/Input.java').read_bytes())
|
||||
self.assertEqual(b'upstream\n', (self.root / 'third_party' / name / 'upstream/java/Input.java').read_bytes())
|
||||
self.assertTrue((self.root / 'app/build/controller-sources' / name / 'upstream.json').is_file())
|
||||
|
||||
def test_rejects_changed_snapshot_before_replacing_previous_output(self):
|
||||
output = self.root / 'app/build/controller-sources'
|
||||
output.mkdir(parents=True)
|
||||
(output / 'previous').write_text('keep')
|
||||
(self.root / 'third_party/sdlbridge/upstream/java/Input.java').write_bytes(b'drift\n')
|
||||
with self.assertRaisesRegex(ValueError, 'hash changed'):
|
||||
prepare(self.root)
|
||||
self.assertEqual('keep', (output / 'previous').read_text())
|
||||
|
||||
def test_fails_when_an_upstream_update_breaks_a_patch(self):
|
||||
vendor = self.root / 'third_party/sdlbridge'
|
||||
(vendor / 'upstream/java/Input.java').write_bytes(b'new upstream\n')
|
||||
manifest = json.loads((vendor / 'upstream.json').read_text())
|
||||
manifest['files']['java/Input.java']['sha256'] = hashlib.sha256(b'new upstream\n').hexdigest()
|
||||
(vendor / 'upstream.json').write_text(json.dumps(manifest))
|
||||
with self.assertRaisesRegex(ValueError, 'patch does not apply'):
|
||||
prepare(self.root)
|
||||
self.assertFalse((self.root / 'app/build/controller-sources').exists())
|
||||
|
||||
def test_refuses_output_outside_the_build_directory(self):
|
||||
with self.assertRaisesRegex(ValueError, 'below app/build'):
|
||||
prepare(self.root, self.root / 'third_party')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user