boernel/lilypond-common-includes
14
0
Fork 0
Code Issues 16 Pull Requests 1 Packages Projects Releases Wiki Activity

windows includes angepasst

Browse Source
This commit is contained in:
Arlett Grygar 2024-12-30 23:47:13 +01:00
parent 15c27c271f
commit 7fa6c4fe89
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
all_base_includes.ly
View File

@ -1,7 +1,13 @@
#(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f)) #(define noStandaloneOutput (if (defined? 'noStandaloneOutput) noStandaloneOutput #f))
#(define windows? (string-prefix-ci? "windows" (utsname:sysname (uname))))
#(if (defined? 'LAYOUT) #f #(if (defined? 'LAYOUT) #f
(let ((scmdir (string-append (dirname (current-filename)) file-name-separator-string "scm" file-name-separator-string))) (let ((scmdir
(if windows?
(string-append "scm" file-name-separator-string)
(string-append (dirname (current-filename)) file-name-separator-string "scm" file-name-separator-string)
)))
(load (string-append scmdir "json_parser.scm")) (load (string-append scmdir "json_parser.scm"))
(load (string-append scmdir "resolve_inherits.scm")) (load (string-append scmdir "resolve_inherits.scm"))
(load (string-append scmdir "yaml_parser.scm")))) (load (string-append scmdir "yaml_parser.scm"))))

2
scm/yaml_parser.scm
View File

@ -2,7 +2,7 @@
(define (yml-file->scm filename) (define (yml-file->scm filename)
(let* ((python_cmd (string-append "import sys, yaml, json; print(json.dumps(yaml.safe_load(open('" filename "'))))")) (let* ((python_cmd (string-append "import sys, yaml, json; print(json.dumps(yaml.safe_load(open('" filename "'))))"))
(pipe (open-pipe* OPEN_READ "python3" "-c" python_cmd)) (pipe (open-pipe* OPEN_READ (if windows? "py" "python3") "-X" "utf8" "-c" python_cmd))
(json (get-string-all pipe))) (json (get-string-all pipe)))
(close-pipe pipe) (close-pipe pipe)
(json-string->scm json))) (json-string->scm json)))