[Kos-cvs] kos-web/contents doc-projet_fr.i, 1.1.1.1, 1.2 snapshots.i, 1.2, 1.3 snapshots_bin_en.i, 1.8, 1.9 snapshots_bin_fr.i, 1.8, 1.9 snapshots_doc_fr.i, 1.5, 1.6 snapshots_src_fr.i, 1.7, 1.8

thomas at kos.enix.org thomas at kos.enix.org
Thu Dec 30 01:22:42 CET 2004


Update of /var/cvs/kos/kos-web/contents
In directory the-doors:/tmp/cvs-serv13742/contents

Modified Files:
	doc-projet_fr.i snapshots.i snapshots_bin_en.i 
	snapshots_bin_fr.i snapshots_doc_fr.i snapshots_src_fr.i 
Log Message:
Snapshots

Index: doc-projet_fr.i
===================================================================
RCS file: /var/cvs/kos/kos-web/contents/doc-projet_fr.i,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- doc-projet_fr.i	8 Oct 2001 17:38:21 -0000	1.1.1.1
+++ doc-projet_fr.i	30 Dec 2004 00:22:40 -0000	1.2
@@ -3,7 +3,9 @@
 		      "kos-doc");
 ?>
 
-La documentation du projet est mise à jour quotidiennement, elle est disponible sur la page des <? make_link("snapshots.php", "[Snapshosts]");  ?>
+<p>La documentation du projet est mise à jour quotidiennement, elle
+est disponible sur la page des <? make_link("snapshots.php",
+"[Snapshosts]"); ?></p>
 
 <?
 end_content_section();

Index: snapshots_src_fr.i
===================================================================
RCS file: /var/cvs/kos/kos-web/contents/snapshots_src_fr.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- snapshots_src_fr.i	1 Jan 2004 14:09:04 -0000	1.7
+++ snapshots_src_fr.i	30 Dec 2004 00:22:40 -0000	1.8
@@ -2,9 +2,8 @@
 start_content_section("Sources KOS et documentation","pkg");
 ?>
 
-<ul>
-  <li>Module <a href="/cgi/cvsweb/kos/?cvsroot=kos">kos</a>
-  (chargeur/éditeur de liens, modules qui forment le noyau) :
+<h2>Module <a href="/cgi/cvsweb/kos/?cvsroot=kos">kos</a>
+  (chargeur/éditeur de liens, modules qui forment le noyau)</h2>
 
   <ul>
     <li>
@@ -26,12 +25,10 @@
     <? make_snapshot_link("kos_current/deps.html","Graphes de dépendances"); ?>
     </li>
   </ul>
-  </li>
 
-  <p>
+<h2>Module <a href="/cgi/cvsweb/kos-sys/?cvsroot=kos">kos-sys</a>
+  (applications utilisateur, libc basique)</h2>
 
-  <li>Module <a href="/cgi/cvsweb/kos-sys/?cvsroot=kos">kos-sys</a>
-  (applications utilisateur, libc basique) :
   <ul>
     <li>
     <? make_snapshot_link("kos-sys_current/","Arborescence complète"); ?>
@@ -47,10 +44,8 @@
     (au format CR/LF DOS).
     </li>
   </ul>
-  </li>
 
-  <p>
-  <li>Module <a href="/cgi/cvsweb/kos-doc/?cvsroot=kos">kos-doc</A> :
+<h2>Module <a href="/cgi/cvsweb/kos-doc/?cvsroot=kos">kos-doc</a></h2>
 
     <ul>
     <li>
@@ -67,8 +62,6 @@
     (au format CR/LF DOS).
     </li>
   </UL>
-  </LI>
-</UL>
 
 <?
 end_content_section();

Index: snapshots_doc_fr.i
===================================================================
RCS file: /var/cvs/kos/kos-web/contents/snapshots_doc_fr.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- snapshots_doc_fr.i	30 Jul 2002 07:37:00 -0000	1.5
+++ snapshots_doc_fr.i	30 Dec 2004 00:22:40 -0000	1.6
@@ -1,28 +1,9 @@
 <?
 start_content_section("Documentation de KOS","doc");
 
-$i = 0;
-
 include("$topsrcdir/contents/snapshots.i");
 
