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

rebuild: fix porting errors

master
an 2019-06-11 22:46:28 -04:00
parent df1148dd29
commit ad82bb9dca
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/rebuild-pkgs.rkt
View File

@ -65,7 +65,7 @@
m64pncp (hash 'force #t 'url (~a ext-git "/" m64pncp ".git"))
'gdcc-git (hash 'url (~a ext-git "/gdcc-git.git"))
'higan (hash 'handle 'higan 'url "https://gitlab.com/higan/higan.git")
'higan (hash 'handle 'higan 'url "https://gitlab.com/higan/higan.git/")
'motsognir (hash 'url (~a ext-git "/motsognir.git"))
'ppsspp-git (hash 'url (~a ext-git "/ppsspp-git.git"))
'teamviewer (hash 'url (~a ext-git "/teamviewer.git") 'branch "nmfix")

8
scripts/rebuild.rkt
View File

@ -32,7 +32,7 @@
(define (get-latest-tag)
(define latest
(with-output-to-string (λ () (sys "git rev-list --tags --max-count=1"))))
(with-output-to-string (λ () (sys (~a "git describe --tags \"" latest #\")))))
(with-output-to-string (λ () (sys (~a "git describe --tags " latest)))))
(define (build-pkg pkg opts)
(parameterize ([cwd (build-path home "bin")])
@ -42,10 +42,10 @@
(str-or-empty opts 'skipinteg " --skipinteg"))]
[clone-url (hash-ref opts 'url (default-pkg-url pkg))]
[special-handling (hash-ref opts 'handle 'none)]
[branch (hash-ref opts 'branch "")]
[branch (hash-ref opts 'branch "master")]
[pkg-dir (build-path (cwd) (symbol->string pkg))])
(unless (directory-exists? pkg-dir)
(sys (~a "git clone " branch " " clone-url)))
(sys (~a "git clone -b " branch " " clone-url)))
(parameterize ([cwd pkg-dir])
(sys "git pull")
(case special-handling
@ -53,7 +53,7 @@
(sys (~a "makepkg " makepkg-args))]
['higan
(sys "git fetch --tags")
(sys (~a "git checkout \"" (get-latest-tag) #\"))
(sys (~a "git checkout " (get-latest-tag)))
(higan-make "higan target=higan")
(higan-make "icarus")
(sys "make -j12 -C shaders install")]