on master help sign in
Merge pull request #1408 from elm-lang/dev
e610efeEvan Czaplicki
CONTRIBUTING.md+1−1
@@ -15,7 +15,7 @@ and send it to <info@elm-lang.org> before opening your pull request.
15 * JavaScript &mdash; use [Google's JS style guide][js]
15 * JavaScript &mdash; use [Google's JS style guide][js]
16
16
17[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
17[haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be
18−[js]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
18+[js]: https://google.github.io/styleguide/javascriptguide.xml
19
19
20## Branches
20## Branches
21
21
elm-compiler.cabal+1−1
@@ -1,6 +1,6 @@
1
1
2Name: elm-compiler
2Name: elm-compiler
3−Version: 0.17
3+Version: 0.17.1
4
4
5Synopsis:
5Synopsis:
6 Values to help with elm-package, elm-make, and elm-lang.org.
6 Values to help with elm-package, elm-make, and elm-lang.org.
src/CommandLineRouter.hs+9−1
@@ -10,6 +10,8 @@ import GHC.IO.Encoding (setLocaleEncoding, utf8)
10import qualified Elm.Compiler.Version as Compiler
10import qualified Elm.Compiler.Version as Compiler
11import qualified Elm.Package as Pkg
11import qualified Elm.Package as Pkg
12
12
13+
14+
13main :: IO ()
15main :: IO ()
14main =
16main =
15 do setLocaleEncoding utf8
17 do setLocaleEncoding utf8
@@ -19,6 +21,12 @@ main =
19 [] ->
21 [] ->
20 putStrLn usageMessage
22 putStrLn usageMessage
21
23
24+ "--version" ->
25+ putStrLn $ Pkg.versionToString Compiler.version
26+
27+ "-v" ->
28+ putStrLn $ Pkg.versionToString Compiler.version
29+
22 command : args ->
30 command : args ->
23 attemptToRun command args
31 attemptToRun command args
24
32
@@ -50,7 +58,7 @@ attemptToRun command args =
50
58
51usageMessage :: String
59usageMessage :: String
52usageMessage =
60usageMessage =
53− "Elm Platform " ++ (Pkg.versionToString Compiler.version) ++ " - a way to run all Elm tools\n\
61+ "Elm Platform " ++ Pkg.versionToString Compiler.version ++ " - a way to run all Elm tools\n\
54 \\n\
62 \\n\
55 \Usage: elm <command> [<args>]\n\
63 \Usage: elm <command> [<args>]\n\
56 \\n\
64 \\n\