git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Fix #624 - remove xdg-basedir dependency, simplify build.
7bad2aePhil Freeman
Setup.hs+1−33
compare with golang
unifiedsplit
@@ -1,38 +1,6 @@
1−{-# LANGUAGE CPP #-}
2−
3−#ifndef POSIX_LIKE
4−#define POSIX_LIKE !(defined(_WIN32_HOST_OS) || defined(_WIN64_HOST_OS)) && \
5− (defined(unix_HOST_OS) || defined(__unix___HOST_OS) || \
6− defined(__unix_HOST_OS) || defined(linux_HOST_OS) || \
7− defined(__linux___HOST_OS) || defined(__linux_HOST_OS) || \
8− (defined(__APPLE___HOST_OS) && defined(__MACH___HOST_OS)))
9−#endif
10−
11module Main where
1module Main where
12
2
13−import Control.Monad
14−
15−import Distribution.PackageDescription
16import Distribution.Simple
3import Distribution.Simple
17−import Distribution.Simple.LocalBuildInfo
18−import Distribution.Simple.Setup
19−
20−import System.Directory
21−import System.Environment.XDG.BaseDir
22−#if POSIX_LIKE
23−import System.Posix.Files
24−#endif
25
4
26main :: IO ()
5main :: IO ()
27−main = defaultMainWithHooks $ simpleUserHooks {postInst = setupXDG}
6+main = defaultMain
28−
29−setupXDG :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
30−setupXDG _ _ _ _ = do
31− configDir <- getUserConfigDir "purescript"
32− configExists <- doesDirectoryExist configDir
33− unless configExists $ do
34− createDirectoryIfMissing True configDir
35−#if POSIX_LIKE
36− setFileMode configDir ownerModes
37−#endif
38−#undef POSIX_LIKE
psci/Main.hs+5−2
@@ -43,7 +43,6 @@ import System.Directory
43 findExecutable, getHomeDirectory, getCurrentDirectory)
43 findExecutable, getHomeDirectory, getCurrentDirectory)
44import System.Process (readProcessWithExitCode)
44import System.Process (readProcessWithExitCode)
45import System.Exit
45import System.Exit
46−import System.Environment.XDG.BaseDir
47import System.FilePath
46import System.FilePath
48 (pathSeparator, takeDirectory, (</>), isPathSeparator)
47 (pathSeparator, takeDirectory, (</>), isPathSeparator)
49import qualified System.Console.CmdTheLine as Cmd
48import qualified System.Console.CmdTheLine as Cmd
@@ -114,7 +113,11 @@ findNodeProcess = runMaybeT . msum $ map (MaybeT . findExecutable) names
114-- Grabs the filename where the history is stored.
113-- Grabs the filename where the history is stored.
115--
114--
116getHistoryFilename :: IO FilePath
115getHistoryFilename :: IO FilePath
117−getHistoryFilename = getUserConfigFile "purescript" "psci_history"
116+getHistoryFilename = do
117+ home <- getHomeDirectory
118+ let filename = home </> ".purescript" </> "psci_history"
119+ mkdirp filename
120+ return filename
118
121
119-- |
122-- |
120-- Loads a file for use with imports.
123-- Loads a file for use with imports.
purescript.cabal+3−3
@@ -1,7 +1,7 @@
1name: purescript
1name: purescript
2version: 0.5.6.3
2version: 0.5.6.3
3cabal-version: >=1.8
3cabal-version: >=1.8
4−build-type: Custom
4+build-type: Simple
5license: MIT
5license: MIT
6license-file: LICENSE
6license-file: LICENSE
7copyright: (c) 2013-14 Phil Freeman, (c) 2014 Gary Burgess, and other contributors
7copyright: (c) 2013-14 Phil Freeman, (c) 2014 Gary Burgess, and other contributors
@@ -30,7 +30,7 @@ library
30 transformers >= 0.3 && < 0.5, utf8-string -any,
30 transformers >= 0.3 && < 0.5, utf8-string -any,
31 pattern-arrows >= 0.0.2 && < 0.1,
31 pattern-arrows >= 0.0.2 && < 0.1,
32 monad-unify >= 0.2.2 && < 0.3,
32 monad-unify >= 0.2.2 && < 0.3,
33− xdg-basedir -any, time -any
33+ time -any
34 if (!os(windows))
34 if (!os(windows))
35 build-depends: unix -any
35 build-depends: unix -any
36 exposed-modules: Language.PureScript
36 exposed-modules: Language.PureScript
@@ -115,7 +115,7 @@ executable psci
115 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,
115 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,
116 mtl -any, parsec -any, haskeline >= 0.7.0.0, purescript -any,
116 mtl -any, parsec -any, haskeline >= 0.7.0.0, purescript -any,
117 transformers -any, utf8-string -any, process -any,
117 transformers -any, utf8-string -any, process -any,
118− xdg-basedir -any, cmdtheline -any
118+ cmdtheline -any
119 main-is: Main.hs
119 main-is: Main.hs
120 buildable: True
120 buildable: True
121 hs-source-dirs: psci
121 hs-source-dirs: psci
src/Language/PureScript.hs+2−8
@@ -51,7 +51,6 @@ import qualified Data.Set as S
51
51
52import System.FilePath ((</>), pathSeparator)
52import System.FilePath ((</>), pathSeparator)
53import System.Directory (getHomeDirectory, doesFileExist)
53import System.Directory (getHomeDirectory, doesFileExist)
54−import System.Environment.XDG.BaseDir (getUserConfigDir)
55
54
56-- |
55-- |
57-- Compile a collection of modules
56-- Compile a collection of modules
@@ -272,16 +271,11 @@ importPrelude = addDefaultImport (ModuleName [ProperName C.prelude])
272
271
273preludeFilename :: IO FilePath
272preludeFilename :: IO FilePath
274preludeFilename = fromMaybe missingPrelude . listToMaybe <$> do
273preludeFilename = fromMaybe missingPrelude . listToMaybe <$> do
275− fs <- sequence [xdsPrelude, homePrelude, cabalPrelude]
274+ fs <- sequence [homePrelude, cabalPrelude]
276 filterM doesFileExist fs
275 filterM doesFileExist fs
277 where
276 where
278 missingPrelude :: FilePath
277 missingPrelude :: FilePath
279− missingPrelude = error "No Prelude found in user home, XDS user config directory or cabal path."
278+ missingPrelude = error "No Prelude found in user home or cabal path."
280−
281− xdsPrelude :: IO FilePath
282− xdsPrelude = do
283− configDir <- getUserConfigDir "purescript"
284− return $ configDir </> "prelude" </> "prelude.purs"
285
279
286 homePrelude :: IO FilePath
280 homePrelude :: IO FilePath
287 homePrelude = do
281 homePrelude = do