mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-10-22 11:17:40 +00:00
Code Issues 1 Releases Wiki Activity

Add JANET_GIT to jpm.

Browse Source 
This should allow work arounds for some windows installs.
Also, be clever about finding the location of te current git
executable on windows to avoid some path issues that seem to
occur on some windows installations.
This commit is contained in:
Calvin Rose
2020-05-19 18:36:58 -04:00
parent ccd8b71c4b
commit b72845609f
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jpm
View File

@@ -647,6 +647,19 @@ int main(int argc, const char **argv) {
# Installation and Dependencies
#
(var- stored-git-path nil)
(defn- git-path
"Get the location of git such that it can be passed as an argument to os/execute."
"(Some builds/configurations of windows don't like just the string 'git')"
[]
(if stored-git-path (break stored-git-path))
(set stored-git-path
(if is-win
(or (os/getenv "JANET_GIT") (pslurp "where git"))
(os/getenv "JANET_GIT" "git"))))
(if is-win (pslurp "where git") "git"))
(defn uninstall
"Uninstall bundle named name"
[name]
@@ -707,11 +720,11 @@ int main(int argc, const char **argv) {
:binpath (abspath (dyn :binpath JANET_BINPATH))]
(os/cd module-dir)
(unless fresh
(os/execute ["git" "pull" "origin" "master"] :p))
(os/execute [(git-path) "pull" "origin" "master"] :p))
(when tag
(os/execute ["git" "reset" "--hard" tag] :p))
(os/execute [(git-path) "reset" "--hard" tag] :p))
(unless (dyn :offline)
(os/execute ["git" "submodule" "update" "--init" "--recursive"] :p))
(os/execute [(git-path) "submodule" "update" "--init" "--recursive"] :p))
(import-rules "./project.janet")
(unless no-deps (do-rule "install-deps"))
(do-rule "build")
@@ -955,8 +968,8 @@ int main(int argc, const char **argv) {
(phony "manifest" []
(print "generating " manifest "...")
(mkdir manifests)
(def sha (pslurp "git rev-parse HEAD"))
(def url (pslurp "git remote get-url origin"))
(def sha (pslurp (string "\"" (git-path) "\" rev-parse HEAD")))
(def url (pslurp (string "\"" (git-path) "\" remote get-url origin"))
(def man
{:sha (if-not (empty? sha) sha)
:repo (if-not (empty? url) url)