claferwiki 0.3.5.1 → 0.3.6
raw patch · 4 files changed
+24/−16 lines, 4 filesdep ~MissingHdep ~SHAdep ~clafer
Dependency ranges changed: MissingH, SHA, clafer, network
Files
- Makefile +6/−1
- README.md +11/−8
- claferwiki.cabal +6/−6
- claferwiki.sh +1/−1
Makefile view
@@ -1,7 +1,12 @@ all: - cabal install + cabal build +init: + cabal sandbox init --sandbox=../.clafertools-cabal-sandbox + cabal install --only-dependencies + install: + cabal install @if test ! -d ".git"; then \ cp -f -r .git $(to); \ fi
README.md view
@@ -1,7 +1,7 @@ Clafer Wiki =========== -v0.3.5.1.1 +v0.3.6 **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. @@ -18,8 +18,8 @@ Contributors ------------ +* [Michał Antkiewicz](http://gsd.uwaterloo.ca/mantkiew), Main developer. Requirements, development, architecture, testing, technology transfer. * Chris Walker, co-op student May-Aug, 2012. Developer of Clafer Wiki, HTML and GraphViz generators. -* [Michał Antkiewicz](http://gsd.uwaterloo.ca/mantkiew), Requirements, development, architecture, testing, technology transfer. * [Jimmy Liang](http://gsd.uwaterloo.ca/jliang), Clafer compiler support, including multi-fragment compilation, source/AST/IR traceability, parsing and compilation error reporting. Getting the Clafer Wiki @@ -31,8 +31,9 @@ Regardless of the installation method, the following are required: -* [Clafer compiler](https://github.com/gsdlab/clafer/) v0.3.5.1. +* [Clafer compiler](https://github.com/gsdlab/clafer/) v0.3.6. * [The Haskell Platform](http://hackage.haskell.org/platform) v2013.2.0.0. + * Cabal >= 1.18 * alternatively, GHC v7.6.3. * [Git](http://git-scm.com) * [Gitit wiki](http://gitit.net) v0.10.3.1. @@ -41,16 +42,18 @@ 1. `cabal update` 2. `cabal install claferwiki` -3. `cd <cabal's lib or share folder>/claferwiki-0.3.5.1` (`lib` on Windows or `share` on Linux and Mac) +3. `cd <cabal's lib or share folder>` (`C:\Users\<user>\AppData\Roaming\cabal\i386-windows-ghc-7.6.3\claferwiki-0.3.6` on Windows or `.cabal/share/x86_64-linux-ghc-7.6.3/claferwiki-0.3.6/` on Linux) * execute `make install to=<target directory>` - * this will copy the wiki files and `cabal install` the package `claferwiki` + * this will copy the wiki files ### Installation from source code 1. In some `<source directory>` where you want to have the wiki source code * execute `git clone git://github.com/gsdlab/claferwiki.git` -2. execute `cabal install` -3. execute `make install to=<target directory>` +2. execute `cabal update` +3. execute `make init` +4. execute `make` +5. execute `make install to=<target directory>` * this will copy the wiki files ### Important: Branches must correspond @@ -132,7 +135,7 @@ ========== * See [language's website](http://clafer.org) for news, technical reports and more * Check out a [Clafer tutorial](http://t3-necsis.cs.uwaterloo.ca:8091/Tutorial/Intro) - * Try a live instance of [ClaferWiki](http://t3-necsis.cs.uwaterloo.ca:8091) + * Try a live instance of [ClaferWiki](http://t3-necsis.cs.uwaterloo.ca:8091) which contains a repository of models for various applications * Try a live instance of [ClaferIDE](http://t3-necsis.cs.uwaterloo.ca:8094) * Try a live instance of [ClaferConfigurator](http://t3-necsis.cs.uwaterloo.ca:8093) * Try a live instance of [ClaferMooVisualizer](http://t3-necsis.cs.uwaterloo.ca:8092)
claferwiki.cabal view
@@ -1,5 +1,5 @@ Name: claferwiki -version: 0.3.5.1 +version: 0.3.6 stability: experimental author: Michał Antkiewicz, Chris Walker, Luke Michael Brown maintainer: Michał Antkiewicz <mantkiew@gsd.uwaterloo.ca> @@ -7,7 +7,7 @@ description: A wiki-based IDE for literate modeling with Clafer. A Plugin for the Gitit wiki which collects code blocks written in Clafer (.clafer), compiles them, renders into HTML and Dot, and replaces the code blocks with the results. homepage: http://github.com/gsdlab/claferwiki category: Wiki -cabal-version: >= 1.16 +cabal-version: >= 1.18 build-type: Simple copyright: Michał Antkiewicz, Chris Walker, Luke Michael Brown license: MIT @@ -31,7 +31,7 @@ base >= 4.6.0.1 && < 5, containers >= 0.5.0.0, directory >= 1.2.0.1, - network >= 2.4.0.0, + network >= 2.4.1.2, process >= 1.1.0.2, time >= 1.4.0.1, split >= 0.2.2, @@ -39,13 +39,13 @@ mtl >= 2.1.2, transformers >= 0.3.0.0, - MissingH >= 1.2.0.2, - SHA >= 1.6.1, + MissingH >= 1.2.1.0, + SHA >= 1.6.4, utf8-string >= 0.3.7, pandoc-types == 1.10.*, gitit >= 0.10.3.1, - clafer == 0.3.5.1 + clafer == 0.3.6 hs-source-dirs: src ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-orphans exposed-modules:
claferwiki.sh view
@@ -1,5 +1,5 @@ echo "-----------------------------------------" -echo "| ClaferWiki v0.3.5.1 |" +echo "| ClaferWiki v0.3.6 |" echo "| https://github.com/gsdlab/claferwiki/ |" echo "| By Michal Antkiewicz, Chris Walker |" echo "| Generative Software Development Lab |"