removed the old Android app
Running git-annex linux builds in termux seems to work well enough that the only reason to keep the Android app would be to support Android 4-5, which the old Android app supported, and which I don't know if the termux method works on (although I see no reason why it would not). According to [1], Android 4-5 remains on around 29% of devices, down from 51% one year ago. [1] https://www.statista.com/statistics/271774/share-of-android-platforms-on-mobile-devices-with-android-os/ This is a rather large commit, but mostly very straightfoward removal of android ifdefs and patches and associated cruft. Also, removed support for building with very old ghc < 8.0.1, and with yesod < 1.4.3, and without concurrent-output, which were only being used by the cross build. Some documentation specific to the Android app (screenshots etc) needs to be updated still. This commit was sponsored by Brett Eisenberg on Patreon.
This commit is contained in:
parent
aaa841e60a
commit
38d691a10f
124 changed files with 81 additions and 12472 deletions
21
Git/Env.hs
21
Git/Env.hs
|
@ -5,8 +5,6 @@
|
|||
- Licensed under the GNU GPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Git.Env where
|
||||
|
||||
import Common
|
||||
|
@ -18,28 +16,11 @@ import Utility.Env
|
|||
- does not have any gitEnv yet. -}
|
||||
adjustGitEnv :: Repo -> ([(String, String)] -> [(String, String)]) -> IO Repo
|
||||
adjustGitEnv g adj = do
|
||||
e <- maybe copyGitEnv return (gitEnv g)
|
||||
e <- maybe getEnvironment return (gitEnv g)
|
||||
let e' = adj e
|
||||
return $ g { gitEnv = Just e' }
|
||||
where
|
||||
|
||||
{- Copies the current environment, so it can be adjusted when running a git
|
||||
- command. -}
|
||||
copyGitEnv :: IO [(String, String)]
|
||||
copyGitEnv = do
|
||||
#ifdef __ANDROID__
|
||||
{- This should not be necessary on Android, but there is some
|
||||
- weird getEnvironment breakage. See
|
||||
- https://github.com/neurocyte/ghc-android/issues/7
|
||||
- Use getEnv to get some key environment variables that
|
||||
- git expects to have. -}
|
||||
let keyenv = words "USER PATH GIT_EXEC_PATH HOSTNAME HOME"
|
||||
let getEnvPair k = maybe Nothing (\v -> Just (k, v)) <$> getEnv k
|
||||
catMaybes <$> forM keyenv getEnvPair
|
||||
#else
|
||||
getEnvironment
|
||||
#endif
|
||||
|
||||
addGitEnv :: Repo -> String -> String -> IO Repo
|
||||
addGitEnv g var val = adjustGitEnv g (addEntry var val)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue