Various changes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9279 a1c6a512-1295-4272-9138-f99709370657

13 files changed, 128 insertions, 217 deletions

diff --git a/www/Makefile b/www/Makefile
index 49350c99ab..6bda6917ee 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -3,6 +3,7 @@ ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -Uunix -H -C -V -
 SRC := $(wildcard *.t)
 SOBJS := daily.shtml main.shtml index.shtml status.shtml \
 	bugs.shtml requests.shtml patches.shtml cvs.shtml
+
 OBJS := $(SRC:%.t=%.html) $(SOBJS)
 
 .SUFFIXES: .t .html
diff --git a/www/bugs.t b/www/bugs.t
index 100c76e56d..313f7acc08 100644
--- a/www/bugs.t
+++ b/www/bugs.t
@@ -9,13 +9,13 @@
 <h3>Rules for bug reporting:</h3>
 
 <ol>
+<li> Do not report bugs for unreleased code (i.e. Iriver at the moment). Use the <a href="/mail/">mailing list</a> or <a href="/irc/">IRC</a> to discuss such development.
 <li> Check that the bug hasn't already been fixed! Try the latest <a href="/daily.shtml">daily build</a>.
 <li> Check that the bug hasn't already been reported
 <li> Do not add "I have the same problem" to an existing bug report if you aren't <b>absolutely certain</b> that it really is the same problem
 <li> Always include the following information in your bug report:
   <ul>
-  <li> Which exact model Archos you have (as printed on the unit)
-  <li> Which exact ROM firmware version you have
+  <li> Which exact music player model you have (as printed on the unit)
   <li> Which exact Rockbox version you are using (Menu->Version)
   <li> A link to the data that malfunctions, if applicable (IMPORTANT!)
   </ul>
diff --git a/www/cvs.t b/www/cvs.t
index db73a8ea76..09370abf5c 100644
--- a/www/cvs.t
+++ b/www/cvs.t
@@ -1,132 +1,27 @@
-#define _PAGE_ Accessing source code via CVS
+#define _PAGE_ CVS Builds
 #include "head.t"
 
-<h2>Browsing the repository</h2>
+<p>Number of compiler warnings the build generates. 0
+(zero) means no warnings. The timestamp is GMT. <a
+href="http://www.rockbox.org/twiki/bin/view/Main/TargetStatus">Target
+Status</a>
 
