GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-23 01:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GrammaticalFramework/GF

Browse Source
This commit is contained in:
Krasimir Angelov
2018-07-05 09:13:04 +02:00
parent 40cc58d6c1 af82dc9fc6
commit ce83d8490b
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -21,9 +21,6 @@ doc:
clean: clean:
cabal clean cabal clean
#sdist:
# cabal sdist
gf: gf:
cabal build rgl-none cabal build rgl-none
strip dist/build/gf/gf strip dist/build/gf/gf
@@ -45,9 +42,11 @@ pkg:
bintar: bintar:
bash bin/build-binary-dist.sh bash bin/build-binary-dist.sh
# Make a source tar.gz distribution using darcs to make sure that everything #sdist:
# is included. We put the distribution in dist/ so it is removed on # cabal sdist
# `make clean`
# Make a source tar.gz distribution using git to make sure that everything is included.
# We put the distribution in dist/ so it is removed on `make clean`
sdist: sdist:
test -d dist || mkdir dist test -d dist || mkdir dist
darcs dist -d dist/gf-${VERSION} git archive --format=tar.gz --output=dist/gf-${VERSION}.tar.gz HEAD

17
Setup.hs
View File

@@ -5,14 +5,12 @@ import Distribution.Simple.Utils
import Distribution.Simple.Setup import Distribution.Simple.Setup
import Distribution.PackageDescription hiding (Flag) import Distribution.PackageDescription hiding (Flag)
import Control.Monad import Control.Monad
import Data.Char(isSpace) import Data.List(isPrefixOf,intersect)
import Data.List(isPrefixOf,intersect,unfoldr,stripPrefix)
import Data.Maybe(listToMaybe)
--import System.IO --import System.IO
import qualified Control.Exception as E import qualified Control.Exception as E
import System.Process(readProcess) import System.Process(readProcess)
import System.FilePath import System.FilePath
import System.Directory(createDirectoryIfMissing,copyFile,doesDirectoryExist,getDirectoryContents) import System.Directory(createDirectoryIfMissing,copyFile,getDirectoryContents)
--import System.Exit --import System.Exit
--import Control.Concurrent(forkIO) --import Control.Concurrent(forkIO)
--import Control.Concurrent.Chan(newChan,writeChan,readChan) --import Control.Concurrent.Chan(newChan,writeChan,readChan)
@@ -399,14 +397,3 @@ parallel_ ms = sequence_ ms {-
ts <- sequence [ forkIO (m >> writeChan c ()) | m <- ms] ts <- sequence [ forkIO (m >> writeChan c ()) | m <- ms]
sequence_ [readChan c | _ <- ts] sequence_ [readChan c | _ <- ts]
--} --}
patches = paras . lines
where
paras = unfoldr para
para ls = case break null $ dropWhile null ls of
([],[]) -> Nothing
(xs,ys) -> Just (info xs,ys)
info = unwords . map dropHeaders . filter (\l->not $ any (`isPrefixOf` l) [" ","patch "])
dropHeaders = dropWhile isSpace . dropPrefix "Author: " . dropPrefix "Date: "
dropPrefix pre l = maybe l id (stripPrefix pre l)