1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Index: haskell-uuagc-cabal/src/Distribution/Simple/UUAGC/UUAGC.hs
===================================================================
--- haskell-uuagc-cabal.orig/src/Distribution/Simple/UUAGC/UUAGC.hs
+++ haskell-uuagc-cabal/src/Distribution/Simple/UUAGC/UUAGC.hs
@@ -6,7 +6,7 @@ module Distribution.Simple.UUAGC.UUAGC(u
uuagcFromString
) where
-import Distribution.Simple.BuildPaths (autogenModulesDir)
+-- import Distribution.Simple.BuildPaths (autogenComponentModulesDir)
import Debug.Trace
import Distribution.Simple
import Distribution.Simple.PreProcess
@@ -104,13 +104,13 @@ uuagcLibUserHook :: ([String] -> FilePat
uuagcLibUserHook uuagc = hooks where
hooks = simpleUserHooks { hookedPreProcessors = ("ag", ag):("lag",ag):knownSuffixHandlers
, buildHook = uuagcBuildHook uuagc
- , sDistHook = uuagcSDistHook uuagc
+-- , sDistHook = uuagcSDistHook uuagc
}
ag = uuagc' uuagc
originalPreBuild = preBuild simpleUserHooks
originalBuildHook = buildHook simpleUserHooks
-originalSDistHook = sDistHook simpleUserHooks
+--originalSDistHook = sDistHook simpleUserHooks
putErrorInfo :: Handle -> IO ()
putErrorInfo h = hGetContents h >>= hPutStr stderr
@@ -188,21 +188,21 @@ getOptionsFromClass classes fOpt =
++ show fClass
++ " is not defined."
-uuagcSDistHook :: ([String] -> FilePath -> IO (ExitCode, [FilePath]))
- -> PackageDescription
- -> Maybe LocalBuildInfo
- -> UserHooks
- -> SDistFlags
- -> IO ()
-uuagcSDistHook uuagc pd mbLbi uh df = do
- {-
- case mbLbi of
- Nothing -> warn normal "sdist: the local buildinfo was not present. Skipping AG initialization. Dist may fail."
- Just lbi -> let classesPath = buildDir lbi </> agClassesFile
- in commonHook uuagc classesPath pd lbi (sDistVerbosity df)
- originalSDistHook pd mbLbi uh df
- -}
- originalSDistHook pd mbLbi (uh { hookedPreProcessors = ("ag", nouuagc):("lag",nouuagc):knownSuffixHandlers }) df -- bypass preprocessors
+-- uuagcSDistHook :: ([String] -> FilePath -> IO (ExitCode, [FilePath]))
+-- -> PackageDescription
+-- -> Maybe LocalBuildInfo
+-- -> UserHooks
+-- -> SDistFlags
+-- -> IO ()
+-- uuagcSDistHook uuagc pd mbLbi uh df = do
+-- {-
+-- case mbLbi of
+-- Nothing -> warn normal "sdist: the local buildinfo was not present. Skipping AG initialization. Dist may fail."
+-- Just lbi -> let classesPath = buildDir lbi </> agClassesFile
+-- in commonHook uuagc classesPath pd lbi (sDistVerbosity df)
+-- originalSDistHook pd mbLbi uh df
+-- -}
+-- originalSDistHook pd mbLbi (uh { hookedPreProcessors = ("ag", nouuagc):("lag",nouuagc):knownSuffixHandlers }) df -- bypass preprocessors
uuagcBuildHook
:: ([String] -> FilePath -> IO (ExitCode, [FilePath]))
|
