From 6b6147afb87730755d3bf7a25a61ee38acae6fd9 Mon Sep 17 00:00:00 2001 From: Colin Woodbury Date: Fri, 20 Dec 2013 06:06:38 +0900 Subject: [PATCH 01/12] Added link to new Installation instructions --- README.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/README.md b/README.md index ffdb75c..718fd41 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,7 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/) ## Install -**Note for OS X 10.9 Maverics:** you must follow -[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9) -before continuing! - -Download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/). -Once the Haskell Platform is installed: - - cabal update - cabal install elm - cabal install elm-server +[Please see these instructions.](https://github.com/evancz/Elm/wiki/Installing-Elm) ## Use From ca672f6e4698bba63beab9fa55c1ad43f3b80cb5 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Thu, 19 Dec 2013 14:04:03 -0800 Subject: [PATCH 02/12] Keep general instructions on main page --- README.md | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 718fd41..7846ad8 100644 --- a/README.md +++ b/README.md @@ -3,18 +3,29 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/) ## Install -[Please see these instructions.](https://github.com/evancz/Elm/wiki/Installing-Elm) +#### Platform Agnostic + +Note for OS X 10.9 Maverics: you must follow these directions before continuing! + +Download the Haskell Platform 2012.2.0.0 or later. Once the Haskell Platform is installed: + +cabal update +cabal install elm +cabal install elm-server + +Elm definitely works with version 7.4 of the Haskell compiler (GHC 7.4) which is bundled with version 2012.2.0.0 of the Haskell Platform. + +#### Specific Platforms + +* [Arch Linux](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) ## Use To use `elm` and `elm-server` you may need to add a new directory to your PATH. Cabal should tell you where your executables are located upon -successful installation. - -For me, the executables were placed in `/home/evan/.cabal/bin` which I -appended to the end of my PATH variable in my .bashrc file. - +successful installation. It'll be something like `/home/evan/.cabal/bin` +which you should append to your PATH variable. See this tutorial if you are new to changing your PATH in [Unix/Linux](http://www.cyberciti.biz/faq/unix-linux-adding-path/). From 02bd3a5e3462447af36978e2a0e72133ebcb6aa6 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Thu, 19 Dec 2013 14:05:52 -0800 Subject: [PATCH 03/12] Update README.md --- README.md | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7846ad8..37b408c 100644 --- a/README.md +++ b/README.md @@ -3,21 +3,17 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/) ## Install -#### Platform Agnostic +* [Arch Linux](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) -Note for OS X 10.9 Maverics: you must follow these directions before continuing! +#### Everyone else! + +**With OS X 10.9 Maverics:** you must follow these directions before continuing! Download the Haskell Platform 2012.2.0.0 or later. Once the Haskell Platform is installed: -cabal update -cabal install elm -cabal install elm-server - -Elm definitely works with version 7.4 of the Haskell compiler (GHC 7.4) which is bundled with version 2012.2.0.0 of the Haskell Platform. - -#### Specific Platforms - -* [Arch Linux](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) + cabal update + cabal install elm + cabal install elm-server ## Use From a3a5cd933fa87481cc5b71ffbcc3930574cd598d Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Thu, 19 Dec 2013 14:08:39 -0800 Subject: [PATCH 04/12] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 37b408c..59cda96 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,12 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/) ## Install -* [Arch Linux](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) +**Arch Linux:** follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then +jump to the [My First Project](#my-first-project) section. -#### Everyone else! - -**With OS X 10.9 Maverics:** you must follow these directions before continuing! +**OS X 10.9:** follow +[these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9) +before continuing! Download the Haskell Platform 2012.2.0.0 or later. Once the Haskell Platform is installed: From 65dd54c99e59aa9cc7ab65b01acfa1468bcf7262 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Thu, 19 Dec 2013 14:09:49 -0800 Subject: [PATCH 05/12] add haskell platform link again --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 59cda96..d376d27 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ jump to the [My First Project](#my-first-project) section. [these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9) before continuing! -Download the Haskell Platform 2012.2.0.0 or later. Once the Haskell Platform is installed: +Download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/). +Once the Haskell Platform is installed: cabal update cabal install elm From 60f67d6920aa92eb35c8a0dc90ae130cb12a8da5 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Thu, 19 Dec 2013 14:14:17 -0800 Subject: [PATCH 06/12] Clarify instal directions a bit --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d376d27..93ccfcb 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,15 @@ Learn about the Elm programming language at [elm-lang.org](http://elm-lang.org/) ## Install -**Arch Linux:** follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then +**Arch Linux** — follow [these directions](https://github.com/evancz/Elm/wiki/Installing-Elm#arch-linux) and then jump to the [My First Project](#my-first-project) section. - -**OS X 10.9:** follow +
+**OS X 10.9** — follow [these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9) -before continuing! +before continuing with the platform agnostic directions below. -Download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/). +**Plataform Agnostic** — +download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/). Once the Haskell Platform is installed: cabal update From 4b22dbb33ac6215fd48ee1b51c2751bfbeda0a36 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Fri, 20 Dec 2013 10:07:52 -0800 Subject: [PATCH 07/12] Fix typo pointed out by @mgold. Thanks! --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93ccfcb..5f7133c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ jump to the [My First Project](#my-first-project) section. [these directions](http://justtesting.org/post/64947952690/the-glasgow-haskell-compiler-ghc-on-os-x-10-9) before continuing with the platform agnostic directions below. -**Plataform Agnostic** — +**Platform Agnostic** — download the [Haskell Platform 2012.2.0.0 or later](http://hackage.haskell.org/platform/). Once the Haskell Platform is installed: From 5b7f442584fcd8490731a6e3cd0c07fe1c430a75 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Sun, 29 Dec 2013 13:41:39 -0800 Subject: [PATCH 08/12] Bump version number --- Elm.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Elm.cabal b/Elm.cabal index f33ee63..c306ba9 100644 --- a/Elm.cabal +++ b/Elm.cabal @@ -1,5 +1,5 @@ Name: Elm -Version: 0.10.0.2 +Version: 0.10.1 Synopsis: The Elm language module. Description: Elm aims to make client-side web-development more pleasant. It is a statically/strongly typed, functional reactive From 56324bf699063d36be55e193eed5f5f1d536eca3 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Sun, 29 Dec 2013 15:35:26 -0800 Subject: [PATCH 09/12] Update version numbers for standard library --- libraries/elm_dependencies.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/elm_dependencies.json b/libraries/elm_dependencies.json index 1153d15..a99b17b 100644 --- a/libraries/elm_dependencies.json +++ b/libraries/elm_dependencies.json @@ -1,9 +1,9 @@ -{ "version": "0.10.0.2" +{ "version": "0.10.1" , "summary": "Elm's standard libraries" -, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.11, you should be using version 0.11 of the standard libraries." +, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.10.1, you should be using version 0.10.1 of the standard libraries." , "license": "BSD3" , "repository": "http://github.com/evancz/Elm.git" -, "elm-version": "0.10.0.2" +, "elm-version": "0.10.1" , "dependencies": {} , "exposed-modules": [ "Basics" @@ -36,4 +36,4 @@ , "WebSocket" , "Window" ] -} \ No newline at end of file +} From 145d4b96c56384ec2023334d56dac645b0c7db3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timothy=20Vladim=C3=ADr=20Hobbs?= Date: Fri, 27 Dec 2013 20:30:07 +0100 Subject: [PATCH 10/12] Update elm-server to work with new module structure --- server/Server.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/Server.hs b/server/Server.hs index 25ce38a..4729ffe 100644 --- a/server/Server.hs +++ b/server/Server.hs @@ -12,7 +12,7 @@ import System.Exit import System.FilePath import System.Process import GHC.IO.Handle -import qualified Language.Elm as Elm +import qualified Elm.Internal.Paths as ElmPaths import Paths_elm_server runtime = "/elm-runtime.js" @@ -74,7 +74,7 @@ parse ("--help":_) = putStrLn usage parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version) parse args = if null remainingArgs then - serve portNumber =<< elmRuntime + serve portNumber elmRuntime else putStrLn usageMini @@ -86,9 +86,9 @@ parse args = argValue arg = tail $ dropWhile (/= '=') (head arg) portNumber = if null portArg then 8000 else read (argValue portArg) :: Int elmRuntime = if null runtimeArg then - Elm.runtime + ElmPaths.runtime else - return $ argValue runtimeArg + argValue runtimeArg usageMini :: String usageMini = From 013f9d701e5b3979b3bbb60875c4969d51d98943 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Mon, 30 Dec 2013 15:50:25 -0800 Subject: [PATCH 11/12] Bump version number of elm-server --- server/elm-server.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/elm-server.cabal b/server/elm-server.cabal index a7b946a..0ee8391 100644 --- a/server/elm-server.cabal +++ b/server/elm-server.cabal @@ -1,5 +1,5 @@ Name: elm-server -Version: 0.10 +Version: 0.10.1 Synopsis: The Elm language server. Description: This package provides a standalone, Happstack-based Elm server. @@ -36,5 +36,5 @@ Executable elm-server happstack-server, deepseq, filepath, - Elm >= 0.10, + Elm >= 0.10.1, process From 60aaaf4d66fcfc8d010f5a38304d26fb3ca82683 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Mon, 30 Dec 2013 15:57:42 -0800 Subject: [PATCH 12/12] Try to clarify why the Hackage API exists. --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5f7133c..5e7fb1a 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,15 @@ allowing you to navigate to `Main.elm` and see your first program in action. #### Final Notes -The `elm` package provides support for compilation of Elm code directly in Haskell. -Check it out [on Hackage](http://hackage.haskell.org/package/Elm) if you are interested. +The `elm` package provides +[some utility functions](http://hackage.haskell.org/package/Elm) for +working with Elm in Haskell. This can be useful for creating tooling +for Elm, and has been useful for projects like +[the website](http://elm-lang.org/) and +[`elm-get`](https://github.com/evancz/elm-get). Email the list if you +want to rely on these functions! -If you are stuck, email [the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss) -or ask a question in the [#Elm IRC channel](http://webchat.freenode.net/?channels=elm). +If you are stuck, email +[the list](https://groups.google.com/forum/?fromgroups#!forum/elm-discuss) +or ask a question in the +[#Elm IRC channel](http://webchat.freenode.net/?channels=elm).