haste-compiler 0.5.0 → 0.5.0.1

raw patch · 5 files changed

+13/−21 lines, 5 filesdep ~ghc-simpledep ~shellmatesetup-changedPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: ghc-simple, shellmate

API changes (from Hackage documentation)

Files

• Setup.hs +8/−5
• haste-compiler.cabal +2/−2
• libraries/haste-lib/src/Haste/Any.hs +1/−1
• src/Haste/Environment.hs +1/−12
• src/Haste/Version.hs +1/−1

@@ -44,11 +44,8 @@   createDirectoryIfMissing True (outdir </> "bin")   writeFile (outdir </> ".hastedir") "" -  -- Copy settings and tools, except on Windows where we need a working-  -- Haskell Platform anyway.-#ifndef mingw32_HOST_OS+  -- Copy settings and tools.   copyGhcSettings outdir-#endif    -- Copy executables   forM_ exes $ \exe -> do@@ -73,9 +70,15 @@ -- | Copy GHC settings and utils into the given directory. copyGhcSettings :: FilePath -> IO () copyGhcSettings dest = do-  copyFile (libdir </> "settings") (dest </> "settings")   copyFile (libdir </> "platformConstants") (dest </> "platformConstants")+#ifdef mingw32_HOST_OS+  copyFile ("settings.windows") (dest </> "settings")+  copyFile (libdir </> "unlit.exe") (dest </> "unlit.exe")+  copyFile (libdir </> "touchy.exe") (dest </> "touchy.exe")+#else+  copyFile (libdir </> "settings") (dest </> "settings")   copyFile (libdir </> "unlit") (dest </> "unlit")+#endif  main = defaultMainWithHooks $ simpleUserHooks {     postBuild = \_ _ pkgdesc buildinfo -> do

@@ -1,5 +1,5 @@ Name:           haste-compiler-Version:        0.5.0+Version:        0.5.0.1 License:        BSD3 License-File:   LICENSE Synopsis:       Haskell To ECMAScript compiler@@ -8,7 +8,7 @@                 use of standard Haskell libraries, integrates with Cabal,                 supports most GHC extensions and works on Windows, Linux and                 OSX.-Category:       Javascript, Compiler, Web+Category:       JavaScript, Compiler, Web Cabal-Version:  >= 1.10 Build-Type:     Custom Author:         Anton Ekblad <anton@ekblad.cc>

@@ -226,7 +226,7 @@ instance FromAny Float where   fromAny x = return (unsafeCoerce (jsNumber x)) instance FromAny Double where-  fromAny x = return (unsafeCoerce x) -- return (jsNumber x)+  fromAny x = return (jsNumber x) instance FromAny Char where   fromAny x = return (unsafeCoerce (jsNumber x))   listFromAny x = fromJSStr <$> fromAny x

@@ -22,20 +22,9 @@ import System.Environment (getExecutablePath) #endif --- | Directory to search for GHC settings. Always equal to 'hasteSysDir'---   except on Windows where we rely on a working Haskell Platform for GCC and---   other needed tools.+-- | Directory to search for GHC settings. Always equal to 'hasteSysDir'. hasteGhcLibDir :: FilePath-#ifdef mingw32_HOST_OS-hasteGhcLibDir = unsafePerformIO $ do-  eout <- shell $ run ghcBinary ["--print-libdir"] ""-  case eout of-    Right out -> return $ init out-    _         -> error $ "This Haste build requires a working " ++-                         "Haskell Platform install!"-#else hasteGhcLibDir = hasteSysDir-#endif  #if defined(PORTABLE) -- | Was Haste built in portable mode or not?

@@ -12,7 +12,7 @@  -- | Current Haste version. hasteVersion :: Version-hasteVersion = Version [0, 5, 0] []+hasteVersion = Version [0, 5, 0, 1] []  -- | Current Haste version as an Int. The format of this version number is --   MAJOR*10 000 + MINOR*100 + MICRO.