Merge pull request #84 from maoe/update-deps

Update dependencies

Author: Mitsutoshi Aoe

.travis.yml

@@ -1,6 +1,6 @@
 # This Travis job script has been generated by a script via
 #
-#   make_travis_yml_2.hs 'threadscope.cabal' 'libgtk2.0-dev'
+#   runghc make_travis_yml_2.hs '-o' '.travis.yml' 'threadscope.cabal' 'libgtk2.0-dev' '--osx=8.2.2'
 #
 # For more information, see https://github.com/hvr/multi-ghc-travis
 #
@@ -11,11 +11,9 @@ git:
   submodules: false  # whether to recursively clone submodules
 
 cache:
-  timeout: 1000
   directories:
     - $HOME/.cabal/packages
     - $HOME/.cabal/store
-    - $HOME/Library/Caches/Homebrew
     - $HOME/.ghc-install
 
 before_cache:
@@ -27,82 +25,92 @@ before_cache:
   - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
   - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
 
+  - rm -rfv $HOME/.cabal/packages/head.hackage
+
 matrix:
   include:
-    - compiler: "ghc-7.8.3"
-    # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.3,libgtk2.0-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-7.10.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.2,libgtk2.0-dev], sources: [hvr-ghc]}}
     - compiler: "ghc-8.0.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2,libgtk2.0-dev], sources: [hvr-ghc]}}
-    - compiler: "ghc-8.2.1"
+    - compiler: "ghc-8.2.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1,libgtk2.0-dev], sources: [hvr-ghc]}}
-    - compiler: "ghc-8.2.1"
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2,libgtk2.0-dev], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.4.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.2,libgtk2.0-dev], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.2.2"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2,libgtk2.0-dev], sources: [hvr-ghc]}}
       os: osx
 
 before_install:
- - HC=${CC}
- - unset CC
- - sh scripts/install-on-osx.sh $HC
- - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/.ghc-install/bin:$PATH
- - PKGNAME='threadscope'
- - |
-  if [ `uname` = "Darwin" ]; then
-    brew install ghc gtk+ gtk-mac-integration
-  fi
+  - HC=${CC}
+  - HCPKG=${HC/ghc/ghc-pkg}
+  - unset CC
+  - ROOTDIR=$(pwd)
+  - mkdir -p $HOME/.local/bin
+  - "if [ \"$(uname)\" = \"Darwin\" ]; then brew update; brew install gtk+ gtk-mac-integration; brew upgrade python@3; curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=head install cabal-install-head ${HC}; fi"
+  - "if [ \"$(uname)\" = \"Darwin\" ]; then PATH=$HOME/.ghc-install/ghc/bin:$HOME/local/bin:$PATH; else PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH; fi"
+  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
+  - echo $HCNUMVER
 
 install:
- - cabal --version
- - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - BENCH=${BENCH---enable-benchmarks}
- - TEST=${TEST---enable-tests}
- - travis_retry cabal update -v
- - sed -i'.bak' 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- - rm -fv cabal.project.local
- - "echo 'packages: .' > cabal.project"
- - rm -f cabal.project.freeze
- - |
-   if [ `uname` = "Darwin" ]; then
-     cabal new-configure --constraint="gtk +have-quartz-gtk"
-   fi
- - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all
+  - cabal --version
+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
+  - BENCH=${BENCH---enable-benchmarks}
+  - TEST=${TEST---enable-tests}
+  - HADDOCK=${HADDOCK-true}
+  - INSTALLED=${INSTALLED-true}
+  - GHCHEAD=${GHCHEAD-false}
+  - travis_retry cabal update -v
+  - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
+  - rm -fv cabal.project cabal.project.local
+  - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
+  - "printf 'packages: \".\"\\n' > cabal.project"
+  - cat cabal.project
+  - if [ -f "./configure.ac" ]; then
+      (cd "." && autoreconf -i);
+    fi
+  - rm -f cabal.project.freeze
+  - cabal new-configure -w ${HC} --allow-newer=Cabal
+  - "if [ \"$(uname)\" = \"Darwin\" ]; then cabal new-configure -w ${HC} --allow-newer=Cabal --constraint='gtk +have-quartz-gtk'; fi"
+  - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
+  - rm -rf .ghc.environment.* "."/dist
+  - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
 
 # Here starts the actual work to be performed for the package under test;
 # any command which exits with a non-zero exit code causes the build to fail.
 script:
