From 60caa853533c029e36f68d666e47f48036fbe3f8 Mon Sep 17 00:00:00 2001 From: kmnkv1 <95131920+kmnkv1@users.noreply.github.com> Date: Thu, 15 Oct 2026 00:56:12 +0700 Subject: [PATCH] Build and test on Windows: LF session scripts, '/' in relative paths (#552) fix: build and test on Windows - .gitattributes keeps the session's scripts LF under core.autocrlf=true; CRLF scripts made every session exit with status 2. - runtime_inputs.py and the scrub record / log zip use '/' in relative paths, which Windows reported with '\' (runtime inputs never matched). - The read-only-folder scrub test is skipped on Windows, which still creates files in a read-only directory. Co-authored-by: xXJsonDeruloXx --- .gitattributes | 2 ++ .../java/com/droiddeck/launcher/session/SessionArtifacts.kt | 2 +- .../java/com/droiddeck/launcher/session/SessionLogShare.kt | 2 +- .../com/droiddeck/launcher/session/SessionLogShareTest.kt | 1 + tools/release/runtime_inputs.py | 4 ++-- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index b4e784d8fc..53fa6915cf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,4 @@ +tools/linuxfs/** text=auto eol=lf +tools/mangoapp/** text=auto eol=lf tools/comet/LICENSE whitespace=-blank-at-eof tools/comet/droiddeck.patch whitespace=-blank-at-eol,-blank-at-eof diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index 9249871d5f..8a4927a909 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -119,7 +119,7 @@ object SessionArtifacts { val lines = StringBuilder("rules ${LogRedactor.RULES_VERSION}\n") record.files.forEach { (f, s) -> lines.append(s.length).append('\t').append(s.modified).append('\t') - .append(f.relativeTo(dir).path).append('\n') + .append(f.relativeTo(dir).invariantSeparatorsPath).append('\n') } tree.writeText(lines.toString()) true diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt index 11f008fe6d..4ff28ac024 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt @@ -58,7 +58,7 @@ object SessionLogShare { if (percent != shown) { shown = percent; onProgress?.invoke(percent / 100f) } } ZipOutputStream(zip.outputStream().buffered()).use { z -> - files.forEach { f -> addEntry(z, folder.name + "/" + f.relativeTo(folder).path, f); advance(f) } + files.forEach { f -> addEntry(z, folder.name + "/" + f.relativeTo(folder).invariantSeparatorsPath, f); advance(f) } live.forEach { f -> addEntry(z, folder.name + "/steam/" + f.name, f); advance(f) } stores.forEach { f -> addEntry(z, "$STORES_DIR/" + f.name, f); advance(f) } tools.forEach { f -> addEntry(z, SessionPaths.TOOLS_DIR + "/" + f.name, f); advance(f) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt index 3e5a71d12a..b91e5bcf67 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareTest.kt @@ -105,6 +105,7 @@ class SessionLogShareTest { @Test fun aFileThatCouldNotBeScrubbedLeavesTheFolderUnrecorded() { val folder = tmp.newFolder("2026-10-06-06-steam") File(folder, "session.log").writeText("$secret\n") + org.junit.Assume.assumeFalse(System.getProperty("os.name").startsWith("Windows")) folder.setWritable(false) try { SessionArtifacts.scrubAndMark(folder) diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 6c7944ce15..ab2ce16550 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -37,7 +37,7 @@ def sources(root): for name in SOURCE_PATHS: path = root / name files.extend(path.rglob('*') if path.is_dir() else [path]) - return {str(path.relative_to(root)): digest(path) for path in sorted(set(files)) + return {path.relative_to(root).as_posix(): digest(path) for path in sorted(set(files)) if path.is_file() and '__pycache__' not in path.parts and path.suffix != '.pyc'} @@ -47,7 +47,7 @@ def outputs(root): base = root / 'app/src/main/assets' / tree for path in base.rglob('*'): if path.is_file() and not any(part.startswith('.') for part in path.relative_to(base).parts): - result['assets/' + tree + '/' + str(path.relative_to(base))] = str(path.relative_to(root)) + result['assets/' + tree + '/' + path.relative_to(base).as_posix()] = path.relative_to(root).as_posix() for library in ['libproot.so', 'libproot-loader.so', 'libdirectaudiorelay.so']: result['lib/arm64-v8a/' + library] = 'app/src/main/jniLibs/arm64-v8a/' + library result['assets/pulseaudio.tzst'] = 'app/build/prepared-assets/pulseaudio.tzst'