msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

revert to a version compatible with Cabal 1.22

Browse Source
This commit is contained in:
Krasimir Angelov
2018-07-05 13:10:02 +02:00
parent e95aa16fdc
commit 73cf58da23
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Setup.hs
View File

@@ -4,11 +4,11 @@ import Distribution.Simple.BuildPaths(exeExtension)
import Distribution.Simple.Utils(intercalate) import Distribution.Simple.Utils(intercalate)
import Distribution.Simple.Setup(BuildFlags(..),Flag(..),InstallFlags(..),CopyDest(..),CopyFlags(..),SDistFlags(..)) import Distribution.Simple.Setup(BuildFlags(..),Flag(..),InstallFlags(..),CopyDest(..),CopyFlags(..),SDistFlags(..))
import Distribution.PackageDescription(PackageDescription(..),HookedBuildInfo(..),emptyHookedBuildInfo) import Distribution.PackageDescription(PackageDescription(..),HookedBuildInfo(..),emptyHookedBuildInfo)
import Control.Monad(unless) import Control.Monad(unless,when)
import Data.List(isPrefixOf,intersect) import Data.List(isPrefixOf,intersect)
import System.Process(readProcess) import System.Process(readProcess)
import System.FilePath((</>),(<.>)) import System.FilePath((</>),(<.>))
import System.Directory(createDirectoryIfMissing,copyFile,getDirectoryContents,listDirectory) import System.Directory(createDirectoryIfMissing,copyFile,getDirectoryContents)
import WebSetup import WebSetup
@@ -71,8 +71,8 @@ rglCommands =
let prelude_src_dir = rgl_src_dir </> "prelude" let prelude_src_dir = rgl_src_dir </> "prelude"
prelude_dst_dir = rgl_dst_dir (lbi bi) </> "prelude" prelude_dst_dir = rgl_dst_dir (lbi bi) </> "prelude"
createDirectoryIfMissing True prelude_dst_dir createDirectoryIfMissing True prelude_dst_dir
files <- listDirectory prelude_src_dir files <- getDirectoryContents prelude_src_dir
run_gfc bi (["-s", "--gfo-dir="++prelude_dst_dir] ++ [prelude_src_dir </> file | file <- files]) run_gfc bi (["-s", "--gfo-dir="++prelude_dst_dir] ++ [prelude_src_dir </> file | file <- files, file /= "." && file /= ".."])
, RGLCommand "all" True $ gfcp [l,s,c,t,sc] , RGLCommand "all" True $ gfcp [l,s,c,t,sc]
, RGLCommand "lang" False $ gfcp [l,s] , RGLCommand "lang" False $ gfcp [l,s]
@@ -158,7 +158,7 @@ copyAll :: String -> FilePath -> FilePath -> IO ()
copyAll s from to = do copyAll s from to = do
putStrLn $ "Installing [" ++ s ++ "] " ++ to putStrLn $ "Installing [" ++ s ++ "] " ++ to
createDirectoryIfMissing True to createDirectoryIfMissing True to
mapM_ (\file -> copyFile (from </> file) (to </> file)) =<< listDirectory from mapM_ (\file -> when (file /= "." && file /= "..") $ copyFile (from </> file) (to </> file)) =<< getDirectoryContents from
{- {-
sdistRGL :: PackageDescription -> Maybe LocalBuildInfo -> UserHooks -> SDistFlags -> IO () sdistRGL :: PackageDescription -> Maybe LocalBuildInfo -> UserHooks -> SDistFlags -> IO ()

2
gf.cabal
View File

@@ -1,7 +1,7 @@
name: gf name: gf
version: 3.9-git version: 3.9-git
cabal-version: >= 1.24 cabal-version: >= 1.22
build-type: Custom build-type: Custom
license: OtherLicense license: OtherLicense
license-file: LICENSE license-file: LICENSE