diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d08800990da4e9a6767f929469e3a44d1bb1dc0..67f04df9fa11022846d6186d5f5ba5f2bf907b9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,12 +34,13 @@ test: stage: test script: - bundle exec jekyll build -d test --future + - ./download_doc.sh test artifacts: paths: - test expire_in: 1 month except: - - master + - colibri tags: - docker @@ -54,7 +55,7 @@ check-css: - if [ $(grep "PurifyCSS" del-classes.o | wc -l) = 0 ]; then echo "No CSS to clean"; else cat del-classes.o; exit 1; fi; allow_failure: true except: - - master + - colibri tags: - docker @@ -62,15 +63,12 @@ pages: stage: deploy script: - JEKYLL_ENV="production" bundle exec jekyll build -d public --future - - wget -O farith2_doc.tar.gz "https://git.frama-c.com/pub/colibrics/-/jobs/artifacts/master/raw/farith2_doc.tar.gz?job=generate-static:%20[4.12.0]" - - mkdir -p public/html/doc/ - - tar -C public/html/doc/ -xf farith2_doc.tar.gz - - mv public/html/doc/farith2 public/html/doc/farith + - ./download_doc.sh public artifacts: paths: - public expire_in: 1 month only: - - master + - colibri tags: - docker diff --git a/_fc-plugins/farith.md b/_fc-plugins/farith.md index b8ec4235ea2162bb0924fe715df77fa3cfae1b31..bb37ef26c2251041a831afb73cb3bdf3f25278c1 100644 --- a/_fc-plugins/farith.md +++ b/_fc-plugins/farith.md @@ -6,8 +6,7 @@ description: key: main distrib_mode: main priority: 0 -manual_pdf: /download/farith-manual.pdf -manual_html: /html/doc/farith/coq/index.html +manual_html: /html/doc/farith/doc/F.All.html --- ## Farith diff --git a/download.html b/download.html index 1054a4bf61a5b915f2be4ff8e01cbe061f2f5c8f..9b2bc6447c02e00b2da534ec2861b0d48b7279ae 100644 --- a/download.html +++ b/download.html @@ -3,10 +3,12 @@ Get Frama-C - + -

Redirect to Get Frama-C

+

Redirect + to Get + Colibri tools

- \ No newline at end of file + diff --git a/download_doc.sh b/download_doc.sh new file mode 100755 index 0000000000000000000000000000000000000000..96d3d10c6b9e980ff061810eea296dec562fd224 --- /dev/null +++ b/download_doc.sh @@ -0,0 +1,11 @@ +#!/bin/sh -eux + +ROOT=$1 + +wget -O farith2_doc.tar.gz "https://git.frama-c.com/pub/colibrics/-/jobs/artifacts/master/raw/farith2_doc.tar.gz?job=generate-static:%20[4.12.0]" + +mkdir -p $ROOT/html/doc/ + +tar -C $ROOT/html/doc/ -xf farith2_doc.tar.gz + +mv $ROOT/html/doc/farith2 $ROOT/html/doc/farith diff --git a/html/get-frama-c.html b/html/get-frama-c.html index beda85311d7a071963d289a71c41ac0b80316e7c..aba7af9b258695164249ff5387bfcc69363a3104 100644 --- a/html/get-frama-c.html +++ b/html/get-frama-c.html @@ -1,8 +1,8 @@ --- layout: default css: get-framac -title: Get Frama-C -description: Download and install the Frama-C analysis platform now! +title: Get Colibri tools +description: Download and install Colibri, Colibri2, Colibrics --- @@ -14,7 +14,7 @@ description: Download and install the Frama-C analysis platform now!
-

Choose for which OS you want Frama-C

+

Choose for which OS you want Colibri2

Linux Mac Windows (WSL) @@ -29,29 +29,29 @@ description: Download and install the Frama-C analysis platform now! sudo apt install opam # or dnf, pacman, etc. -# 2. Install Frama-C's dependencies +# 2. Install Colibri2's dependencies opam install depext -opam depext frama-c +opam depext colibri2
-# 3. Install Frama-C itself -opam install frama-c +# 4. Install Colibri2 itself +opam install colibri2 
 # 1. Install Homebrew
 
-# 2. Install required dependencies for Frama-C
-brew install opam gmp gtk+ gtksourceview libgnomecanvas
+# 2. Install required dependencies for Colibri2
+brew install opam gmp gtk+
 
 # 3. Configure GTK library
 export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/lib/pkgconfig
 
-# 4. Install recommended dependencies for Frama-C
-brew install graphviz zmq
+
+
 
-# 5. Finally install Frama-C
-opam install frama-c
+# 4. Finally install colibri2 +opam install colibri2
@@ -66,33 +66,22 @@ opam init --disable-sandboxing --shell-setup eval $(opam env) opam install -y depext -# 3. Install graphical dependencies -opam depext --install -y lablgtk3 lablgtk3-sourceview3 + + -# 4. Install Frama-C -opam depext --install -y frama-c +# 4. Install Colibri2 +opam depext --install -y colibri2
-
- For detailed installation instructions, click here -
All Frama-C releases are available from this page -
- {% if site.fc-versions.last.beta %} -
- The beta version of the next Frama-C release is available here -
- {% endif %}

Downloads

-

Frama-C and ACSL

+

Colibri2

@@ -107,6 +96,13 @@ opam depext --install -y frama-c {% endif %} + {% if plugin.manual_html %} +
  • + + {% if plugin.short %}{{ plugin.short }}{% else %}{{ plugin.title }}{% endif %} manual + +
    • + {% endif %} {% endfor %}