From be10f54eec53ab5426c570dd2500c4e3c34e976d Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 27 Mar 2006 10:10:50 +0000 Subject: Various changes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9279 a1c6a512-1295-4272-9138-f99709370657 --- www/Makefile | 1 + www/bugs.t | 4 +- www/cvs.t | 137 ++++++--------------------------------------------- www/daily.t | 6 +++ www/dailymod.pl | 12 +++-- www/digest/Makefile | 14 +++--- www/docs/color_t.jpg | Bin 0 -> 1405 bytes www/docs/features.t | 8 +++ www/docs/nano_t.jpg | Bin 1360 -> 1297 bytes www/head.t | 13 +++-- www/rockbox.pm | 64 ++++++++++++++++++++++++ www/sh-win/index.t | 75 +--------------------------- www/style.css | 11 +++-- 13 files changed, 128 insertions(+), 217 deletions(-) create mode 100644 www/docs/color_t.jpg create mode 100644 www/rockbox.pm (limited to 'www') 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 @@

Rules for bug reporting:

    +
  1. Do not report bugs for unreleased code (i.e. Iriver at the moment). Use the mailing list or IRC to discuss such development.
  2. Check that the bug hasn't already been fixed! Try the latest daily build.
  3. Check that the bug hasn't already been reported
  4. Do not add "I have the same problem" to an existing bug report if you aren't absolutely certain that it really is the same problem
  5. Always include the following information in your bug report:
      -
    • Which exact model Archos you have (as printed on the unit) -
    • Which exact ROM firmware version you have +
    • Which exact music player model you have (as printed on the unit)
    • Which exact Rockbox version you are using (Menu->Version)
    • A link to the data that malfunctions, if applicable (IMPORTANT!)
    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" -

    Browsing the repository

    +

    Number of compiler warnings the build generates. 0 +(zero) means no warnings. The timestamp is GMT. Target +Status -

    Just go here. - -

    Daily snapshots

    - -

    Every night at 6am CET, we build a source tarball and target .mod files -from the latest CVS code. Get them here. - -

    Downloading (checking out) the source

    - -

    You, obviously, need to have CVS -installed to do this. - -

    Here is a complete list of the available modules: - -

      -
    • apps - the source code to the applications -
    • firmware - the source code to the firmware library -
    • gdb - the gdb stub to use for remote debugging -
    • tools - tools for building the firmware -
    • uisimulator - a user interface simulator for X11 -
    • docs - project documentation -
    • www - the web page -
    - -

    We have a few other convenient aliases that gets several -modules at once for you: - -

      -
    • rockbox - gets everything you need to compile and build rockbox for target -
    • rockbox-devel - like 'rockbox' but also includes simulators and gdb code -
    • rockbox-all - gets everything there is in CVS, all modules -
    • website - gets the www and docs modules -
    - -

    The examples below use the 'rockbox' module, since that is what most -people are interested in. - -

    Anonymous read-only checkout

    - -

    If you are not a registered developer, use this method. -When asked for a password, just press enter: - -

    cvs -d:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox login -
    cvs -z3 -d:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox co rockbox     - -

    A "rockbox" directory will be created in your current directory, and all -the directories and source files go there. - -

    Checkout with write access (for developers)

    - -

    For this, you need to be added to the writers list by Rockbox administrators. After that, you can login with your username: - -

    cvs -d:pserver:username@rockbox.haxx.se:/cvsroot/rockbox login -
    cvs -z3 -d:pserver:username@rockbox.haxx.se:/cvsroot/rockbox co rockbox     - -

    Checking in modifications

    - -

    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: - -

    cvs commit filename - -

    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: - -

    cvs commit -m "This is my change comment" filename - -

    Note: 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. - -

    Updating your repository

    - -

    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": - -

    cvs update -dP - -

    The -d switch tells update to create any new directories that have been created the repository since last update. -
    The -P switch tells update to delete files that have been removed in the repository. - -

    Adding a new file

    - -

    Adding a file is very simple: - -

    cvs add filename - -

    If you are adding a binary file, you need to specify the -kb flag: - -

    cvs add -kb filename - -

    These changes, like any other change, has to be committed before they will be visible on the server. - -

    Querying the status of your files

    - -

    Sometimes it is interesting to get a list of the status of your files versus -those on the remote repository. This is called "status": - -

    cvs status - -

    The output from "status" can be rather verbose. You may want to filter it with grep: - -

    cvs status | grep Status - -

    To only list files who differ from the server, filter again: - -

    cvs status | grep Status | grep -v Up-to-date +

    + -

    Producing a diff of your changes

    + +

    Bleeding edge builds

    -

    If you want to see how your local files differ from the CVS repository, -you can ask CVS to show you: +

    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). -

    cvs diff -u [files(s)] +

    These are complete installation archives. -

    The -u selects the "unified" diff format, which is preferrable -when working with source code. + -

    What Happens in the Repository?

    -

    - Subscribe to the rockbox-cvs list to get mails sent to you for every commit - done to the repostory.

    - To join this list, send a mail to majordomo@cool.haxx.se, with the following - text in the body (no subject) "subscribe rockbox-cvs". -

    - Note that this may cause quite a few mails to get sent during periods -of intense development. +How to use CVS. + +

    #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

    CVS Compile Status

    +#if 1 +The CVS builds are now here in its own page. +#else

    CVS code build status: number of compiler warnings the build generates. 0 (zero) means no warnings. The timestamp is GMT. Target @@ -46,9 +49,12 @@ every source change. (See status on the first line in the above table). iriver h300 iPod Color iPod Nano +iPod 4G Gray +iPod Video source

    How to use CVS. +#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] .= "$show\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 "latest", + printf "latest", } print "

    older\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 Binary files /dev/null and b/www/docs/color_t.jpg differ 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 +

    + Moved here: + www.rockbox.org/twiki/bin/view/Main/FeatureComparison + +#if 0 +

    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

    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 Binary files a/www/docs/nano_t.jpg and b/www/docs/nano_t.jpg differ 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 @@
    - Rockbox Logo 
    +

    Rockbox Logo

    home
    @@ -38,13 +38,14 @@ IRC
    forums
    daily builds
    -feature requests
    -bug reports
    -patches
    +CVS builds
    +feature requests
    +bug reports
    +patches

    -
    +
    @@ -52,8 +53,6 @@

    Bandwidth and server
    sponsored by:
    Contactor Data AB Logo -

    SourceForge.net Logo -

    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() { + $_ =~ s:^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 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 DISABLE_GAMES = - 1 </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 -- cgit