-/* Beginning of docs snapshots */
-echo "<table width=\"100%\" cellpading=0 cellspacing=0>";
-
-/* Special kind of snapshots */
-echo "<tr>";
-echo "<td width=\"50%\">";
-make_snapshot_link("kos-doc_current/overview/S-kos00.jpg.html",
-	  "Présentation de KOS");
-echo "</td><td>";
-echo "[<img src=\"$topsrcdir/images/en.jpg\" alt=\"en\" border=0>]";
-echo "</td><td>";
-echo "<font size=-2>";
-make_snapshot_link("kos-doc_current/overview/kos.ps","[PS]");
-echo "&nbsp;&nbsp;";
-make_snapshot_link("kos-doc_current/overview/kos.ps.gz","[PS.GZ]");
-echo "&nbsp;&nbsp;";
-echo "</font>";
-echo "</td></tr>";
+en_put_doc("Présentation de KOS", "kos-doc_current/overview/kos", "ps ps.gz");
 
 fr_put_doc("Présentation du projet (objectifs et organisation)",
 	   "kos-doc_current/kos-projet-presentation");
@@ -38,16 +19,9 @@
 	   "kos_current/doc/k/k_language");
 
 /* Special kind of snapshots */
-echo "<tr><td width=\"50%\">";
-echo "Modélisation de la VM de KOS";
-echo "</td><td></td><td>";
-echo "<font size=-2>";
-make_snapshot_link("kos_current/doc/vm_model.dia","[DIA]");
-echo "&nbsp;&nbsp;";
-make_snapshot_link("kos_current/doc/vm_model.eps","[EPS]");
-echo "&nbsp;&nbsp;";
-make_snapshot_link("kos_current/doc/vm_model.pdf","[PDF]");
-echo "</font></td></tr>";
+
+fr_put_doc("Modélisation de la VM de KOS",
+	"kos_current/doc/vm_model", "dia eps pdf");
 
 fr_put_doc("Piles CPL0  dans KOS",
 	   "kos_current/doc/kstack");
@@ -66,8 +40,6 @@
 en_put_doc("Dynamic kernel stack expansion on x86",
 	   "kos-doc_current/dynamic_stack");
 
-echo "</table>";
-
 end_content_section();
 
 ?>

Index: snapshots.i
===================================================================
RCS file: /var/cvs/kos/kos-web/contents/snapshots.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- snapshots.i	5 Nov 2001 13:39:12 -0000	1.2
+++ snapshots.i	30 Dec 2004 00:22:40 -0000	1.3
@@ -3,45 +3,67 @@
 function make_snapshot_link($url,$text)
 {
   $snapshots_url = "http://kos.enix.org/~d2/snapshots";
-  echo "<a href=\"$snapshots_url/$url\">$text</a>";
+  echo "<a href=\"$snapshots_url/$url\">$text</a> ";
 }
 
 
-function put_doc($lang,$title,$base_url)
+function put_doc($lang,$title,$base_url,$formats)
 {
   global $topsrcdir;
 
+  echo "<h2>\n";
 
-  echo "<tr><td width=\"50%\">";
-  make_snapshot_link("$base_url-html/",$title);
-  echo "</td><td>";
-  echo "[<img src=\"$topsrcdir/images/$lang.jpg\" 
-                alt=\"$lang\" 
-                border=0>]\n";
-  echo "</td><td>";
-  echo "<font size=-2>\n";
-  make_snapshot_link("$base_url-html.tgz", "[GZIPPED HTML TAR ARCHIVE]");
-  echo "&nbsp;&nbsp;";
-  make_snapshot_link("$base_url.dvi","[DVI]");
-  echo "&nbsp;&nbsp;";
-  make_snapshot_link("$base_url.ps.gz","[PS.GZ]");
-  echo "&nbsp;&nbsp;";
-  make_snapshot_link("$base_url.ps","[PS]");
-  echo "&nbsp;&nbsp;";
-  make_snapshot_link("$base_url.pdf.gz","[GZIPPED PDF]");
-  echo "&nbsp;&nbsp;";
-  make_snapshot_link("$base_url.pdf","[PDF]");
-  echo "</font></td></tr>";
+  echo "<img src=\"$topsrcdir/images/$lang.jpg\"
+                alt=\"$lang\"/>&nbsp;";
+
+  echo $title;
+
+  echo "</h2>\n";
+
+  echo "<p>";
+
+  $formattab = explode(" ", $formats);
+
+
+  foreach($formattab as $format)
+    {
+      if($format == "html") {
+	make_snapshot_link("$base_url-html/","[HTML]");
+      }
+      else if($format == "html.tgz") {
+	make_snapshot_link("$base_url-html.tgz", "[GZIPPED HTML TAR ARCHIVE]");
+      }
+      else if($format == "ps") {
+	make_snapshot_link("$base_url.ps","[PS]");
+      }
+      else if($format == "ps.gz") {
+	make_snapshot_link("$base_url.ps.gz","[GZIPPED PS]");
+      }
+      else if($format == "pdf") {
+	make_snapshot_link("$base_url.pdf","[PDF]");
+      }
+      else if($format == "pdf.gz") {
+	make_snapshot_link("$base_url.pdf.gz","[GZIPPED PDF]");
+      }
+      else if($format == "dia") {
+	make_snapshot_link("$base_url.dia","[DIA]");
+      }
+      else if($format == "eps") {
+	make_snapshot_link("$base_url.eps","[EPS]");
+      }
+    }
+
+  echo "</p>\n";
 }
 
