web: merge comparison page into the documentation one.

author: Adrien Nader <adrien@notk.org> 2015-01-15 10:37:09 +0100
committer: Adrien Nader <adrien@notk.org> 2015-01-15 10:37:09 +0100
commit: db53401974777f9e8cce4a38fee6d59565427ac8 (patch)
tree: bb6eebc8c142392457ea2d73cbd6bfa7c51f5341
parent: c8d9f7f736dba143124710793e8862b6548dbfc0 (diff)
3 files changed, 85 insertions, 96 deletions
diff --git a/web/comparison.php b/web/comparison.php
deleted file mode 100644
index 6e000ce..0000000
--- a/web/comparison.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<?php
-$page = 'comparison';
-$page_description = 'Differences and comparison with other toolchains and packaging systems.';
-$page_title = 'Comparison';
-include 'head.php';
-?>
-</head>
-
-<body>
-<?php include 'header.html'; ?>
-
-<h1>Comparison with other systems</h1>
-
-<p>
-There are several other environments based on
-<a href="http://mingw-w64.sourceforge.net">mingw-w64</a>. More than one being 
-universally better than others, they target different goals and use various 
-approaches. This page attempts to explain how they compare to Win-builds.
-</p>
-
-<p>
-The first usual difference is the release frequency and therefore the amount of 
-testing that can go in packages. The belief behind Win-builds is that it is 
-better to play it safe when targeting Windows and that there are already enough 
-bugs in the software world to not try to get even more by being bleeding-edge 
-at all costs (this doesn't mean settling for old software either).
-</p>
-
-<p>
-The second typical difference is that only Win-builds runs on both Windows and 
-Linux (and possibly others) with most of the files shared between platforms. 
-This should matter especially if you are using several systems during your 
-development.
-</p>
-
-<h2>Compared to <a href="http://cygwin.com">Cygwin</a></h2>
-<p>
-<a href="http://cygwin.com">Cygwin</a> is a POSIX-like environment which runs 
-on Windows and is installed through a package manager.
-</p>
-
-<p>
-It offers many packages but the executables are built against cygwin, i.e. they 
-use its POSIX compatibility layer which makes system function calls much slower 
-and has <a href="http://cygwin.com/licensing.html">licensing impacts</a>.
-</p>
-
-<p>
-However it includes compilation toolchains that target Windows directly and 
-which output won't use the POSIX layer.
-</p>
-
-<p>
-It is best to think of building Windows applications on Cygwin as a special 
-case of cross-compilation which can also run the applications that have been 
-cross-compiled. Cygwin provides a great platform for doing the build and 
-using many UNIX tools.
-</p>
-
-<p>
-Cygwin itself has very few packages with executables which don't use the POSIX 
-layer but Win-builds can be used to provide native libraries that your 
-application will use.
-</p>
-
-<h2>Compared to Fedora/RHEL/CentOS and OpenSuse</h2>
-<p>
-Packages in these Linux distributions have existed for several years. There are 
-many of them and they are well-maintained. It's possible to use the library 
-packages on another Linux distribution or on Windows but it's not trivial 
-either and will require a compatible toolchain.
-</p>
-
-<h2>Compared to <a href="http://mxe.cc">MXE</a></h2>
-<p>
-This is not a binary distribution but a set of build recipes which can be run 
-by invoking <code>make</code>. It has a larger set of recipes but builds only 
-static libraries which make updates more difficult and make it harder to comply 
-with licenses such as the LGPL. It also does not run on Windows. Since it 
-builds everything, it can take a long time to install.
-</p>
-
-<h2>Compared to Mingw-builds</h2>
-
-<p>
-TBD. Few notable differences: very bleeding-edge, many patches, only runs on 
-Windows.
-</p>
-
-<?php include 'footer.html'; ?>
-</body>
-</html>
diff --git a/web/documentation.php b/web/documentation.php
index 95831e5..3ec2f77 100644
--- a/web/documentation.php
+++ b/web/documentation.php
@@ -24,6 +24,14 @@ include 'head.php';
     </ul>
   </li>
   <li><a href="#win_builds_update">Updating from one win-builds release to another</a>
+  <li><a href="#comparison">Comparison with other systems and toolchain providers</a>
+    <ul>
+      <li><a href="#comparison__cygwin">Cygwin</a></li>
+      <li><a href="#comparison__fedora_opensuse">Fedora, RHEL, CentOS, OpenSuse and their derivatives</a></li>
+      <li><a href="#comparison__mxe">MXE</a></li>
+      <li><a href="#comparison__mingw_builds">Mingw-builds</a></li>
+    </ul>
+  </li>
   <li><a href="#known_limitations">Known limitations</a>
     <ul>
       <li><a href="#known_limitations__proxies">Proxies</a></li>
@@ -126,6 +134,83 @@ upper-left corner and replace <code>1.4.0</code> with <code>@@VERSION@@</code>
 in the URI.
 </p>
 
+<h1 id="comparison">Comparison with other systems</h1>
+
+<p>
+There are several other environments based on
+<a href="http://mingw-w64.sourceforge.net">mingw-w64</a>. More than one being 
+universally better than others, they target different goals and use various 
+approaches. This page attempts to explain how they compare to Win-builds.
+</p>
+
+<p>
+The first usual difference is the release frequency and therefore the amount of 
+testing that can go in packages. The belief behind Win-builds is that it is 
+better to play it safe when targeting Windows and that there are already enough 
+bugs in the software world to not try to get even more by being bleeding-edge 
+at all costs (this doesn't mean settling for old software either).
+</p>
+
+<p>
+The second typical difference is that only Win-builds runs on both Windows and 
+Linux (and possibly others) with most of the files shared between platforms. 
+This should matter especially if you are using several systems during your 
+development.
+</p>
+
+<h2 id="comparison__cygwin">Compared to <a href="http://cygwin.com">Cygwin</a></h2>
+<p>
+<a href="http://cygwin.com">Cygwin</a> is a POSIX-like environment which runs 
+on Windows and is installed through a package manager.
+</p>
+
+<p>
+It offers many packages but the executables are built against cygwin, i.e. they 
+use its POSIX compatibility layer which makes system function calls much slower 
+and has <a href="http://cygwin.com/licensing.html">licensing impacts</a>.
+</p>
+
+<p>
+However it includes compilation toolchains that target Windows directly and 
+which output won't use the POSIX layer.
+</p>
+
+<p>
+It is best to think of building Windows applications on Cygwin as a special 
+case of cross-compilation which can also run the applications that have been 
+cross-compiled. Cygwin provides a great platform for doing the build and 
+using many UNIX tools.
+</p>
+
+<p>
+Cygwin itself has very few packages with executables which don't use the POSIX 
+layer but Win-builds can be used to provide native libraries that your 
+application will use.
+</p>
+
+<h2 id="comparison__fedora_opensuse">Compared to Fedora/RHEL/CentOS and OpenSuse</h2>
+<p>
+Packages in these Linux distributions have existed for several years. There are 
+many of them and they are well-maintained. It's possible to use the library 
+packages on another Linux distribution or on Windows but it's not trivial 
+either and will require a compatible toolchain.
+</p>
+
+<h2 id ="comparison__mxe">Compared to <a href="http://mxe.cc">MXE</a></h2>
+<p>
+This is not a binary distribution but a set of build recipes which can be run 
+by invoking <code>make</code>. It has a larger set of recipes but builds only 
+static libraries which make updates more difficult and make it harder to comply 
+with licenses such as the LGPL. It also does not run on Windows. Since it 
+builds everything, it can take a long time to install.
+</p>
+
+<h2 id="comparison__mingw_builds">Compared to Mingw-builds</h2>
+
+<p>
+TBD. Few notable differences: very bleeding-edge, many patches, only runs on 
+Windows.
+</p>
 <h1 id="known_limitations">Known limitations</h1>
 
 <h2 id="known_limitations__proxies">Proxies</h2>
diff --git a/web/header.html b/web/header.html
index 7cdb2bc..d248516 100644
--- a/web/header.html
+++ b/web/header.html
@@ -5,7 +5,6 @@
       <div id="news" title="News"><a href="news.html">News</a></div>
       <div id="download" title="Download and Install"><a href="download.html">Download</a></div>
       <div id="documentation" title="Documentation"><a href="documentation.html">Documentation</a></div>
-      <div id="comparison" title="Differences and comparison with other systems"><a href="comparison.html">Comparison</a></div>
       <div id="packages" title="List of packages in Win-builds"><a href="packages.html">Packages</a></div>
       <div id="support" title="Get support"><a href="support.html">Support</a></div>
       <div id="source" title="Get the sources"><a href="http://cgit.notk.org/gitolite/win-builds/">Source</a></div>
author	Adrien Nader <adrien@notk.org>	2015-01-15 10:37:09 +0100
committer	Adrien Nader <adrien@notk.org>	2015-01-15 10:37:09 +0100
commit	db53401974777f9e8cce4a38fee6d59565427ac8 (patch)
tree	bb6eebc8c142392457ea2d73cbd6bfa7c51f5341
parent	c8d9f7f736dba143124710793e8862b6548dbfc0 (diff)