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

2 files changed, 8 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 6fa4f21c1..78febb495 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,6 @@ doc:
 clean:
 	cabal clean
 
-#sdist:
-#	cabal sdist
-
 gf:
 	cabal build rgl-none
 	strip dist/build/gf/gf
@@ -45,9 +42,11 @@ pkg:
 bintar:
 	bash bin/build-binary-dist.sh
 
-# Make a source tar.gz distribution using darcs to make sure that everything
-# is included. We put the distribution in dist/ so it is removed on
-# `make clean`
+#sdist:
+#	cabal sdist
+
+# 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:
 	test -d dist || mkdir dist
-	darcs dist -d dist/gf-${VERSION}
+	git archive --format=tar.gz --output=dist/gf-${VERSION}.tar.gz HEAD
diff --git a/Setup.hs b/Setup.hs
index 9749d27fe..70c2d618f 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -5,14 +5,12 @@ import Distribution.Simple.Utils
 import Distribution.Simple.Setup
 import Distribution.PackageDescription hiding (Flag)
 import Control.Monad
-import Data.Char(isSpace)
-import Data.List(isPrefixOf,intersect,unfoldr,stripPrefix)
-import Data.Maybe(listToMaybe)
+import Data.List(isPrefixOf,intersect)
 --import System.IO
 import qualified Control.Exception as E
 import System.Process(readProcess)
 import System.FilePath
-import System.Directory(createDirectoryIfMissing,copyFile,doesDirectoryExist,getDirectoryContents)
+import System.Directory(createDirectoryIfMissing,copyFile,getDirectoryContents)
 --import System.Exit
 --import Control.Concurrent(forkIO)
 --import Control.Concurrent.Chan(newChan,writeChan,readChan)
@@ -399,14 +397,3 @@ parallel_ ms = sequence_ ms {-
      ts <- sequence [ forkIO (m >> writeChan c ()) | m <- ms]
      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)