- - if [ -f configure.ac ]; then autoreconf -i; fi
- - rm -rf .ghc.environment.* dist/
- - cabal sdist # test that a source-distribution can be generated
- - cd dist/
- - SRCTAR=(${PKGNAME}-*.tar.gz)
- - SRC_BASENAME="${SRCTAR/%.tar.gz}"
- - tar -xvf "./$SRC_BASENAME.tar.gz"
- - cd "$SRC_BASENAME/"
-## from here on, CWD is inside the extracted source-tarball
- - rm -fv cabal.project.local
- - "echo 'packages: .' > cabal.project"
- # this builds all libraries and executables (without tests/benchmarks)
- - rm -f cabal.project.freeze
- - |
-   if [ `uname` = "Darwin" ]; then
-     cabal new-configure --constraint="gtk +have-quartz-gtk"
-   fi
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
- # this builds all libraries and executables (including tests/benchmarks)
- # - rm -rf ./dist-newstyle
+  # test that source-distributions can be generated
+  - (cd "." && cabal sdist)
+  - mv "."/dist/threadscope-*.tar.gz ${DISTDIR}/
+  - cd ${DISTDIR} || false
+  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
+  - "printf 'packages: threadscope-*/*.cabal\\n' > cabal.project"
+  - cat cabal.project
+  - cabal new-configure -w ${HC} --allow-newer=Cabal
+  - "if [ \"$(uname)\" = \"Darwin\" ]; then cabal new-configure -w ${HC} --allow-newer=Cabal --constraint='gtk +have-quartz-gtk'; fi"
+  # this builds all libraries and executables (without tests/benchmarks)
+  - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
+
+  # Build with installed constraints for packages in global-db
+  - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
 
- # build & run tests
- - cabal new-build -w ${HC} ${TEST} ${BENCH} all
+  # build & run tests, build benchmarks
+  - cabal new-build -w ${HC} ${TEST} ${BENCH} all
+
+  # cabal check
+  - (cd threadscope-* && cabal check)
+
+# REGENDATA ["-o",".travis.yml","threadscope.cabal","libgtk2.0-dev","--osx=8.2.2"]
 
 before_deploy:
-- cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME
-- gzip -f threadscope.$TRAVIS_OS_NAME
+  - cp $(find dist-newstyle/ -type f -name threadscope -exec test -x {} \; -print) threadscope.$TRAVIS_OS_NAME
+  - gzip -f threadscope.$TRAVIS_OS_NAME
 
 deploy:
   provider: releases
@@ -113,5 +121,6 @@ deploy:
   on:
     repo: haskell/ThreadScope
     tags: true
-    condition: "$HC = ghc-8.2.1"
+    condition: "$HC = ghc-8.2.2"
+
 # EOF

GUI/BookmarkView.hs