-<p>Just go <a href="/viewcvs.cgi/">here</a>.
-
-<h2>Daily snapshots</h2>
-
-<p>Every night at 6am CET, we build a source tarball and target .mod files
-from the latest CVS code.  <a href="daily.shtml">Get them here</a>.
-
-<h2>Downloading (checking out) the source</h2>
-
-<p>You, obviously, need to have <a href="http://www.cvshome.org">CVS</a>
-installed to do this.
-
-<p>Here is a complete list of the available modules:
-
-<ul>
-<li>apps - the source code to the applications
-<li>firmware - the source code to the firmware library
-<li>gdb - the gdb stub to use for remote debugging
-<li>tools - tools for building the firmware
-<li>uisimulator - a user interface simulator for X11
-<li>docs - project documentation
-<li>www - the web page
-</ul>
-
-<p>We have a few other convenient aliases that gets several
-modules at once for you:
-
-<ul>
-<li> rockbox - gets everything you need to compile and build rockbox for target
-<li> rockbox-devel - like 'rockbox' but also includes simulators and gdb code
-<li> rockbox-all - gets everything there is in CVS, all modules
-<li> website - gets the www and docs modules
-</ul>
-
-<p>The examples below use the 'rockbox' module, since that is what most
-people are interested in. 
-
-<h3>Anonymous read-only checkout</h3>
-
-<p>If you are not a registered developer, use this method.
-When asked for a password, just press enter:
-
-<p><tt>cvs -d:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox login
-<br>cvs -z3 -d:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox co rockbox</tt>
-
-<p>A "rockbox" directory will be created in your current directory, and all
-the directories and source files go there.
-
-<h3>Checkout with write access (for developers)</h3>
-
-<p>For this, you need to be added to the writers list by Rockbox administrators. After that, you can login with your username:
-
-<p><tt>cvs -d:pserver:<b>username</b>@rockbox.haxx.se:/cvsroot/rockbox login
-<br>cvs -z3 -d:pserver:<b>username</b>@rockbox.haxx.se:/cvsroot/rockbox co rockbox</tt>
-
-<h2>Checking in modifications</h2>
-
-<p>CVS is a "no-reserve" version control system. This means that you work on your local files without first reserving them. Any conflicts with other developers are detected when you check-in, or "commit" as it's called in CVS:
-
-<p><tt>cvs commit <b>filename</b></tt>
-
-<p>This will start an editor and ask you to describe the changes you've made. If you want, you can use the -m command line option to specify the comment right there:
-
-<p><tt>cvs commit -m "This is my change comment" <b>filename</b></tt>
-
-<p><strong>Note:</strong> Before checking in modifications, test-build all targets (player, player-old, recorder, player-sim, recorder-sim) to make sure your changes don't break anything.
-
-<h2>Updating your repository</h2>
-
-<p>Since several people commit to the repository, you will need to periodically
-synchronize your local files with the changes made by others.
-This operation is called "update":
-
-<p><tt>cvs update -dP</tt>
-
-<p>The <b>-d</b> switch tells update to create any new directories that have been created the repository since last update.
-<br>The <b>-P</b> switch tells update to delete files that have been removed in the repository.
-
-<h2>Adding a new file</h2>
-
-<p>Adding a file is very simple:
-
-<p><tt>cvs add <b>filename</b></tt>
-
-<p>If you are adding a binary file, you need to specify the -kb flag:
-
-<p><tt>cvs add -kb <b>filename</b></tt>
-
-<p>These changes, like any other change, has to be committed before they will be visible on the server.
-
-<h2>Querying the status of your files</h2>
-
-<p>Sometimes it is interesting to get a list of the status of your files versus
-those on the remote repository. This is called "status":
-
-<p><tt>cvs status</tt>
-
-<p>The output from "status" can be rather verbose. You may want to filter it with grep:
-
-<p><tt>cvs status | grep Status</tt>
-
-<p>To only list files who differ from the server, filter again:
-
-<p><tt>cvs status | grep Status | grep -v Up-to-date</tt>
+<p>
+<!--#include virtual="distbuild.link" -->
 
-<h2>Producing a diff of your changes</h2>
+<a name="bleeding_edge"></a>
+<h2>Bleeding edge builds</h2>
 
-<p>If you want to see how your local files differ from the CVS repository,
-you can ask CVS to show you:
+<p>These builds are as "bleeding edge" as you can get. They are updated on
+every source change. (See status on the first line in the above table).
 
-<p><tt>cvs diff -u [files(s)]</tt>
+<p>These are complete installation archives.
 
-<p>The <tt>-u</tt> selects the "unified" diff format, which is preferrable
-when working with source code.
+<!--#exec cmd="./bleedmod.pl" -->
 
-<h2>What Happens in the Repository?</h2>
-<p>
- Subscribe to the rockbox-cvs list to get mails sent to you for every commit
- done to the repostory.
 <p>
- To join this list, send a mail to majordomo@cool.haxx.se, with the following
- text in the body (no subject) "subscribe rockbox-cvs".
-<p>
- <b>Note</b> that this may cause quite a few mails to get sent during periods
-of intense development.
+<a href="/twiki/bin/view/Main/UsingCVS">How to use CVS</a>.
+
+<hr>
 
 #include "foot.t"
diff --git a/www/daily.t b/www/daily.t
index 6245ba1e07..22136d5f51 100644
--- a/www/daily.t
+++ b/www/daily.t
@@ -16,6 +16,9 @@ href="/twiki/bin/view/Main/DeviceChart">identify your model</a>
 
 <h2>CVS Compile Status</h2>
 
