Skip to content

Commit 8c51b0c

Browse files
committed
chore(xtask): isolate the Windows expand-file-name diagnostic (tfd vs clean drive vs tilde)
1 parent dd20dde commit 8c51b0c

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

xtask/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3374,7 +3374,7 @@ fn compile_main_args_for_source(native_comp: bool, source: &Path) -> Vec<OsStrin
33743374
// byte-compile failure; revert once the Windows build is green. Harmless
33753375
// when compilation succeeds (no error -> no backtrace).
33763376
OsString::from(
3377-
"(progn (setq load-prefer-newer t byte-compile-warnings 'all) (message \">>>WINDIAG tfd=%S mtf=%S\" temporary-file-directory (ignore-errors (make-temp-file \"d-\" t))) (advice-add 'directory-file-name :before (lambda (d &rest _) (unless (stringp d) (message \">>>WINDFN nil-arg opd=%S\" (bound-and-true-p org-persist-directory))))))",
3377+
"(progn (setq load-prefer-newer t byte-compile-warnings 'all) (message \">>>WIN2 tfd=%S A=%S B=%S Bs=%S C=%S\" temporary-file-directory (ignore-errors (expand-file-name \"d-\" temporary-file-directory)) (ignore-errors (expand-file-name \"d-\" \"C:/X/Y/\")) (ignore-errors (expand-file-name \"d-\" \"C:/Users/RUNNER~1/AppData/Local/Temp/\")) (ignore-errors (make-temp-file \"d-\" t))))",
33783378
),
33793379
OsString::from("--eval"),
33803380
OsString::from("(setq org--inhibit-version-check t)"),
@@ -3404,7 +3404,7 @@ fn preloaded_lisp_args_for_source(native_comp: bool, source: &Path) -> Vec<OsStr
34043404
// byte-compile failure; revert once the Windows build is green. Harmless
34053405
// when compilation succeeds (no error -> no backtrace).
34063406
OsString::from(
3407-
"(progn (setq load-prefer-newer t byte-compile-warnings 'all) (message \">>>WINDIAG tfd=%S mtf=%S\" temporary-file-directory (ignore-errors (make-temp-file \"d-\" t))) (advice-add 'directory-file-name :before (lambda (d &rest _) (unless (stringp d) (message \">>>WINDFN nil-arg opd=%S\" (bound-and-true-p org-persist-directory))))))",
3407+
"(progn (setq load-prefer-newer t byte-compile-warnings 'all) (message \">>>WIN2 tfd=%S A=%S B=%S Bs=%S C=%S\" temporary-file-directory (ignore-errors (expand-file-name \"d-\" temporary-file-directory)) (ignore-errors (expand-file-name \"d-\" \"C:/X/Y/\")) (ignore-errors (expand-file-name \"d-\" \"C:/Users/RUNNER~1/AppData/Local/Temp/\")) (ignore-errors (make-temp-file \"d-\" t))))",
34083408
),
34093409
OsString::from("--eval"),
34103410
OsString::from("(setq org--inhibit-version-check t)"),

0 commit comments

Comments
 (0)