on master help sign in
Fix test build
commit6b8b31ba27f30f3fdb8a38b4158346e838495baa authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateMon 28 Jul 2014, 00:03 (12 years ago) parent3fd79a6
3 files changed+9−15
jsaddle.cabal+6−11 src/Language/Javascript/JSaddle/String.hs+2−2 src/Language/Javascript/JSaddle/Value.hs+1−2
jsaddle.cabal+6−11
@@ -89,22 +89,17 @@ test-suite test-tool
8989-- if !impl(ghcjs) || flag(webkit)
9090 if !flag(ghcjs) || flag(webkit)
9191 cpp-options: -DUSE_WEBKIT
92− build-depends: glib >=0.12.3.1 && <0.13
92+ build-depends: glib
9393 if flag(gtk3)
94− build-depends: gtk3 >= 0.12.4.1 && <0.13,
95− webkitgtk3 >=0.12.5 && <0.13,
96− webkitgtk3-javascriptcore >=0.12.5 && <0.13
94+ build-depends: gtk3, webkitgtk3, webkitgtk3-javascriptcore
9795 else
98− build-depends: gtk >= 0.12.4.1 && <0.13,
99− webkit >=0.12.5 && <0.13,
100− webkit-javascriptcore >=0.12.5 && <0.13
96+ build-depends: gtk, webkit, webkit-javascriptcore
10197
10298 if flag(jmacro)
103− build-depends: jmacro >=0.6.3 && <0.8
99+ build-depends: jmacro
104100
105− build-depends: template-haskell -any, base <5, lens >=3.8.5 && <4.3,
106− text >=0.11.2.3 && <1.2, transformers >=0.3.0.0 && <0.5,
107− hslogger -any, jsaddle ==0.1.1.7
101+ build-depends: template-haskell, base, lens, text,
102+ transformers, hslogger, jsaddle
108103 type: exitcode-stdio-1.0
109104 main-is: TestJSaddle.hs
110105 default-language: Haskell2010
src/Language/Javascript/JSaddle/String.hs+2−2
@@ -23,7 +23,7 @@ module Language.Javascript.JSaddle.String (
2323) where
2424
2525import Data.Text (Text)
26−import qualified Data.Text as T (pack)
26+import qualified Data.Text as T (unpack, pack)
2727import Control.Monad.IO.Class (MonadIO(..))
2828import Language.Javascript.JSaddle.Types (JSStringRef)
2929#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)
@@ -31,7 +31,7 @@ import GHCJS.Foreign (fromJSString, toJSString)
3131#else
3232import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSStringRef
3333 (jsstringcreatewithcharacters, jsstringgetcharactersptr,
34− jsstringgetlength)
34+ jsstringgetlength, jsstringcreatewithutf8cstring)
3535#endif
3636import qualified Data.Text.Foreign as T (fromPtr)
3737import Foreign (castPtr)
src/Language/Javascript/JSaddle/Value.hs+1−2
@@ -77,8 +77,7 @@ import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSValueRef
7777 jsvaluemakeundefined, jsvaluemakenull, jsvaluetoobject,
7878 jsvaluetostringcopy, jsvaluetonumber, jsvaluetoboolean)
7979import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSStringRef
80− (jsstringcreatewithcharacters, jsstringgetcharactersptr,
81− jsstringgetlength)
80+ (jsstringgetcharactersptr, jsstringgetlength)
8281#endif
8382import Language.Javascript.JSaddle.Monad (JSM, catchval)
8483import Language.Javascript.JSaddle.Exception (rethrow)