Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#11966 - Use separate modelnames and config files for RaaA

Attached to Project: Rockbox
Opened by Dave Chapman (linuxstb) - Friday, 25 February 2011, 00:11 GMT+2
Last edited by Dave Chapman (linuxstb) - Sunday, 27 February 2011, 12:38 GMT+2
Task Type Patches
Category Build environment
Status Closed
Assigned To Dave Chapman (linuxstb)
Player Type Generic RaaA
Severity Low
Priority Normal
Reported Version Release 3.7.1
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

This patch is a continuation of r29286 to make RaaA builds more similar to regular targets.

It changes tools/configure to use a unique "modelname" for each target, instead of them all being called "application". It also splits the config/application.h file into separate files for each target, with the same name as $modelname.

tools/buildzip.pl checked for ($modelname eq 'application') so this has been changed to pass a --app parameter instead. When this is set to "yes", then buildzip.pl should behave the same as when $modelname was set to "application".

However, there seems to be a bug in my changes to buildzip.pl - "make zip" for an android build now fails, with wpsbuild.pl (called from buildzip.pl) trying to create a "/.rockbox" directory. I haven't had time to fix this yet - help welcome.

NOTE: Due to SVN not dealing with my use of "svn cp", you need to do the following before applying this patch:

cp firmware/export/config/application.h firmware/export/config/android.h
cp firmware/export/config/application.h firmware/export/config/nokian900.h
cp firmware/export/config/application.h firmware/export/config/nokian8xx.h
cp firmware/export/config/application.h firmware/export/config/sdlapp.h
   raaa-modelnames-v1.diff (20.3 KiB) 
 tools/configure                      |   45 ++++++------
 tools/buildzip.pl                    |   10 +-
 tools/root.make                      |   16 ++--
 apps/apps.make                       |    3 
 firmware/export/config.h             |   16 +++-
 firmware/export/config/android.h     |   26 -------
 firmware/export/config/nokian900.h   |   33 ---------
 firmware/export/config/nokian8xx.h   |   33 ---------
 firmware/export/config/application.h |  124 -----------------------------------
 firmware/export/config/sdlapp.h      |   25 -------
 uisimulator/uisimulator.make         |    2 
 11 files changed, 58 insertions(+), 275 deletions(-)

This task depends upon

Closed by  Dave Chapman (linuxstb)
Sunday, 27 February 2011, 12:38 GMT+2
Reason for closing:  Accepted
Additional comments about closing:  Committed as r29418
Comment by Dave Chapman (linuxstb) - Friday, 25 February 2011, 09:36 GMT+2
Patch updated to r29236
   raaa-modelnames-v2.diff (21.5 KiB) 
 tools/configure                      |   45 ++++++------
 tools/buildzip.pl                    |   10 +-
 tools/root.make                      |   16 ++--
 apps/apps.make                       |    3 
 firmware/export/config.h             |   16 +++-
 firmware/export/config/android.h     |   34 ---------
 firmware/export/config/nokian900.h   |   36 ---------
 firmware/export/config/nokian8xx.h   |   40 +---------
 firmware/export/config/application.h |  129 -----------------------------------
 firmware/export/config/sdlapp.h      |   32 --------
 uisimulator/uisimulator.make         |    2 
 11 files changed, 61 insertions(+), 302 deletions(-)

Comment by Dave Chapman (linuxstb) - Saturday, 26 February 2011, 00:27 GMT+2
I've tracked down the bug with buildzip.pl. It is caused by the line in current SVN which defines $app to be "($modelname eq "application"). This turns out to only be true for the *install: targets in root.make, as the other targets (e.g. zip) add backslashes to the modelname, meaning it contains the value "\"application\"". The attached patch fixes this by explicitly checking for $install when stripping the leading / - the only place outside the make_install() function where $app is checked.

   raaa-modelnames-v3.diff (21.4 KiB) 
 tools/configure                      |   45 ++++++------
 tools/buildzip.pl                    |    8 +-
 tools/root.make                      |   16 ++--
 apps/apps.make                       |    3 
 firmware/export/config.h             |   16 +++-
 firmware/export/config/android.h     |   34 ---------
 firmware/export/config/nokian900.h   |   36 ---------
 firmware/export/config/nokian8xx.h   |   40 +---------
 firmware/export/config/application.h |  129 -----------------------------------
 firmware/export/config/sdlapp.h      |   32 --------
 uisimulator/uisimulator.make         |    2 
 11 files changed, 59 insertions(+), 302 deletions(-)

Loading...