From 28eaf16f8ee1bcda3404c1e9461b13e6cc9c3ca7 Mon Sep 17 00:00:00 2001 From: cyfraeviolae Date: Tue, 22 Feb 2022 21:53:46 -0500 Subject: build --- app/Web.hs | 9 ++++++--- build | 3 +++ deploy | 6 ------ dist/sumcheck-exe | Bin 0 -> 21632280 bytes lib/libgmp.a | Bin 0 -> 1311446 bytes package.yaml | 6 ++++++ static/style.css | 6 +++--- sumcheck.cabal | 6 +++++- 8 files changed, 23 insertions(+), 13 deletions(-) create mode 100755 build delete mode 100755 deploy create mode 100755 dist/sumcheck-exe create mode 100644 lib/libgmp.a diff --git a/app/Web.hs b/app/Web.hs index a8a38ae..f64178f 100644 --- a/app/Web.hs +++ b/app/Web.hs @@ -30,10 +30,13 @@ import System.Timeout (timeout) data HomeView = HomeDefault | HomeError String String | HomeResult String Bool type HomeAPI = + "sumcheck" :> QueryParam "theorem" String :> Get '[HTML] HomeView -type API = HomeAPI :<|> "static" :> Raw +type StaticAPI = "sumcheck" :> "static" :> Raw + +type API = HomeAPI :<|> StaticAPI startApp :: IO () startApp = run 9000 app @@ -213,8 +216,8 @@ pageTemplate crumbs body = doctypehtml_ $ do meta_ [charset_ "utf-8"] meta_ [name_ "viewport", content_ "width=device-width, initial-scale=1.0"] link_ - [rel_ "shortcut icon", type_ "image/x-icon", href_ "/static/favicon.ico"] - link_ [rel_ "stylesheet", type_ "text/css", href_ "/static/style.css"] + [rel_ "shortcut icon", type_ "image/x-icon", href_ "/sumcheck/static/favicon.ico"] + link_ [rel_ "stylesheet", type_ "text/css", href_ "/sumcheck/static/style.css"] body_ $ div_ [class_ "container"] $ do div_ [class_ "row navbar"] $ diff --git a/build b/build new file mode 100755 index 0000000..d7afb83 --- /dev/null +++ b/build @@ -0,0 +1,3 @@ +set -euo pipefail +stack install +cp ~/.local/bin/sumcheck-exe dist/ diff --git a/deploy b/deploy deleted file mode 100755 index 3b3c728..0000000 --- a/deploy +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -stack install -rsync ~/.local/bin/sumcheck-exe vps:/srv/sumcheck/staging -rsync sumcheck.service vps:/srv/sumcheck/staging -rsync -az static vps:/srv/sumcheck/staging diff --git a/dist/sumcheck-exe b/dist/sumcheck-exe new file mode 100755 index 0000000..2525870 Binary files /dev/null and b/dist/sumcheck-exe differ diff --git a/lib/libgmp.a b/lib/libgmp.a new file mode 100644 index 0000000..5886d4a Binary files /dev/null and b/lib/libgmp.a differ diff --git a/package.yaml b/package.yaml index f954c47..02282a1 100644 --- a/package.yaml +++ b/package.yaml @@ -34,6 +34,12 @@ executables: - -threaded - -rtsopts - -with-rtsopts=-N + - -static + - -Wall + - -O2 + cc-options: -static + ld-options: -static -pthread + extra-lib-dirs: ./lib/ dependencies: - sumcheck - servant-server diff --git a/static/style.css b/static/style.css index 382da4f..86d1fed 100644 --- a/static/style.css +++ b/static/style.css @@ -1,18 +1,18 @@ @font-face { font-family: EBGaramond; - src: url(/static/EBGaramond-VariableFont_wght.ttf) format('woff2-variations'); + src: url(/sumcheck/static/EBGaramond-VariableFont_wght.ttf) format('woff2-variations'); font-style: normal; } @font-face { font-family: EBGaramond; - src: url(/static/EBGaramond-Italic-VariableFont_wght.ttf) format('woff2-variations'); + src: url(/sumcheck/static/EBGaramond-Italic-VariableFont_wght.ttf) format('woff2-variations'); font-style: italic; } @font-face { font-family: FiraMono; - src: url(/static/FiraMono-Regular.ttf); + src: url(/sumcheck/static/FiraMono-Regular.ttf); font-style: normal; } diff --git a/sumcheck.cabal b/sumcheck.cabal index 6c6495b..6e851cb 100644 --- a/sumcheck.cabal +++ b/sumcheck.cabal @@ -38,7 +38,11 @@ executable sumcheck-exe Paths_sumcheck hs-source-dirs: app - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -threaded -rtsopts -with-rtsopts=-N -static -Wall -O2 + cc-options: -static + extra-lib-dirs: + ./lib/ + ld-options: -static -pthread build-depends: base >=4.7 && <5 , bytestring -- cgit v1.2.3