@@ -13,6 +13,7 @@ module GUI.BookmarkView (
 import GHC.RTS.Events (Timestamp)
 
 import Graphics.UI.Gtk
+import qualified Graphics.UI.Gtk.ModelView.TreeView.Compat as Compat
 import Numeric
 
 ---------------------------------------------------------------------------
@@ -81,7 +82,7 @@ bookmarkViewNew builder BookmarkViewActions{..} = do
     treeViewAppendColumn bookmarkTreeView columnTs
     treeViewAppendColumn bookmarkTreeView columnLabel
 
-    treeViewSetModel bookmarkTreeView bookmarkStore
+    Compat.treeViewSetModel bookmarkTreeView (Just bookmarkStore)
 
     cellLayoutSetAttributes columnTs cellTs bookmarkStore $ \(ts,_) ->
       [ cellText := showFFloat (Just 6) (fromIntegral ts / 1000000) "s" ]

GUI/KeyView.hs

@@ -7,6 +7,7 @@ import GUI.ViewerColours
 import GUI.Timeline.Render.Constants
 
 import Graphics.UI.Gtk
+import qualified Graphics.UI.Gtk.ModelView.TreeView.Compat as Compat
 import qualified Graphics.Rendering.Cairo as C
 
 
@@ -40,7 +41,7 @@ keyViewNew builder = do
 
     let tooltipColumn = makeColumnIdString 0
     customStoreSetColumn keyStore tooltipColumn (\(_,tooltip,_) -> tooltip)
-    treeViewSetModel keyTreeView keyStore
+    Compat.treeViewSetModel keyTreeView (Just keyStore)
 
     set keyTreeView [ treeViewTooltipColumn := tooltipColumn ]
 

GUI/StartupInfoView.hs

@@ -7,6 +7,7 @@ module GUI.StartupInfoView (
 import GHC.RTS.Events
 
 import Graphics.UI.Gtk
+import qualified Graphics.UI.Gtk.ModelView.TreeView.Compat as Compat
 
 import Data.Array
 import Data.List
@@ -54,7 +55,7 @@ startupInfoViewNew builder = do
     treeViewColumnPackStart columnArgs cellArgs True
     treeViewAppendColumn treeviewProgArgs columnArgs
 
-    treeViewSetModel treeviewProgArgs storeProgArgs
+    Compat.treeViewSetModel treeviewProgArgs (Just storeProgArgs)
 
     set cellArgs [ cellTextEditable := True ]
     cellLayoutSetAttributes columnArgs cellArgs storeProgArgs $ \arg ->
@@ -71,7 +72,7 @@ startupInfoViewNew builder = do
     treeViewAppendColumn treeviewProgEnv columnVar
     treeViewAppendColumn treeviewProgEnv columnValue
 
-    treeViewSetModel treeviewProgEnv storeProgEnv
+    Compat.treeViewSetModel treeviewProgEnv (Just storeProgEnv)
 
     cellLayoutSetAttributes columnVar cellVar storeProgEnv $ \(var,_) ->
       [ cellText := var ]

GUI/SummaryView.hs

@@ -10,6 +10,7 @@ import GHC.RTS.Events
 import GUI.Types
 
 import Graphics.UI.Gtk
+import qualified Graphics.UI.Gtk.ModelView.TreeView.Compat as Compat
 
 import Control.Exception (assert)
 import Control.Monad
@@ -95,7 +96,7 @@ summaryViewNew builder = do
     let summaryView = SummaryView{..}
 
     treeviewGcStats <- getWidget castToTreeView "treeviewGcStats"
-    treeViewSetModel treeviewGcStats storeGcStats
+    Compat.treeViewSetModel treeviewGcStats (Just storeGcStats)
     let addGcColumn = addColumn treeviewGcStats storeGcStats
     addGcColumn "Generation" $ \(GcStatsEntry gen _ _ _ _ _) ->
       [ cellText := if gen == -1 then "GC Total" else "Gen " ++ show gen ]
@@ -111,7 +112,7 @@ summaryViewNew builder = do
       [ cellText := (printf "%3.4fs" maxpause :: String) ]
 
     treeviewSparkStats <- getWidget castToTreeView "treeviewSparkStats"
-    treeViewSetModel treeviewSparkStats storeSparkStats
+    Compat.treeViewSetModel treeviewSparkStats (Just storeSparkStats)
     let addSparksColumn = addColumn treeviewSparkStats storeSparkStats
     addSparksColumn "HEC" $ \(hec, _) ->
       [ cellText := if hec == -1 then "Total" else "HEC " ++ show hec ]

GUI/TraceView.hs

@@ -10,6 +10,7 @@ import Events.HECs
 import GUI.Types
 
 import Graphics.UI.Gtk
+import qualified Graphics.UI.Gtk.ModelView.TreeView.Compat as Compat
 import Data.Tree
 
 
@@ -44,7 +45,7 @@ traceViewNew builder actions = do
     treeViewColumnPackStart traceColumn togglecell False
     treeViewAppendColumn tracesTreeView traceColumn
 
-    treeViewSetModel tracesTreeView tracesStore
+    Compat.treeViewSetModel tracesTreeView (Just tracesStore)
 
     cellLayoutSetAttributes traceColumn textcell tracesStore $ \(tr, _) ->
       [ cellText := renderTrace tr ]

Graphics/UI/Gtk/ModelView/TreeView/Compat.hs

@@ -0,0 +1,22 @@
+{-# LANGUAGE CPP #-}
+module Graphics.UI.Gtk.ModelView.TreeView.Compat
+    ( treeViewSetModel
+    ) where
+import Graphics.UI.Gtk hiding (treeViewSetModel)
+import qualified Graphics.UI.Gtk.ModelView.TreeView as Gtk
+#if !MIN_VERSION_gtk(0, 14, 9)
+import qualified System.Glib.FFI as Glib
+import qualified Graphics.UI.GtkInternals as Gtk
+#endif
+
+treeViewSetModel
+    :: (TreeViewClass self, TreeModelClass model)
+    => self
+    -> Maybe model
+    -> IO ()
+#if MIN_VERSION_gtk(0, 14, 9)
+treeViewSetModel = Gtk.treeViewSetModel
+#else
+treeViewSetModel self model = Gtk.treeViewSetModel self
+    (maybe (Gtk.TreeModel Glib.nullForeignPtr) toTreeModel model)
+#endif

appveyor.yml

@@ -1,38 +1,53 @@
-platform: x64
+version: "{build}"
 shallow_clone: true
+clone_folder: "c:/WORK"
+
+platform: x64
+
 environment:
   global:
-    STACK_ROOT: c:\sr
+    APPVEYOR_SAVE_CACHE_ON_ERROR: true
+    CABOPTS: "--store-dir=c:/SR --http-transport=plain-http"
+#   C_INCLUDE_PATH: "c:/msys64/mingw64/include"
+#   LIBRARY_PATH: "c:/msys64/mingw64/lib;c:/msys64/mingw64/bin"
+  matrix:
+    - GHCVER: "8.0.2"
+    - GHCVER: "8.2.2"
+    - GHCVER: "8.4.3"
+
 cache:
-- c:\sr -> appveyor.yml
-- c:\msys64\var\cache\pacman\pkg -> appveyor.yml
+ - "c:/SR"
+#- c:\msys64\var\cache\pacman\pkg -> appveyor.yml
+
 install:
-- set HOME=.
-- set "PATH=c:\msys64\usr\bin;%PATH%"
-- curl -ostack.zip -LsS --insecure https://www.stackage.org/stack/windows-x86_64
-- 7z x stack.zip stack.exe
-- stack setup > nul
-- stack exec -- pacman --noconfirm --needed --ask 20 -Sy bash pacman pacman-mirrors msys2-runtime msys2-runtime-devel
-- stack exec -- pacman --noconfirm -Syu
-- stack exec -- pacman --noconfirm -Syuu
-- stack exec -- pacman --noconfirm -S base-devel mingw-w64-x86_64-pkg-config mingw-w64-x86_64-toolchain mingw-w64-x86_64-gtk2
-- stack exec -- pacman --noconfirm -Sc
+ - "choco install -y ghc --version %GHCVER%"
+ - "refreshenv"
+ - "set PATH=C:\\msys64\\mingw64\\bin;C:\\msys64\\usr\\bin;%PATH%"
+ - "pacman --noconfirm -Sy mingw-w64-x86_64-gtk2"
+ - "cabal --version"
+ - "ghc --version"
+ - "cabal %CABOPTS% update -vverbose+nowrap"
+
 build_script:
-- stack --no-terminal build --only-dependencies
+ - "cabal %CABOPTS% new-build -vnormal+nowrap --dry all"
+ - ps: "Push-AppveyorArtifact dist-newstyle\\cache\\plan.json"
+ - "cabal %CABOPTS% new-build -j -vnormal+nowrap all --dep"
+
 test_script:
-- stack --no-terminal build --ghc-options -Werror
-- stack sdist
-version: '{build}'
+ - "cabal %CABOPTS% new-build -j1 -vnormal+nowrap all"
+#- "cabal %CABOPTS% new-test -j1 -vnormal+nowrap all"
+
 after_test:
-- ps: cp "$(./stack.exe path --local-install-root)/bin/threadscope.exe" threadscope.exe
-- 7z a threadscope.windows.%PLATFORM%.zip threadscope.exe
-artifacts:
-- path: threadscope.windows.%PLATFORM%.zip
+ - bash -c "cp -v $(find -name threadscope.exe) ./threadscope.exe"
+ - 7z a threadscope.windows.%PLATFORM%.ghc-%GHCVER%.zip threadscope.exe
+ - ps: "Push-AppveyorArtifact threadscope.windows.$($env:PLATFORM).ghc-$($env:GHCVER).zip"
+
 deploy:
-- provider: GitHub
-  auth_token:
-    secure: IbU7Tokqkdq4bI5PT+HvzG0hO4O8t2Lxq3GamSuAzWsQWt4vZahOGL9StxIXIe94
-  artifact: threadscope.windows.$(platform).zip
-  release: $(appveyor_repo_tag_name)
-  on:
-    appveyor_repo_tag: true
+ - provider: GitHub
+   auth_token:
+     secure: IbU7Tokqkdq4bI5PT+HvzG0hO4O8t2Lxq3GamSuAzWsQWt4vZahOGL9StxIXIe94
+   artifact: threadscope.windows.$(platform).ghc-$(GHCVER).zip
+   release: $(appveyor_repo_tag_name)
+   on:
+     appveyor_repo_tag: true
+     GHCVER: "8.4.3"

cabal.project

@@ -0,0 +1,3 @@
+-- see http://cabal.readthedocs.io/en/latest/nix-local-build-overview.html for more information
+
+packages: .