Skip to content

Commit a711a04

Browse files
author
Mitsutoshi Aoe
authored
Merge pull request #86 from maoe/release/v0.2.11
Release v0.2.11
2 parents 034bb44 + f8adc47 commit a711a04

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Revision history for threadscope
22

3+
## 2018-06-08 - v0.2.11
4+
5+
* Relax upper version bounds for template-haskell and temporary
6+
* Fix build failure with gtk-0.14.9
7+
* Modernise AppVeyor CI script
8+
39
## 2018-02-16 - v0.2.10
410

511
* Add instructions to install gtk2 in the README

README.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ then you can run the threadscope binary from the shell.
2727

2828
## Building from source
2929

30+
Use `git clone` or `cabal unpack threadscope` to get the source and move into the threadscope directory.
31+
3032
### Linux
3133

3234
GTK+2 is required to be installed. On Ubuntu-like systems:
@@ -67,9 +69,24 @@ stack install --flag gtk:have-quartz-gtk
6769

6870
### Windows
6971

70-
stack is the recommended tool to build threadscope on Windows.
72+
[Chocolatey](https://chocolatey.org/) can be used to install GHC and [MSYS2](https://www.msys2.org/) is the recommended way to install GTK+.
73+
74+
```sh
75+
choco install ghc
76+
refreshenv
77+
set PATH=C:\\msys64\\mingw64\\bin;C:\\msys64\\usr\\bin;%PATH%
78+
pacman -Sy mingw-w64-x86_64-gtk2
79+
```
7180

72-
CAVEAT: Currently gtk2 needs to be installed twice: one for stack's MSYS2 environment and another for local MSYS2 environment.
81+
then you can build threadscope using cabal:
82+
83+
```sh
84+
cabal new-build
85+
```
86+
87+
Or you can use stack instead.
88+
89+
CAVEAT: gtk2 needs to be installed twice: one for stack's MSYS2 environment and another for local MSYS2 environment.
7390

7491
In command prompt:
7592
```sh
@@ -88,3 +105,5 @@ echo 'export PATH=$APPDATA/local/bin:$PATH' >> .profile
88105
source .profile
89106
threadscope
90107
```
108+
109+
Building using stack is not tested in CI. If you find any issues with building with stack, please update the instructions and send a PR.

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ resolver: lts-11.8
22
packages:
33
- .
44
extra-deps:
5-
- Cabal-2.0.1.1
5+
- Cabal-1.24.2.0
66
- Win32-2.3.1.1
77
- gio-0.13.5.0
88
- gtk-0.14.9

threadscope.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: threadscope
2-
Version: 0.2.10
2+
Version: 0.2.11
33
Category: Development, Profiling, Trace
44
Synopsis: A graphical tool for profiling parallel Haskell programs.
55
Description: ThreadScope is a graphical viewer for thread profile

0 commit comments

Comments
 (0)