Merge branch 'master' into upgrade-to-lts-13-3

- and rename module Lens to Text.Pandoc.Lens

.gitlab-ci.yml

@@ -53,6 +53,23 @@ build:mac:
     paths:
       - decker
 
+build:win:
+  tags:
+    - win
+  stage: build
+  script:
+    - '&.\bin\build.ps1 preextracted -skiptemplates -preparepackage'
+  artifacts:
+    paths:
+      - decker.exe
+      - resource.zip
+      - version.txt
+  cache:
+    key: build-win
+    paths:
+      - .stack-work
+
+
 test:linux:
   stage: test
   tags:
@@ -113,5 +130,24 @@ deploy:linux:
     - mc cp ./decker store/decker/decker-linux
   dependencies:
     - build:linux
+  only:
+    - master
+
+deploy:win:
+  stage: deploy
+  image: 
+    name: minio/mc:latest
+    entrypoint: [""]
+  variables:
+    GIT_STRATEGY: none
+  tags:
+    - docker
+  script:
+    - mc config host add store http://store.hci.informatik.uni-wuerzburg.de:9002 $MINIO_ACCESS $MINIO_SECRET --api S3v4
+    - mc cp ./decker.exe store/decker/decker-win.exe
+    - mc cp ./resource.zip store/decker/resource-win.zip
+    - mc cp ./version.txt store/decker/version-win.txt
+  dependencies:
+    - build:win
   only:
     - master
\ No newline at end of file

bin/build.ps1

+<#
+.SYNOPSIS
+    Builds Decker for windows
+.DESCRIPTION
+    Build script to build Decker for windows. Allows to set the build
+    mode via parameters for custom builds in the CI pipeline.
+.PARAMETER buildtype
+    Defaults to assume preextracted resources for the build.
+    If set to any other value will include the resources in the executable.
+#>
+Param(
+    [string] $buildtype = "preextracted",
+    [switch] $skiptemplates,
+    [switch] $preparepackage
+)
+Write-Output "Building Windows Decker"
+if(-Not $skiptemplates) {
+    & yarn install
+    & yarn run webpack --mode production
+    Copy-Item -Recurse -Force node_modules/reveal.js-menu resource/support/
+    New-Item -ItemType directory -Force -Path resource/support/notes
+    Copy-Item -Force node_modules/reveal.js/plugin/notes/notes.html resource/support/notes/notes.html
+    Copy-Item -Force node_modules/reveal.js/plugin/notes/notes.js resource/support/notes/notes.js
+    New-Item -ItemType directory -Force -Path resource/support/print
+    Copy-Item -Force node_modules/reveal.js/css/print/paper.css resource/support/print/paper.css
+    Copy-Item -Force node_modules/reveal.js/css/print/pdf.css resource/support/print/pdf.css
+}
+
+if($buildtype -eq "preextracted"){
+    Write-Output "Building for preextracted resources"
+    & stack build -j4 --flag decker:preextractedresources
+} else {
+    Write-Output "Building standalone binary"
+    & stack build -j4
+}
+
+if($preparepackage) {
+    $binpath=(Join-Path ($(stack path | Select-String -Pattern "local-install-root") -split " ")[1] "bin\decker.exe")
+    Copy-Item $binpath .
+
+    $version = Get-Content .\package.yaml | Select-String -Pattern "version: "
+    $version = $version -replace "\s+", " "
+    $version = ($version -split " ")[1]
+    Write-Output $version > version.txt
+
+    Compress-Archive -Force -Path .\resource -CompressionLevel Fastest -DestinationPath resource
+}
\ No newline at end of file

resource/example/example-deck.md

@@ -653,9 +653,9 @@ alert (s);
 Dynamically make notes on presentations:
 
 - Make notes on slides: click <i class="fas fa-pencil-alt"></i> or type 'c'
-- Draw on chalkboard: click <i class="fas fa-edit"></i> or type 'b'
+- Draw on chalkboard: click <i class="fas fa-edit"></i> or type 't'
 - Left mouse to draw, right to erase, center for laser pointer
-- Click icon again or type 'c' or 'b' to close
+- Click icon again or type 'c' or 't' to close
 - 'Del' key clears chalkboard
 - Drawings are saved - type 'd' to download
 

src-win/System/Decker/OS.hs

@@ -6,6 +6,7 @@ module System.Decker.OS
   ) where
 
 import Common
+import Data.List
 import System.Environment
 import System.FilePath
 

src/Filter.hs

@@ -23,7 +23,7 @@ import Control.Exception
 import Exception
 import Sketch
 import Slide
-import Lens
+import Text.Pandoc.Lens
 
 import Control.Applicative
 import Control.Lens

src/Project.hs

@@ -203,7 +203,7 @@ fileIsNewer a b = do
 -- Both arguments are expected to be absolute pathes. 
 makeRelativeTo :: FilePath -> FilePath -> FilePath
 makeRelativeTo dir file =
-  let (d, f) = removeCommonPrefix (dir, file)
+  let (d, f) = removeCommonPrefix (normalise dir, normalise file)
    in normalise $ invertPath d </> f
 
 invertPath :: FilePath -> FilePath

src/Shake.hs

@@ -40,7 +40,7 @@ import Meta
 import Project
 import Server
 import Sketch
-import Lens as P
+import Text.Pandoc.Lens as P
 
 import Control.Concurrent
 import Control.Exception

src/Sketch.hs

@@ -11,7 +11,7 @@ import Common
 import Markdown
 import Resources
 import Slide
-import Lens
+import Text.Pandoc.Lens
 
 import Control.Lens
 import Control.Monad

src/Slide.hs

@@ -8,7 +8,7 @@ module Slide
   , fromSlides
   ) where
 
-import Lens
+import Text.Pandoc.Lens
 
 import Text.Pandoc
 import Text.Pandoc.Definition ()

src/Lens.hs → src/Text/Pandoc/Lens.hs

@@ -11,7 +11,7 @@
 -- The original repo does not seem to be maintained very actively and will not compile
 -- with lts-13.3.
 
-module Lens
+module Text.Pandoc.Lens
     ( -- * Documents
       Pandoc
     , body

src/Utilities.hs

@@ -33,7 +33,7 @@ import Resources
 import Server
 import Shake
 import Sketch
-import Lens
+import Text.Pandoc.Lens
 
 import Control.Arrow
 import Control.Concurrent

test/SketchTests.hs

@@ -4,7 +4,7 @@ module SketchTests
 
 import Sketch
 import Slide
-import Lens
+import Text.Pandoc.Lens
 
 import Data.Char
 import Test.Hspec