-
Notifications
You must be signed in to change notification settings - Fork 0
/
goa-3.0.2.patch
106 lines (97 loc) · 3.8 KB
/
goa-3.0.2.patch
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
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
Only in goa: .git
diff -u /tmp/goa-3.0.2/GOA.hs goa/GOA.hs
--- /tmp/goa-3.0.2/GOA.hs 2008-09-21 14:13:04.000000000 +0900
+++ goa/GOA.hs 2011-02-17 20:41:30.000000000 +0900
@@ -1,6 +1,3 @@
-
-{-# OPTIONS -fglasgow-exts #-}
-
module GOA (
module Prelude,
lambdabot,
@@ -108,7 +105,7 @@
(do x <- runInteractiveProcess "./lambdabot" args Nothing Nothing
return (Just x))
(\e -> do
- putStrLn $ "Unable to start lambdabot: " ++ show e
+ putStrLn $ "Unable to start lambdabot: " ++ show ( e :: C.IOException )
return Nothing)
-- |
@@ -133,7 +130,7 @@
m <- readIORef state
C.handle
(\e -> do writeIORef state Nothing -- blank old handles if we fail
- return ["Unable to run lambdabot: " ++ show e])
+ return ["Unable to run lambdabot: " ++ show (e :: C.IOException)])
(case m of
Nothing -> do
-- maybe we can start the process automatically
diff -u /tmp/goa-3.0.2/README goa/README
--- /tmp/goa-3.0.2/README 2008-09-21 14:13:04.000000000 +0900
+++ goa/README 2011-02-17 21:35:39.000000000 +0900
@@ -7,6 +7,11 @@
The set of commands carefully developed in lambdabot during the years has
become a very useful tool for haskellers. For some it is like an addiction.
+See also http://www.haskell.org/haskellwiki/GHC/GHCi#GHCi_on_Acid
+
+The goa needs lambdabot too.
+Check http://hackage.haskell.org/package/lambdabot
+
Installation
------------
@@ -15,7 +20,7 @@
-- Build
$ chmod +x Setup.hs
- $ ./Setup.hs configure --prefix=/home/dons
+ $ ./Setup.hs configure --user
$ ./Setup.hs build
$ ./Setup.hs install
@@ -77,6 +82,7 @@
------------
[Lambdabot]: <http://www.cse.unsw.edu.au/~dons/lambdabot/>.
+[Lambdabot now on HackageDB]: <http://hackage.haskell.org/package/lambdabot>
[khjk-structured-text]: If you want to produce HTML documentation.
Additional Fun
diff -u /tmp/goa-3.0.2/Setup.hs goa/Setup.hs
--- /tmp/goa-3.0.2/Setup.hs 2008-09-21 14:13:04.000000000 +0900
+++ goa/Setup.hs 2011-02-17 20:39:02.000000000 +0900
@@ -1,3 +1,3 @@
#!/usr/bin/env runhaskell
import Distribution.Simple
-main = defaultMainWithHooks defaultUserHooks
+main = defaultMainWithHooks simpleUserHooks
diff -u /tmp/goa-3.0.2/dot-ghci goa/dot-ghci
--- /tmp/goa-3.0.2/dot-ghci 2008-09-21 14:13:04.000000000 +0900
+++ goa/dot-ghci 2011-02-17 21:16:50.000000000 +0900
@@ -1,7 +1,6 @@
:m - Prelude
:m + GOA
-setLambdabotHome "/home/dons/lambdabot"
-wakeup
+setLambdabotHome "/where/is/bin/lambdabot"
:def bs lambdabot "botsnack"
:def pl lambdabot "pl"
:def index lambdabot "index"
Common subdirectories: /tmp/goa-3.0.2/fcgi and goa/fcgi
Only in goa: goa-3.0.2.patch
diff -u /tmp/goa-3.0.2/goa.cabal goa/goa.cabal
--- /tmp/goa-3.0.2/goa.cabal 2008-09-21 14:13:04.000000000 +0900
+++ goa/goa.cabal 2011-02-17 20:45:25.000000000 +0900
@@ -7,15 +7,16 @@
Synopsis: GHCi on Acid
Description: Offers an interface to be able to call Lambdabot commands within GHCi;
this is broken with recent Lambdabots.
-Build-Depends: base, directory, process,filepath
+ --- Modified to work with the recent ghci.
+ --- IKEGAMI Daisuke <ikegami.da@gmail.com>
+Build-Depends: base, directory, filepath, process
Build-Type: Simple
Category: System
Synopsis: GHCi bindings to lambdabot
Exposed-Modules: GOA
-ghc-options: -Wall -funbox-strict-fields
+ghc-options: -Wall -funbox-strict-fields -fno-warn-unused-do-bind
data-files: README, dot-ghci, fcgi/README, fcgi/lambdaweb.html
extra-source-files: fcgi/lambdaweb-ajax.js, fcgi/Setup.hs, fcgi/bot.cabal,
fcgi/bot.hs, fcgi/lambdaweb-style.css, LICENSE
-