marrub
/
scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rebuild: fix minor errata

master
an 2019-07-27 09:31:11 -04:00
parent 832ad047c9
commit 3306097f92
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/rebuild-pkgs.rkt
View File

@ -64,10 +64,17 @@
(define package-options (define package-options
(hash (hash
'cef-standard (hash 'asdeps #t) 'cef-standard
'kmozillahelper (hash 'asdeps #t) (hash 'asdeps #t)
'libsodium-git (hash 'asdeps #t)
'vim-runtime-git (hash 'asdeps #t) 'kmozillahelper
(hash 'asdeps #t)
'libsodium-git
(hash 'asdeps #t)
'vim-runtime-git
(hash 'asdeps #t)
'desmume-git 'desmume-git
(hash 'url (mygit "desmume-git.git")) (hash 'url (mygit "desmume-git.git"))
@ -79,21 +86,21 @@
(hash 'handle 'higan (hash 'handle 'higan
'url (gitlab "higan/higan.git/")) 'url (gitlab "higan/higan.git/"))
'minecraft-server-fabric
(hash 'url (mygit "minecraft-server-fabric.git"))
'otf-linjapona 'otf-linjapona
(hash 'url (mygit "otf-linjapona.git")) (hash 'url (mygit "otf-linjapona.git"))
'ppsspp-git
(hash 'url (mygit "ppsspp-git.git"))
'quark-shaders 'quark-shaders
(hash 'handle 'higan-shaders (hash 'handle 'higan-shaders
'url (github "hizzlekizzle/quark-shaders")) 'url (github "hizzlekizzle/quark-shaders"))
'ppsspp-git
(hash 'url (mygit "ppsspp-git.git"))
'teamviewer 'teamviewer
(hash 'url (mygit "teamviewer.git") (hash 'url (mygit "teamviewer.git")
'branch "nmfix") 'branch "nmfix")))
'minecraft-server-fabric
(hash 'url (mygit "minecraft-server-fabric.git"))))
;; EOF ;; EOF

12
scripts/rebuild.rkt
View File

@ -16,8 +16,9 @@
(eprintf "error in rebuild, aborting\n") (eprintf "error in rebuild, aborting\n")
(exit 1))) (exit 1)))
(define (str-or-empty hash key str) (define (default-pkg-url pkg) (~a "https://aur.archlinux.org/" pkg ".git"))
(if (hash-ref hash key #f) str ""))
(define (str-or-empty hash key str) (if (hash-ref hash key #f) str ""))
(define (higan-make args) (define (higan-make args)
(sys (~a "make -j12 -C " args " uninstall")) (sys (~a "make -j12 -C " args " uninstall"))
@ -25,9 +26,6 @@
(sys (~a "make -j12 -C " args " all")) (sys (~a "make -j12 -C " args " all"))
(sys (~a "make -j12 -C " args " install"))) (sys (~a "make -j12 -C " args " install")))
(define (default-pkg-url pkg)
(~a "https://aur.archlinux.org/" pkg ".git"))
(define (get-latest-tag) (define (get-latest-tag)
(define latest (define latest
(with-output-to-string (λ () (sys "git rev-list --tags --max-count=1")))) (with-output-to-string (λ () (sys "git rev-list --tags --max-count=1"))))
@ -63,7 +61,7 @@
(higan-make "icarus") (higan-make "icarus")
(sys "make -j12 -C shaders install")] (sys "make -j12 -C shaders install")]
[else (raise-argument-error 'build-pkg [else (raise-argument-error 'build-pkg
"(or/c 'none 'higan)" "(or/c 'none 'higan 'higan-shaders)"
special-handling)]))))) special-handling)])))))
(define (resume-from-pkg input-pkg [pkg-list all-packages]) (define (resume-from-pkg input-pkg [pkg-list all-packages])
@ -72,7 +70,7 @@
pkg-list pkg-list
(resume-from-pkg input-pkg (cdr pkg-list))))) (resume-from-pkg input-pkg (cdr pkg-list)))))
(let* ([resume-from (make-parameter null)] (let* ([resume-from (make-parameter '())]
[cmdline-pkgs (command-line [cmdline-pkgs (command-line
#:once-each #:once-each
["--resume-from" pkg ["--resume-from" pkg