-function fr_put_doc($title,$base_url)
+function fr_put_doc($title,$base_url,$format="html html.tgz ps.gz ps pdf.gz pdf")
 {
-  put_doc("fr",$title,$base_url);
+  put_doc("fr",$title,$base_url,$format);
 }
 
-function en_put_doc($title,$base_url)
+function en_put_doc($title,$base_url,$format="html html.tgz ps.gz ps pdf.gz pdf")
 {
-  put_doc("en",$title,$base_url);
+  put_doc("en",$title,$base_url,$format);
 }
 
 ?>
\ No newline at end of file

Index: snapshots_bin_fr.i
===================================================================
RCS file: /var/cvs/kos/kos-web/contents/snapshots_bin_fr.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- snapshots_bin_fr.i	31 Dec 2003 13:12:30 -0000	1.8
+++ snapshots_bin_fr.i	30 Dec 2004 00:22:40 -0000	1.9
@@ -2,36 +2,40 @@
 start_content_section("Distribution binaire","bin");
 ?>
 
-<UL>
-<LI><b>Module kos :</b>
-  <? make_snapshot_link("kos_current/grub/fd.img","Image disquette");
-  ?> (1.44M) Egalement disponible <?
-  make_snapshot_link("kos_current/grub/kos-144M.gz","au format gzip");
-  ?> (environ 200k), ou <?
-  make_snapshot_link("kos_current/grub/kos-144M.zip","au format
-  (pk)zip"); ?> (environ 200k).  Utiliser rawrite/rawrite2 sous win32
-  pour en faire une disquette bootable, ou dd ou cp sous Unix ;<br>
-  Pour les utilisateurs expérimentés de grub, téléchargez le <? make_snapshot_link("kos_current/loader/loader.elf","loader"); ?>, le  <? make_snapshot_link("kos_current/modules/kos.a","noyau"); ?>, et le fichier <? make_snapshot_link("kos_current/grub/menu.txt","menu.txt"); ?> (modifiez les options au kernel si besoin : cf ci-dessous).
-</LI>
+<h2>Module kos</h2>
 
-<li><b>Module kos-sys :</b>
-  <br>
-  Pour tester avec un émulateur 80486/Pentium
-  (bochs/plex86/VMWare/...) : récupérer l'image de disque dur <?
-  make_snapshot_link("kos-sys_current/hd10M.img.gz","compressée au
-  format gzip"); ?> ou <?
-  make_snapshot_link("kos-sys_current/hd10M.zip","compressée au format
-  (pk)zip"); ?> (environ 15k).
-  <br>
-  Pour tester sur un vrai disque : copier <?
-  make_snapshot_link("kos-sys_current/apps/test","cette
-  application de test"); ?> sur votre disque dur (disque IDE,
-  partition FAT, répertoire <tt>/bin/</tt>) et modifiez l'option
-  passée par Grub au kernel (par défaut :
-  <tt>wolfgang:root="/dev/part/hda0",init="/bin/console"</tt>) si besoin.
-</li>
+<p><? make_snapshot_link("kos_current/grub/fd.img","Image disquette");
+?> (1.44M) Egalement disponible <?
+make_snapshot_link("kos_current/grub/kos-144M.gz","au format gzip");
+?> (environ 200k), ou <?
+make_snapshot_link("kos_current/grub/kos-144M.zip","au format
+(pk)zip"); ?> (environ 200k).  Utiliser rawrite/rawrite2 sous win32
+pour en faire une disquette bootable, ou dd ou cp sous Unix ;</p>
 
-</UL>
+<p>Pour les utilisateurs expérimentés de grub, téléchargez le <?
+make_snapshot_link("kos_current/loader/loader.elf","loader"); ?>, le
+<? make_snapshot_link("kos_current/modules/kos.a","noyau"); ?>, et le
+fichier <?
+make_snapshot_link("kos_current/grub/menu.txt","menu.txt"); ?>
+(modifiez les options au kernel si besoin : cf ci-dessous).</p>
+
+<h2>Module kos-sys</h2>
+
+<p>Pour tester avec un émulateur 80486/Pentium (<a
+href="http://bochs.sf.net">Bochs</a>/<a
+href="http://bellard.org/qemu">Qemu</a>/VMWare/...) : récupérer
+l'image de disque dur <?
+make_snapshot_link("kos-sys_current/hd10M.img.gz","compressée au
+format gzip"); ?> ou <?
+make_snapshot_link("kos-sys_current/hd10M.zip","compressée au format
+(pk)zip"); ?> (environ 15k).</p>
+
+<p>Pour tester sur un vrai disque : copier <?
+make_snapshot_link("kos-sys_current/apps/test","cette application de
+test"); ?> sur votre disque dur (disque IDE, partition FAT, répertoire
+<tt>/bin/</tt>) et modifiez l'option passée par Grub au kernel (par
+défaut : <tt>wolfgang:root="/dev/part/hda0",init="/bin/console"</tt>)
+si besoin.</p>
 
 
 <?

Index: snapshots_bin_en.i
===================================================================
RCS file: /var/cvs/kos/kos-web/contents/snapshots_bin_en.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- snapshots_bin_en.i	31 Dec 2003 13:12:30 -0000	1.8
+++ snapshots_bin_en.i	30 Dec 2004 00:22:40 -0000	1.9
@@ -2,41 +2,40 @@
 start_content_section("Binary distribution","bin");
 ?>
 
-<UL>
-<LI><b>kos module binaries:</b>
-  <? make_snapshot_link("kos_current/grub/fd.img","Floppy disk
-  image"); ?> (1.44M).  Also available in <?
-  make_snapshot_link("kos_current/grub/kos-144M.gz","gzip format"); ?>
-  (about 200k), or <?
-  make_snapshot_link("kos_current/grub/kos-144M.zip","(pk)zip
-  format"); ?> (about 200k). Use rawrite/rawrite2 under win32 in order
-  to make a boot diskette, or dd or cp under Unix.<br>
-  For the Grub advanced users, get the <?
-  make_snapshot_link("kos_current/loader/loader.elf","loader"); ?>,
-  the <? make_snapshot_link("kos_current/modules/kos.a","kernel"); ?>,
-  and the <?
-  make_snapshot_link("kos_current/grub/menu.txt","menu.txt"); ?>
-  (update the kernel options if needed: see below).
-</LI>
+<h2>kos module binaries</h2>
 
-<li><b>kos-sys module binaries:</b>
-  <br>
-  To test with an x86 emulator (eg bochs/plex86/VMWare): download the
-  10M hard disk image <?
-  make_snapshot_link("kos-sys_current/hd10M.img.gz","gzipped"); ?> or
-  <? make_snapshot_link("kos-sys_current/hd10M.zip","(pk)zipped"); ?>
-  (about 15k).
-  <br>
-  To test on a real hard disk: copy <?
-  make_snapshot_link("kos-sys_current/apps/test","this test
-  application"); ?> on your disk (IDE disk, FAT partition, in the
-  <tt>/bin/</tt> subdirectory) and update the option passed to
-  the kernel by Grub
-  (<tt>wolfgang:root="/dev/part/hda0",init="/bin/console"</tt> by
-  default) if needed.
-</li>
+<p> <? make_snapshot_link("kos_current/grub/fd.img","Floppy disk
+image"); ?> (1.44M).  Also available in <?
+make_snapshot_link("kos_current/grub/kos-144M.gz","gzip format"); ?>
+(about 200k), or <?
+make_snapshot_link("kos_current/grub/kos-144M.zip","(pk)zip format");
+?> (about 200k). Use rawrite/rawrite2 under win32 in order to make a
+boot diskette, or dd or cp under Unix.</p>
+
+<p>For the Grub advanced users, get the <?
+make_snapshot_link("kos_current/loader/loader.elf","loader"); ?>, the
+<? make_snapshot_link("kos_current/modules/kos.a","kernel"); ?>, and
+the <?  make_snapshot_link("kos_current/grub/menu.txt","menu.txt"); ?>
+(update the kernel options if needed: see below).</p>
+
+<h2>kos-sys module binaries</h2>
+
+<p>To test with an x86 emulator (<a
+href="http://bochs.sf.net">Bochs</a>/<a
+href="http://bellard.org/qemu">Qemu</a>/VMWare/...) : download the 10M
+hard disk image <?
+make_snapshot_link("kos-sys_current/hd10M.img.gz","gzipped"); ?> or <?
+make_snapshot_link("kos-sys_current/hd10M.zip","(pk)zipped"); ?>
+(about 15k).</p>
+
+<p>To test on a real hard disk: copy <?
+make_snapshot_link("kos-sys_current/apps/test","this test
+application"); ?> on your disk (IDE disk, FAT partition, in the
+<tt>/bin/</tt> subdirectory) and update the option passed to the
+kernel by Grub
+(<tt>wolfgang:root="/dev/part/hda0",init="/bin/console"</tt> by
+default) if needed.</p>
 
-</UL>
 
 <?
  end_content_section();



More information about the Kos-cvs mailing list