+#if 1
+The CVS builds are now <a href="cvs.shtml">here</a> in its <a href="cvs.shtml">own page</a>.
+#else
 <p>CVS code build status: number of compiler warnings the build generates. 0
 (zero) means no warnings. The timestamp is GMT. <a
 href="http://www.rockbox.org/twiki/bin/view/Main/TargetStatus">Target
@@ -46,9 +49,12 @@ every source change. (See status on the first line in the above table).
 <a href="auto/build-h300/rockbox.zip">iriver h300</a>
 <a href="auto/build-ipodcolor/rockbox.zip">iPod Color</a>
 <a href="auto/build-ipodnano/rockbox.zip">iPod Nano</a>
+<a href="auto/build-ipod4gray/rockbox.zip">iPod 4G Gray</a>
+<a href="auto/build-ipodvideo/rockbox.zip">iPod Video</a>
 <a href="auto/build-source/rockbox-bleeding.tar.gz">source</a>
 
 <p>
 <a href="/twiki/bin/view/Main/UsingCVS">How to use CVS</a>.
+#endif
 
 #include "foot.t"
diff --git a/www/dailymod.pl b/www/dailymod.pl
index 9e3d118ba2..8e1a48d281 100755
--- a/www/dailymod.pl
+++ b/www/dailymod.pl
@@ -9,10 +9,14 @@ my @list=("player",
           "fmrecorder", "fmrecorder8mb",
           "recorderv2",
           "ondiofm", "ondiosp",
-          "h100", "h120", "h300", "ipodcolor", "ipodnano",
+          "h100", "h120", "h300",
+
+          "ipodcolor", "ipodnano", "ipod4gray", "ipodvideo",
+          "ipod3g", "iaudiox5",
 
           # install and source are special cases
-          "install", "source");
+          #"install",
+          "source");
 
 for(@list) {
     my $dir = $_;
@@ -47,7 +51,7 @@ for(reverse sort keys %date) {
         my $show = $t;
         $show =~ s/recorder/rec/;
         # Remove the comment below to get long names
-        # $show = $longname{$t};
+        $show = $longname{$t};
         $head[$x] .= "<th>$show</th>\n";
 	$count++;
 	if ($count == $split) {
@@ -69,7 +73,7 @@ for(reverse sort keys %date) {
             $file = "Rockbox-${d}-install.exe";
         }
         if( -f "$basedir/$m/$file") {
-            printf "<a href=\"/daily/$_/$file\">latest</a>",
+            printf "<a href=\"http://download.rockbox.org/daily/$_/$file\">latest</a>",
         }
         print "<p><a href=\"/dl.cgi?bin=$_\">older</a></td>\n";
 
diff --git a/www/digest/Makefile b/www/digest/Makefile
index 61b18cd3c4..904815c667 100644
--- a/www/digest/Makefile
+++ b/www/digest/Makefile
@@ -1,6 +1,5 @@
 ACTION=@echo preprocessing $@; \
-  rm -f $@; \
-  fcpp -WWW -I.. -Uunix -H -C -V -LL >$@
+  fcpp -WWW -I.. -Uunix -H -C -V -LL $< $@
 
 SRC := $(wildcard *.t)
 OBJS := $(SRC:%.t=%.html)
@@ -8,15 +7,16 @@ OBJS := $(SRC:%.t=%.html)
 all: $(OBJS) digest.rss digest.mail
 
 digest.html: digest.t news.t digesthead.t log.t
-	$(ACTION) $<
+	$(ACTION)
+
+index.html: index.t ../head.t news.t ../foot.t
 
 %.html : %.t news.t digesthead.t log.t
-	$(ACTION) $<
+	$(ACTION)
 
 digest.mail: mail.t log.t mailify.pl
-	echo mailifying $@;
-	rm -f $@;
-	fcpp -WWW -DMAKE_MAIL -Uunix -P -H -C -V -LL >digest.temp $<
+	@echo mailifying $@;
+	fcpp -WWW -DMAKE_MAIL -Uunix -P -H -C -V -LL $< digest.temp
 	./mailify.pl < digest.temp > digest.mail
 
 digest.rss: digest.t digesthead.t log.raw
diff --git a/www/docs/color_t.jpg b/www/docs/color_t.jpg
new file mode 100644
index 0000000000..d6689b6df3
--- /dev/null
+++ b/www/docs/color_t.jpg
diff --git a/www/docs/features.t b/www/docs/features.t
index d098a428b5..77c8e92d6b 100644
--- a/www/docs/features.t
+++ b/www/docs/features.t
@@ -15,6 +15,12 @@
 #define UNKNOWN TD ? ETD
 #define NA TD N/A ETD
 
+<p>
+ Moved here:
+ <a href="http://www.rockbox.org/twiki/bin/view/Main/FeatureComparison">www.rockbox.org/twiki/bin/view/Main/FeatureComparison</a>
+
+#if 0
+
 <p> This chart compares Rockbox with the original firmwares as shipped by the
  manufacturers of the players. The Rockbox column may specify features only
  available in CVS and daily builds.
@@ -346,4 +352,6 @@ EFEAT
 <p>
  Wrong facts? Mail rockbox@cool.haxx.se now!
 
+#endif
+
 #include "foot.t"
diff --git a/www/docs/nano_t.jpg b/www/docs/nano_t.jpg
index 7bcda333a7..2dcf3caaf0 100644
--- a/www/docs/nano_t.jpg
+++ b/www/docs/nano_t.jpg
diff --git a/www/head.t b/www/head.t
index 343559c99b..4ecdda4c49 100644
--- a/www/head.t
+++ b/www/head.t
@@ -27,7 +27,7 @@
 <tr valign="top">
 <td bgcolor=MENUBG valign="top">
 <br>
-&nbsp;<a href="/"><img src="/rockbox100.png" width=99 height=30 border=0 alt="Rockbox Logo"></a>&nbsp;<br>
+<div align="center"><a href="/"><img src="/rockbox100.png" width=99 height=30 border=0 alt="Rockbox Logo"></a>
 
 <p align="right">
 <a class="menulink" href="/">home</a><br>
@@ -38,13 +38,14 @@
 <a class="menulink" href="/irc/">IRC</a><br>
 <a class="menulink" href="http://forums.rockbox.org">forums</a><br>
 <a class="menulink" href="/daily.shtml">daily builds</a><br>
-<a class="menulink" href="/requests.shtml">feature&nbsp;requests</a><br>
-<a class="menulink" href="/bugs.shtml">bug reports</a><br>
-<a class="menulink" href="/patches.shtml">patches</a><br>
+<a class="menulink" href="/cvs.shtml">CVS builds</a><br>
+<a class="menulink" href="/tracker/index.php?type=1">feature&nbsp;requests</a><br>
+<a class="menulink" href="/tracker/index.php?type=2">bug reports</a><br>
+<a class="menulink" href="/tracker/index.php?type=4">patches</a><br>
 
 <div align="right">
 <form action="http://www.google.com/search">
-<input name=as_q size=12><br>
+<input name=as_q size=10><br>
 <input value="Search" type=submit>
 <input type=hidden name=as_sitesearch value="www.rockbox.org">
 </form>
@@ -52,8 +53,6 @@
 <p class=menutext>Bandwidth and server<br>sponsored by:<br>
 <a href="http://www.contactor.se"><img border=0 src="/cont.png" width=101 height=36 alt="Contactor Data AB Logo"></a>
 
-<p><a href="http://sourceforge.net/projects/rockbox/"><img src="/sf_logo.png" width="88" height="31" border="0" alt="SourceForge.net Logo"></a>
-
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_xclick">
 <input type="hidden" name="business" value="bjorn@haxx.se">
diff --git a/www/rockbox.pm b/www/rockbox.pm
new file mode 100644
index 0000000000..56895e13bc
--- /dev/null
+++ b/www/rockbox.pm
@@ -0,0 +1,64 @@
+
+# short name to image mapping
+%model=("player" => "/docs/newplayer_t.jpg",
+        "recorder" => "/docs/recorder_t.jpg",
+        "fmrecorder" => "/docs/fmrecorder_t.jpg",
+        "recorderv2" => "/docs/fmrecorder_t.jpg", 
+        "recorder8mb" => "/docs/recorder_t.jpg",
+        "fmrecorder8mb" => "/docs/fmrecorder_t.jpg",
+        'ondiosp' => "/docs/ondiosp_t.jpg",
+        'ondiofm' => "/docs/ondiofm_t.jpg",
+        'h100' => "/docs/h100_t.jpg",
+        'h120' => "/docs/h100_t.jpg",
+        'h300' => "/docs/h300-60x80.jpg",
+        'ipodcolor' => "/docs/color_t.jpg",
+        'ipodnano' => "/docs/nano_t.jpg",
+        'ipod4gray' => "/docs/ipod4g2pp_t.jpg",
+        'ipodvideo' => "/docs/ipodvideo_t.jpg",
+        'ipod3g' => "/docs/ipod4g2pp_t.jpg",
+        'iaudiox5' => "/docs/iaudiox5_t.jpg",
+        "install" => "/docs/install.png",
+        "source" => "/rockbox100.png");
+
+# short name to long name mapping
+%longname=("player" => "Archos Player/Studio",
+           "recorder" => "Archos Recorder v1",
+           "fmrecorder" => "Archos FM Recorder",
+           "recorderv2" => "Archos Recorder v2", 
+           "recorder8mb" => "Archos Recorder 8MB",
+           "fmrecorder8mb" => "Archos FM Recorder 8MB",
+           'ondiosp' => "Archos Ondio SP",
+           'ondiofm' => "Archos Ondio FM",
+           'h100' => "iriver H100",
+           'h120' => "iriver H120",
+           'h300' => 'iriver H300',
+           'ipodcolor' => 'iPod color/Photo',
+           'ipodnano' => 'iPod Nano',
+           'ipod4gray' => 'iPod 4G Grayscale',
+           'ipodvideo' => 'iPod Video',
+           'ipod3g' => 'iPod 3G',
+           'iaudiox5' => 'iAudio X5',
+           "install" => "Windows Installer",
+           "source" => "Source Archive");
+
+sub header {
+    my ($t) = @_;
+    print "Content-Type: text/html\n\n";
+    open (HEAD, "/home/bjst/rockbox_html/head.html");
+    while(<HEAD>) {
+        $_ =~ s:^<title>Rockbox<\/title>:<title>$t<\/title>:;
+        $_ =~ s:^<h1>_PAGE_<\/h1>:<h1>$t<\/h1>:;
+        print $_;
+    }
+    close(HEAD);
+}
+
+sub footer {
+    open (FOOT, "/home/bjst/rockbox_html/foot.html");
+    while(<FOOT>) {
+        print $_;
+    }
+    close(FOOT);
+}
+
+1;
diff --git a/www/sh-win/index.t b/www/sh-win/index.t
index c92330b62f..c6f91ff011 100644
--- a/www/sh-win/index.t
+++ b/www/sh-win/index.t
@@ -1,78 +1,7 @@
 #define _PAGE_ Setting up the GNUSH compiler for Windows
 #include "head.t"
 
-<P>by <A href="mailto:edx@codeforce.d2g.com">Felix Arends</A>, 1/8/2002
-    <BR>
-</P>
-<P>I have spent a long time figuring out how to compile SH1 code in windows (using 
-    the sh-elf-gcc compiler) and when I finally compiled the first OS for my 
-    Jukebox I decided to write a little tutorial explaining the setup process.
-</P>
-<H2>The GNU-SH Tool Chain for Windows</H2>
-This is actually all you need to download. It includes the binutils, gcc and 
-newlib. Download the GNUSH Tool Chain for ELF format (35 MB).
-<P>
-    The GNUSH website can be found at <A href="http://www.kpit.com/download/downloadgnushv0203.htm">
-        http://www.kpit.com/download/downloadgnushv0203.htm</A> (source code is 
-    also available there). Get the "GNUSH v0203 Tool Chain for ELF format". <b>Note: </b>
-    The GNUSH v0204 Tool Chain has a bug which causes problems when compiling 
-    Rockbox!
-</P>
-<H2>Perl</H2>
-<p>
-Download Perl for Windows from <a href="http://www.activestate.com/Products/ActivePerl/">
-    http://www.activestate.com/Products/ActivePerl/</a>.
-</p>
-<H2>Setting up&nbsp;the Compiler</H2>
-<P>Install the GNUSH Tool Chain (nothing you really have to care about during the 
-    installation process).</P>
-<P>
-    <H2>Compiling the latest Rockbox Source
-    </H2>
-<P>Use CVS to download the latest source code of Rockbox (the firmware and apps 
-    modules). In addition, you need to copy a win32 compilation of scramble.exe and 
-    convbdf.exe into the tools dir. The pre-compiled scramble.exe can be downloaded <A href="http://rockbox.haxx.se/sh-win/scramble.exe">
-        here</A>. The pre-compiled convbdf.exe can be downloaded <A href="http://rockbox.haxx.se/fonts/convbdf.exe">
-        here</A>. From your start menu, open the "SH-ELF tool chain" batch file 
-    inside the GNU-SH v0203 program folder. You should end up seeing a command 
-    prompt. Go to the apps directory and type:</P>
-<P>
-    <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="1">
-        <TBODY>
-            <TR>
-                <TD>Command</TD>
-                <TD>Description</TD>
-            </TR>
-            <TR>
-                <TD>make -f win32.mak<BR>
-                    make -f win32.mak RECORDER = 1</TD>
-                <TD vAlign="top">build for recorder target</TD>
-            </TR>
-            <TR>
-                <TD>make -f win32.mak PLAYER</TD>
-                <TD>build for player target</TD>
-            </TR>
-            <TR>
-                <TD>make -f win32.mak PLAYER_OLD</TD>
-                <TD>build for old player target</TD>
-            </TR>
-            <TR>
-                <TD>make -f win32.mak RECORDER=1 DISABLE_GAMES=1</TD>
-                <TD>build for recorder target, disable games</TD>
-            </TR>
-            <TR>
-                <TD vAlign="top">make -f win32.mak RECORDER=1 PROPFONTS=1</TD>
-                <TD>build for recorder target, enable propfonts</TD>
-            </TR>
-            <TR>
-                <TD vAlign="top">make -f win32.mak RECORDER=1 PROPFONTS=1&nbsp;DISABLE_GAMES = 
-                    1&nbsp;</TD>
-                <TD>build for recorder target, disable games, use propfonts</TD>
-            </TR>
-        </TBODY></TABLE>
- </P>
- <P>I hope this tutorial helped you to compile an Archos firmware with Windows. If 
- you have any questions, comments or corrections, please mail to <A href="mailto:felix.arends@gmx.de">
- felix.arends@gmx.de</A>
+This page has been removed. Use
+<a href="http://www.rockbox.org/twiki/bin/view/Main/CygwinDevelopment">http://www.rockbox.org/twiki/bin/view/Main/CygwinDevelopment</a>
 
 #include "foot.t"
diff --git a/www/style.css b/www/style.css
index 8daab6fa6a..35add1ba48 100644
--- a/www/style.css
+++ b/www/style.css
@@ -33,7 +33,6 @@ BODY, P, DIV, TD, TH, TR, FORM, OL, UL, LI, INPUT, TEXTAREA, SELECT
  text-decoration:  none;
  font-family:      sans-serif;
  font-style:       normal;
-# font-size:        95%;
  font-size:        13px;
 }
 
@@ -54,7 +53,7 @@ pre {
 }
 
 .bgbox {
- left-border-width: 1px;
+ border-left: 1px;
  border-color: #000000;
 }
 
@@ -151,7 +150,7 @@ td.fgood {
 }
 
 td.fbad {
- background-color: #f0c0c0;
+ background-color: #f0a0a0;
 }
 
 td.toolscat {
@@ -209,3 +208,9 @@ td.toolscat {
 .blink:hover {
  text-decoration: underline;
 }
+
+.devcon {
+  color: #ff0;
+  font-weight: bold;
+  font-size: 10px; 
+}
\ No newline at end of file