Skip to content

Commit 1d57ff4

Browse files
committed
Bump version to 0.10.1
Build Windows distribution
1 parent 845157b commit 1d57ff4

8 files changed

+38
-9
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.10.1
2+
3+
Windows support
4+
15
## 0.10.0
26

37
Features:

Setup.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ writeCustomFile :: FilePath -> IO ()
2323
writeCustomFile filepath = do
2424
putStrLn $ "Generating " ++ filepath ++ "..."
2525

26-
desc <- readProcess "git" ["describe", "--abbrev=8", "--always"] ""
26+
desc <- readProcess "git" ["--git-dir=./.git", "describe", "--abbrev=8", "--always"] ""
2727
now <- readProcess "date" ["+%s"] ""
2828

2929
writeFile filepath $ unlines

elm-format-short.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: elm-format-short
2-
version: 0.10.0
2+
version: 0.10.1
33

44
Synopsis:
55
A source code short formatter for Elm

package/npm/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ See `dreamwriter` app by `@rtfeldman`:
3131
- [RightSidebar.elm](https://github.com/nukisman/elm-format-short/blob/master/tests/test-files/good/rtfeldman/dreamwriter/RightSidebar.elm)
3232
- [WordGraph.elm](https://github.com/nukisman/elm-format-short/blob/master/tests/test-files/good/rtfeldman/dreamwriter/WordGraph.elm)
3333

34-
## Installation (currently Mac and Linux only)
34+
## Installation
3535

3636
`npm i -g elm-format-short`
3737

package/npm/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = binwrap({
1414
urls: {
1515
"darwin-x64": root + "-mac-x64.tgz",
1616
"linux-x64": root + "-linux-x64.tgz",
17-
// "win32-x64": root + "-win-i386.zip",
18-
// "win32-ia32": root + "-win-i386.zip"
17+
"win32-x64": root + "-win-i386.zip",
18+
"win32-ia32": root + "-win-i386.zip"
1919
}
2020
});

package/npm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "elm-format-short",
3-
"version": "0.10.0",
3+
"version": "0.10.1",
44
"description": "Install elm-format-short",
55
"preferGlobal": true,
66
"main": "index.js",

package/win/build-package.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
set -ex
44

5-
VERSION="$(git describe --abbrev=8)"
5+
VERSION="$(git --git-dir=./.git describe --abbrev=8)"
66
PLATFORM="win-i386"
77
BINEXT=".exe"
88

99
## Run tests
1010

11-
stack clean
11+
#stack clean
1212
#./tests/run-tests.sh # TODO !!!
1313

1414

package/win/setup.md

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Prepare
2+
13
```bash
24
brew tap caskroom/cask
35
brew cask install vagrant
@@ -24,8 +26,29 @@ choco install poshgit
2426
#choco install tortoisegit
2527
```
2628

27-
# Restart shell
2829

30+
# Build
31+
32+
## Open VirtualBox and show the Windows VM
33+
34+
## Unix
35+
36+
```bash
37+
vagrant up
38+
vagrant provision
39+
vagrant plugin install vagrant-winrm
40+
```
41+
42+
## Windows (Git-Bash)
43+
44+
```bash
45+
cd /c/vagrant
46+
stack clean
47+
48+
# Kill stack process. If need - restart windows
49+
50+
./package/win/build-package.sh
51+
```
2952

3053
## Build Windows binary
3154

@@ -39,6 +62,8 @@ git clean -dfx
3962
## !! Make sure you are in package/win/elm-format-short !!
4063
```
4164

65+
66+
4267
## Start Git Bash
4368

4469
```bash

0 commit comments

Comments
 (0)