Show version numbers correctly.

elm-server/Server.hs

@@ -4,6 +4,7 @@ module Main where
 import Control.Monad (msum,guard)
 import Control.Monad.Trans (MonadIO(liftIO))
 import Data.List (isPrefixOf, isSuffixOf)
+import Data.Version (showVersion)
 import Happstack.Server
 import Happstack.Server.Compression
 import System.Directory (makeRelativeToCurrentDirectory)
@@ -11,11 +12,11 @@ import System.Environment
 import qualified Language.Elm as Elm
 import Paths_elm_server
 
-runtime = "/elm-" ++ show version ++ ".js"
+runtime = "elm-" ++ showVersion version ++ ".js"
 
 serve :: String -> IO ()
 serve libLoc = do
-  putStrLn ("Elm Server "++show version++": running at <http://localhost:8000>")
+  putStrLn ("Elm Server " ++ showVersion version ++ ": running at <http://localhost:8000>")
   simpleHTTP nullConf $ do
          _ <- compressedResponseFilter
          msum [ uriRest serveElm
@@ -34,7 +35,7 @@ serveElm fp = do
   ok . toResponse $ Elm.toHtml runtime (pageTitle filePath) content
 
 serveLib libLoc fp = do
-  guard (fp == runtime)
+  guard (fp == '/' : runtime)
   serveFile (asContentType "application/javascript") libLoc
 
 main :: IO ()
@@ -42,7 +43,7 @@ main = getArgs >>= parse
 
 parse :: [String] -> IO ()
 parse ("--help":_) = putStrLn usage
-parse ("--version":_) = putStrLn ("The Elm Server " ++ show version)
+parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version)
 parse [] = serve =<< Elm.runtimeLocation
 parse [arg]
     | "--runtime-location=" `isPrefixOf` arg =

elm-server/elm-server.cabal

@@ -1,5 +1,5 @@
 Name:                elm-server
-Version:             0.4.0.3
+Version:             0.4.0.4
 Synopsis:            The Elm language server.
 Description:         This package provides a standalone, Happstack-based Elm server.
 
@@ -35,4 +35,4 @@ Executable elm-server
                        happstack-server == 7.0.2,
                        deepseq,
                        directory,
-                       Elm >= 0.4.0.3
+                       Elm >= 0.4.0.4

elm/Elm.cabal

@@ -1,6 +1,6 @@
 
 Name:                Elm
-Version:             0.4.0.3
+Version:             0.4.0.4
 Synopsis:            The Elm language module.
 Description:         Elm aims to make client-side web-development more pleasant.
                      It is a statically/strongly typed, functional reactive
@@ -22,7 +22,7 @@ Category:            Compiler, Language
 Build-type:          Simple
 
 Extra-source-files:  changelog.txt
-Data-files:          elm-runtime-0.4.0.3.js
+Data-files:          elm-runtime-0.4.0.4.js
 Cabal-version:       >=1.8
 
 source-repository head

elm/src/Compiler.hs

@@ -4,6 +4,7 @@ module Main where
 import Data.Either (lefts, rights)
 import Data.List (intersect, intercalate)
 import Data.Maybe (fromMaybe)
+import Data.Version (showVersion)
 import System.Console.CmdArgs
 import Text.Blaze.Html.Renderer.String (renderHtml)
 
@@ -40,11 +41,11 @@ elm = ELM { make = False &= help "automatically compile dependencies."
           , minify = False &= help "Minify generated JavaScript"
           } &=
     help "Compile Elm programs to HTML, CSS, and JavaScript." &=
-    summary ("The Elm Compiler " ++ show version ++ ", (c) Evan Czaplicki")
+    summary ("The Elm Compiler " ++ showVersion version ++ ", (c) Evan Czaplicki")
 
 main = do
   args <- cmdArgs elm
-  mini <- getDataFileName ("elm-runtime-" ++ show version ++ ".js")
+  mini <- getDataFileName ("elm-runtime-" ++ showVersion version ++ ".js")
   compileArgs mini args
 
 compileArgs mini (ELM _ [] _ _ _ _ _ _) =

elm/src/Language/Elm.hs

@@ -16,6 +16,7 @@ module Language.Elm (
     runtimeLocation
     ) where
 
+import Data.Version (showVersion)
 import CompileToJS
 import ExtractNoscript
 import GenerateHtml
@@ -27,7 +28,7 @@ import Paths_Elm
 import qualified Data.Text as TS
 import qualified Data.Text.Lazy as TL
 
-runtimeLocation = getDataFileName ("elm-runtime-" ++ show version ++ ".js")
+runtimeLocation = getDataFileName ("elm-runtime-" ++ showVersion version ++ ".js")
 
 class ElmSource a where
   -- |This function compiles Elm code to three separate parts: HTML, CSS,