Skip to content

Commit

Permalink
bumped to v0.7; tweaks to readme and release scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
mtolly committed Apr 29, 2015
1 parent 4224dc3 commit 228c806
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 5 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Builds win/mac/linux binaries from a Mac with Vagrant.

release := $(shell release/version)

.PHONY: all osx linux win32
all: release/${release}-osx-x64.zip release/${release}-linux-x86.tar.gz release/${release}-win32-x86.zip
osx: release/${release}-osx-x64.zip
linux: release/${release}-linux-x86.tar.gz
win32: release/${release}-win32-x86.zip

release/${release}-osx-x64.zip:
rm -rf dist/
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ latest code yourself:

1. Install the [Haskell Platform], or (for advanced users)
[GHC] + [Alex] + [Happy] + [`cabal-install`][cabal].
GHC 7.6 and 7.8 are supported but others may work.
GHC 7.4, 7.6, 7.8, and 7.10 are tested.

[Haskell Platform]: https://www.haskell.org/platform/
[GHC]: https://www.haskell.org/ghc/
Expand All @@ -51,9 +51,12 @@ latest code yourself:

2. `cabal update` if necessary to download package lists.

2. In the `pokemid` directory, `cabal install` to build and install.
Or, `cabal build` and move `dist/build/pokemid/pokemid` to the
directory of your choice.
3. In the `pokemid` directory,
`cabal sandbox init` if you want the installed dependencies sandboxed (recommended).

4. `cabal install` to build and install.
Or, `cabal build` and then move `dist/build/pokemid/pokemid(.exe)`
to the directory of your choice.

## Usage

Expand Down
2 changes: 1 addition & 1 deletion pokemid.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: pokemid
version: 0.6.1
version: 0.7
synopsis: Import\/export Pokémon Red\/Blue music as MIDI
homepage: https://github.com/mtolly/pokemid
license: PublicDomain
Expand Down
4 changes: 4 additions & 0 deletions release/build
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/usr/bin/env bash
set -e
set -u

rm -rf dist/
cabal sandbox init
cabal install --only-dependencies
cabal configure
Expand Down
4 changes: 4 additions & 0 deletions release/build-wine
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/usr/bin/env bash
set -e
set -u

rm -rf dist/
wine cabal sandbox init
wine cabal install --only-dependencies
wine cabal configure
Expand Down

0 comments on commit 228c806

Please sign in to comment.