[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg: Changes to 'xsf-docs'



 xsf-docs/howtos/build-mesa.mdwn |    8 +++++++-
 xsf-docs/mdwn2html              |   19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 9dcd41f5739a898632787bef2eaa49a890604584
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Feb 10 18:22:15 2011 +0100

    Add a link to the index, from all pages.

diff --git a/xsf-docs/mdwn2html b/xsf-docs/mdwn2html
index 6d9d7e2..95f3a16 100755
--- a/xsf-docs/mdwn2html
+++ b/xsf-docs/mdwn2html
@@ -17,8 +17,21 @@ if ! which markdown >/dev/null; then
     exit 1
 fi
 
+# Add a link back to the index:
+if [ "$mdwn" != "index.mdwn" ]; then
+    path=$(dirname $mdwn)/
+    if [ "$path" = "./" ]; then
+        path_to_root=./
+    else
+        path_to_root=$(echo $path|sed 's,[^/],,g;s,/,../,g')
+    fi
+    sed "s,^# ,# [XSF](${path_to_root}index.html) / ," $mdwn > $mdwn.tmp
+else
+    cp $mdwn $mdwn.tmp
+fi
+
 # Actual transformation:
-markdown $mdwn > $html.tmp
+markdown $mdwn.tmp > $html.tmp
 
 # Include html headers, include title:
 title=$(head -1 $html.tmp|sed -e 's,</\?h1>,,g')
@@ -44,5 +57,5 @@ cat >> $html <<EOF
 </html>
 EOF
 
-# Remove temporary file:
-rm -f $html.tmp
+# Remove temporary files:
+rm -f $mdwn.tmp $html.tmp

commit fe2f36ac4ca71c692dac216bfd72369edaed4fc6
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Feb 10 15:03:32 2011 +0100

    build-mesa: Mention disc space needs.

diff --git a/xsf-docs/howtos/build-mesa.mdwn b/xsf-docs/howtos/build-mesa.mdwn
index 6649954..dc49cd9 100644
--- a/xsf-docs/howtos/build-mesa.mdwn
+++ b/xsf-docs/howtos/build-mesa.mdwn
@@ -85,7 +85,9 @@ If you’re on `squeeze` you may need to install a few more packages:
 newer `libdrm-dev` (**FIXME:** talk about picking it from `wheezy`? or
 about a local installation?), as well as `libxmu-dev`, `libxi-dev`.
 
-Grab the upstream mesa sources:
+Make sure you have some disc space available, since the git repository
+is over 120MB, and since the mesa directory is over 500MB after a
+build. Once you’re ready, grab the upstream mesa sources:
 
     $ git clone git://anongit.freedesktop.org/mesa/mesa mesa.git
     $ cd mesa.git

commit f0bb89867fd858aeb026de55960dfd6464ef57b0
Author: Cyril Brulebois <kibi@debian.org>
Date:   Thu Feb 10 14:15:19 2011 +0100

    build-mesa: Mention the need for newer libraries on squeeze.

diff --git a/xsf-docs/howtos/build-mesa.mdwn b/xsf-docs/howtos/build-mesa.mdwn
index 7dac557..6649954 100644
--- a/xsf-docs/howtos/build-mesa.mdwn
+++ b/xsf-docs/howtos/build-mesa.mdwn
@@ -81,6 +81,10 @@ and `git`:
     $ sudo apt-get install build-essential git
     $ sudo apt-get build-dep mesa
 
+If you’re on `squeeze` you may need to install a few more packages:
+newer `libdrm-dev` (**FIXME:** talk about picking it from `wheezy`? or
+about a local installation?), as well as `libxmu-dev`, `libxi-dev`.
+
 Grab the upstream mesa sources:
 
     $ git clone git://anongit.freedesktop.org/mesa/mesa mesa.git


Reply to: