Bump version to 0.10.1

Build Windows distribution
nukisman · Sep 29, 2017 · 1d57ff4 · 1d57ff4
1 parent 845157b
commit 1d57ff4
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.1
+
+Windows support
+
 ## 0.10.0
 
 Features:

diff --git a/Setup.hs b/Setup.hs
@@ -23,7 +23,7 @@ writeCustomFile :: FilePath -> IO ()
 writeCustomFile filepath = do
   putStrLn $ "Generating " ++ filepath ++ "..."
 
-  desc <- readProcess "git" ["describe", "--abbrev=8", "--always"] ""
+  desc <- readProcess "git" ["--git-dir=./.git", "describe", "--abbrev=8", "--always"] ""
   now <- readProcess "date" ["+%s"] ""
 
   writeFile filepath $ unlines

diff --git a/elm-format-short.cabal b/elm-format-short.cabal
@@ -1,5 +1,5 @@
 Name: elm-format-short
-version: 0.10.0
+version: 0.10.1
 
 Synopsis:
     A source code short formatter for Elm

diff --git a/package/npm/README.md b/package/npm/README.md
@@ -31,7 +31,7 @@ See `dreamwriter` app by `@rtfeldman`:
  - [RightSidebar.elm](https://github.com/nukisman/elm-format-short/blob/master/tests/test-files/good/rtfeldman/dreamwriter/RightSidebar.elm)
  - [WordGraph.elm](https://github.com/nukisman/elm-format-short/blob/master/tests/test-files/good/rtfeldman/dreamwriter/WordGraph.elm)  
 
-## Installation (currently Mac and Linux only) 
+## Installation
 
 `npm i -g elm-format-short`  
 

diff --git a/package/npm/index.js b/package/npm/index.js
@@ -14,7 +14,7 @@ module.exports = binwrap({
   urls: {
     "darwin-x64": root + "-mac-x64.tgz",
     "linux-x64": root + "-linux-x64.tgz",
-    // "win32-x64": root + "-win-i386.zip",
-    // "win32-ia32": root + "-win-i386.zip"
+     "win32-x64": root + "-win-i386.zip",
+     "win32-ia32": root + "-win-i386.zip"
   }
 });
diff --git a/package/npm/package.json b/package/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elm-format-short",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Install elm-format-short",
   "preferGlobal": true,
   "main": "index.js",

diff --git a/package/win/build-package.sh b/package/win/build-package.sh
@@ -2,13 +2,13 @@
 
 set -ex
 
-VERSION="$(git describe --abbrev=8)"
+VERSION="$(git --git-dir=./.git describe --abbrev=8)"
 PLATFORM="win-i386"
 BINEXT=".exe"
 
 ## Run tests
 
-stack clean
+#stack clean
 #./tests/run-tests.sh # TODO !!!
 
 

diff --git a/package/win/setup.md b/package/win/setup.md
@@ -1,3 +1,5 @@
+# Prepare
+
 ```bash
 brew tap caskroom/cask
 brew cask install vagrant
@@ -24,8 +26,29 @@ choco install poshgit
 #choco install tortoisegit
 ```
 
-# Restart shell
 
+# Build
+
+## Open VirtualBox and show the Windows VM
+
+## Unix
+
+```bash
+vagrant up
+vagrant provision
+vagrant plugin install vagrant-winrm
+```
+
+## Windows (Git-Bash)
+
+```bash
+cd /c/vagrant
+stack clean
+
+# Kill stack process. If need - restart windows
+
+./package/win/build-package.sh
+```
 
 ## Build Windows binary
 
@@ -39,6 +62,8 @@ git clean -dfx
 ## !! Make sure you are in package/win/elm-format-short !!
 ```
 
+
+
 ## Start Git Bash
 
 ```bash