claferwiki 0.4.2.1 → 0.4.3
raw patch · 7 files changed
+21/−22 lines, 7 filesdep ~clafer
Dependency ranges changed: clafer
Files
- CHANGES.md +4/−0
- Makefile +1/−0
- README.md +6/−6
- claferwiki.cabal +4/−2
- claferwiki.sh +3/−12
- stack.yaml +2/−2
- templates/footer.st +1/−0
CHANGES.md view
@@ -1,3 +1,7 @@+* claferwiki Version 0.4.3 released on Dec 22, 2015 + +[Release](https://github.com/gsdlab/claferwiki/pull/14) + * claferwiki Version 0.4.2.1 released on Oct 20, 2015 Updated to clafer 0.4.2.1, added stack instructions to README.
Makefile view
@@ -3,6 +3,7 @@ install: stack install + stack install gitit @if test ! -d ".git"; then \ cp -f -r .git $(to); \ fi
README.md view
@@ -1,6 +1,6 @@ # Claferwiki -v0.4.2.1 +##### v0.4.3 **Claferwiki** is a wiki system integrated with [Clafer compiler](https://github.com/gsdlab/clafer). [Clafer](http://clafer.org) is a lightweight yet powerful structural modeling language. Claferwiki allows for embedding Clafer model fragments in wiki pages and provides model authoring support including code highlighting, parse and semantic error reporting, hyperlinking from identifier use to its definition, and graphical view rendering. @@ -35,7 +35,7 @@ Regardless of the installation method, the following are required: -* [Clafer compiler](https://github.com/gsdlab/clafer/) v0.4.2.1 +* [Clafer compiler](https://github.com/gsdlab/clafer/) v0.4.3 * [GHC](https://www.haskell.org/downloads) v7.10.* * [Git](http://git-scm.com) * [Gitit wiki](http://gitit.net) v0.12.0.1 @@ -43,7 +43,7 @@ ### Installation from Hackage -Claferwiki is now available on [Hackage](http://hackage.haskell.org/package/claferwiki-0.4.2.1/) and it can be installed using either [`stack`](https://github.com/commercialhaskell/stack) or [`cabal-install`](https://hackage.haskell.org/package/cabal-install). +Claferwiki is now available on [Hackage](http://hackage.haskell.org/package/claferwiki-0.4.3/) and it can be installed using either [`stack`](https://github.com/commercialhaskell/stack) or [`cabal-install`](https://hackage.haskell.org/package/cabal-install). #### Installation using `stack` @@ -55,12 +55,12 @@ #### Installation using `cabal-install` 1. `cabal update` -2. `cabal install claferwiki-0.4.2.1 -fhighlighting -fhttps -fplugins -fnetwork-uri` -3. `cd <cabal's lib or share folder>` (`C:\Users\<user>\AppData\Roaming\cabal\i386-windows-ghc-7.10.2\claferwiki-0.4.2.1` on Windows or `.cabal/share/x86_64-linux-ghc-7.10.2/claferwiki-0.4.2.1/` on Linux) +2. `cabal install claferwiki-0.4.3 -fhighlighting -fhttps -fplugins -fnetwork-uri` +3. `cd <cabal's lib or share folder>` (`C:\Users\<user>\AppData\Roaming\cabal\i386-windows-ghc-7.10.2\claferwiki-0.4.3` on Windows or `.cabal/share/x86_64-linux-ghc-7.10.2/claferwiki-0.4.3/` on Linux) * execute `make install to=<target directory>` * this will copy the wiki files -### Important: Branches must correspond +### Important: branches must correspond All related projects are following the *simultaneous release model*. The branch `master` contains releases, whereas the branch `develop` contains code under development.
claferwiki.cabal view
@@ -1,5 +1,5 @@ Name: claferwiki -version: 0.4.2.1 +version: 0.4.3 stability: experimental author: Michał Antkiewicz, Chris Walker, Luke Michael Brown maintainer: Michał Antkiewicz <mantkiew@gsd.uwaterloo.ca> @@ -16,6 +16,7 @@ , GHC == 7.8.4 , GHC == 7.10.1 , GHC == 7.10.2 + , GHC == 7.10.3 data-files: claferwiki.sh , gitit.cnf , Makefile @@ -24,6 +25,7 @@ , static/img/logo.png , static/css/clafer.css , static/css/custom.css + , templates/footer.st , stack.yaml source-repository head type: git @@ -49,7 +51,7 @@ , gitit >= 0.12.0.1 , transformers-compat >= 0.3 && < 0.5 - , clafer == 0.4.2.1 + , clafer == 0.4.3 hs-source-dirs: src ghc-options: -Wall -fno-warn-orphans exposed-modules: Network.Gitit.Plugin.ClaferWiki
claferwiki.sh view
@@ -1,21 +1,12 @@ echo "-----------------------------------------" -echo "| ClaferWiki v0.4.2.1 |" +echo "| ClaferWiki v0.4.3 |" echo "| https://github.com/gsdlab/claferwiki/ |" echo "| By Michal Antkiewicz, Chris Walker |" echo "| Generative Software Development Lab |" -echo "| Using `clafer -V` |" +echo "| Using `clafer -V` |" echo "-----------------------------------------" echo "" echo "Starting gitit..." echo "" -if [ "$1" == "--sandbox" ]; then - if [ -z "$2" ]; then - cabal sandbox init --sandbox=../.clafertools-cabal-sandbox - else - cabal sandbox init --sandbox=$2 - fi - cabal exec gitit -- -f gitit.cnf -else - gitit -f gitit.cnf -fi +stack exec gitit -- -f gitit.cnf
stack.yaml view
@@ -6,9 +6,10 @@ , recaptcha-0.1.0.3 , uri-0.1.6.3 , sendfile-0.7.9 + , clafer-0.4.3 ] -resolver: lts-3.10 +resolver: lts-3.19 flags: sendfile: @@ -20,5 +21,4 @@ highlighting: true packages: -- '../clafer' - '.'
@@ -0,0 +1,1 @@+<div id="footer">powered by <a href="http://github.com/jgm/gitit/tree/master/">gitit-0.12.0.1</a> and <a href="https://github.com/gsdlab/clafer">clafer-0.4.3</a></div>