update install Frama-C

html/get-frama-c.html

@@ -15,11 +15,12 @@ title: Get Frama-C
 
           <div class="OS codeTabs">
             <a href="index.html#" role="button" data-tab="linux"><b>Linux</b></a> <a href="index.html#" role="button" data-tab=
-            "mac"><b>Mac</b></a> <a href="index.html#" role="button" data-tab="windows"><b>Windows</b></a>
+            "mac"><b>Mac</b></a> <a href="index.html#" role="button" data-tab="windows"><b>Windows (WSL)</b></a>
           </div>
+		  <br>
 		  <a href="/html/framac-versions.html" class="previousVersion">Previous Versions</a>
           <div class="otherConfiguration">
-            If you have a different configuration, <a target="_blank" href="https://github.com/Frama-C" class="lineMove">click
+            If you have a different configuration, or for troubleshooting <a target="_blank" href="https://git.frama-c.com/pub/frama-c/blob/master/INSTALL.md" class="lineMove">click
             here</a>
           </div>
 
@@ -27,47 +28,46 @@ title: Get Frama-C
             <div>
               <div class="codeScreen">
                 <div class="codeTab tab-linux hide">
-                    <pre style='color:#000000;background:#f9f9f9;'>opam <span style='color:#400000;'>list</span> <span style='color:#808030;'>-</span>a         <span style='color:#696969;'># List the available packages</span></br>opam install lwt     <span style='color:#696969;'># Install LWT</span></br>opam <span style='color:#400000;'>update</span>          <span style='color:#696969;'># Update the package list...</span></br>opam upgrade         <span style='color:#696969;'># Upgrade the installed packages to their latest version</span></pre>
+                    <pre style='color:#000000;background:#f9f9f9;'>
+<span style='color:#696969;'># install Fram-C's dependencies</span>
+opam install depext
+opam depext frama-c
+
+<span style='color:#696969;'># install Frama-C</span>
+opam install frama-c</pre>
                 </div>
 
                 <div class="codeTab tab-mac hide">
                     <pre style='color:#000020;background:#f6f8ff;'>
-opam install depext
-opam depext frama<span style='color:#308080;'>-</span>c
+<span style='color:#595979;'># install required dependencies for Frama-C</span>
+brew install gmp gtk+ gtksourceview libgnomecanvas
 
-<span style='color:#595979;'># remove the previous version of frama-c</span>
-opam remove <span style='color:#308080;'>-</span><span style='color:#308080;'>-</span>force frama<span style=
-'color:#308080;'>-</span>c frama<span style='color:#308080;'>-</span>c<span style='color:#308080;'>-</span>base
+<span style='color:#595979;'># configure the graphical library</span>
+export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/lib/pkgconfig
 
-<span style='color:#595979;'># optional packages, but recommended (for efficiency, and for the GUI)</span>
-opam install depext
-opam depext zarith lablgtk conf<span style='color:#308080;'>-</span>gtksourceview conf<span style=
-'color:#308080;'>-</span>gnomecanvas
-opam install zarith lablgtk conf<span style='color:#308080;'>-</span>gtksourceview conf<span style=
-'color:#308080;'>-</span>gnomecanvas
+<span style='color:#595979;'># install recommended dependencies for Frama-C</span>
+brew install graphviz
 
-<span style='color:#595979;'># install custom version of frama-c</span>
-opam pin <span style='color:#400000;'>add</span> frama<span style='color:#308080;'>-</span>c<span style=
-'color:#308080;'>-</span>base &lt;dir&gt;
-</pre>
+<span style='color:#595979;'># install Frama-C</span>
+opam install frama-c</pre>
                 </div>
 
                 <div class="codeTab tab-windows hide">
 					<pre style='color:#d1d1d1;background:#000000;'>
-<span style='color:#9999a9;'># First you need to install OPAM</span>
-opam install frama<span style='color:#d2cd86;'>-</span>c
+<span style='color:#9999a9;'># to install OPAM</span>
+sudo add-apt-repository -y ppa:avsm/ppa
+sudo apt update
+sudo apt upgrade
+sudo apt install make m4 gcc opam
 
-<span style='color:#9999a9;'># To get the exact list of packages</span>
-opam install depext
-opam depext frama<span style='color:#d2cd86;'>-</span>c
+<span style='color:#9999a9;'># OPAM setup</span>
+opam init --disable-sandboxing -c 4.05.0 --shell-setup
+eval $(opam env)
+opam install -y depext
 
-<span style='color:#9999a9;'># optional packages, but recommended (for efficiency, and for the GUI)</span>
-opam install depext
-opam depext zarith lablgtk conf<span style='color:#d2cd86;'>-</span>gtksourceview conf<span style=
-'color:#d2cd86;'>-</span>gnomecanvas
-opam install zarith lablgtk conf<span style='color:#d2cd86;'>-</span>gtksourceview conf<span style=
-'color:#d2cd86;'>-</span>gnomecanvas
-</pre>
+<span style='color:#9999a9;'># install OPAM</span>
+opam depext --install -y lablgtk3 lablgtk3-sourceview3
+opam depext --install -y frama-c</pre>
                 </div>
               </div>
             </div>