Rockbox

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

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#9363 - WPS editor build cleanup

Attached to Project: Rockbox
Opened by Maurus Cuelenaere (mcuelenaere) - Thursday, 04 September 2008, 02:22 GMT+2
Last edited by Maurus Cuelenaere (mcuelenaere) - Thursday, 04 September 2008, 16:50 GMT+2
Task Type Patches
Category Themes
Status Closed
Assigned To No-one
Player Type All players
Severity Low
Priority Normal
Reported Version Daily build (which?)
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

This patch changes the build behaviour as discussed in #rockbox-community.

It's only for WPS editor, checkwps is unchanged.
   wpseditor_build_cleanup.diff (23.1 KiB)
 utils/wpseditor/wpseditor.pro            |    4 +-
 utils/wpseditor/libwps/buildall.sh       |    9 -----
 utils/wpseditor/libwps/cleanall.sh       |    7 ----
 utils/wpseditor/libwps/src/proxy.c       |    4 +-
 utils/wpseditor/libwps/targets.txt       |    9 -----
 utils/wpseditor/libwps/Makefile          |   50 +++++++++++++------------------
 utils/wpseditor/libwps/buildall.bat      |    4 --
 utils/wpseditor/buildall.sh              |    4 --
 utils/wpseditor/gui/src/qwpsdrawer.cpp   |   27 +++++++++++-----
 utils/wpseditor/gui/src/qwpsdrawer.h     |    8 ++++
 utils/wpseditor/buildall.bat             |    9 -----
 firmware/export/config-player.h          |    2 +
 firmware/export/config-c200.h            |    2 -
 firmware/export/config-iaudiom3.h        |    2 +
 firmware/export/config-ondiofm.h         |    2 +
 firmware/export/config-creativezvm.h     |    4 +-
 firmware/export/config-ifp7xx.h          |    2 +
 firmware/export/config-mrobe500.h        |    1 
 firmware/export/config-e200.h            |    2 -
 firmware/export/config-m200.h            |    2 +
 firmware/export/config-ipodvideo.h       |    2 +
 firmware/export/config-ipod3g.h          |    2 +
 firmware/export/config-ipodcolor.h       |    2 +
 firmware/export/config-ipodmini.h        |    2 +
 firmware/export/config-h120.h            |    2 +
 firmware/export/config-ipod1g2g.h        |    2 +
 firmware/export/config-recorderv2.h      |    2 +
 firmware/export/config-ipodmini2g.h      |    2 +
 firmware/export/config-c100.h            |    2 +
 firmware/export/config-ipodnano.h        |    2 +
 firmware/export/config-hdd1630.h         |    2 -
 firmware/export/config-iaudiom5.h        |    2 +
 firmware/export/config-logikdax.h        |    2 +
 firmware/export/config-h100.h            |    2 +
 firmware/export/config-h300.h            |    2 +
 firmware/export/config-creativezvm60gb.h |    2 +
 firmware/export/config-creativezv.h      |    2 +
 firmware/export/config-ipod4g.h          |    2 +
 firmware/export/config-iaudiox5.h        |    2 +
 firmware/export/config-tpj1022.h         |    2 +
 firmware/export/config-gigabeat-s.h      |    2 +
 firmware/export/config-gigabeat.h        |    2 +
 firmware/export/config-recorder.h        |    2 +
 firmware/export/config-cowond2.h         |    2 +
 firmware/export/config-ondiosp.h         |    2 +
 firmware/export/config-fmrecorder.h      |    2 +
 firmware/export/config-ondavx747.h       |    2 +
 firmware/export/config-meizu-m6sl.h      |    4 +-
 48 files changed, 125 insertions(+), 87 deletions(-)

This task depends upon

Closed by  Maurus Cuelenaere (mcuelenaere)
Thursday, 04 September 2008, 16:50 GMT+2
Reason for closing:  Accepted
Additional comments about closing:  In r18407.
Comment by Frank Gevaerts (fg) - Thursday, 04 September 2008, 14:35 GMT+2
With careful/conditional setting of LDFLAGS it should be possible to unify the libwps_%.dll and libwps_%.so targets I think. (It would then be libwps_%$(EXE) of course) That would further simplify the makefile
Comment by Maurus Cuelenaere (mcuelenaere) - Thursday, 04 September 2008, 15:26 GMT+2
This simplifies the Makefile.

Libwps still isn't build when doing 'qmake-qt4 && make' in the root dir though..
   wpseditor_build_cleanup2.diff (27.9 KiB)
 utils/wpseditor/wpseditor.pro            |    4 
 utils/wpseditor/libwps/Makefile          |  226 +++++++++++++------------------
 utils/wpseditor/libwps/src/proxy.c       |    8 -
 utils/wpseditor/libwps/targets.txt       |    9 -
 utils/wpseditor/gui/src/qwpsdrawer.cpp   |   27 ++-
 utils/wpseditor/gui/src/qwpsdrawer.h     |    8 +
 firmware/export/config-c100.h            |    2 
 firmware/export/config-c200.h            |    2 
 firmware/export/config-cowond2.h         |    2 
 firmware/export/config-creativezv.h      |    2 
 firmware/export/config-creativezvm60gb.h |    2 
 firmware/export/config-creativezvm.h     |    4 
 firmware/export/config-e200.h            |    2 
 firmware/export/config-fmrecorder.h      |    2 
 firmware/export/config-gigabeat.h        |    2 
 firmware/export/config-gigabeat-s.h      |    2 
 firmware/export/config-h100.h            |    2 
 firmware/export/config-h120.h            |    2 
 firmware/export/config-h300.h            |    2 
 firmware/export/config-hdd1630.h         |    2 
 firmware/export/config-iaudiom3.h        |    2 
 firmware/export/config-iaudiom5.h        |    2 
 firmware/export/config-iaudiox5.h        |    2 
 firmware/export/config-ifp7xx.h          |    2 
 firmware/export/config-ipod1g2g.h        |    2 
 firmware/export/config-ipod3g.h          |    2 
 firmware/export/config-ipod4g.h          |    2 
 firmware/export/config-ipodcolor.h       |    2 
 firmware/export/config-ipodmini2g.h      |    2 
 firmware/export/config-ipodmini.h        |    2 
 firmware/export/config-ipodnano.h        |    2 
 firmware/export/config-ipodvideo.h       |    2 
 firmware/export/config-logikdax.h        |    2 
 firmware/export/config-m200.h            |    2 
 firmware/export/config-meizu-m6sl.h      |    4 
 firmware/export/config-mrobe500.h        |    1 
 firmware/export/config-ondavx747.h       |    2 
 firmware/export/config-ondiofm.h         |    2 
 firmware/export/config-ondiosp.h         |    2 
 firmware/export/config-player.h          |    2 
 firmware/export/config-recorder.h        |    2 
 firmware/export/config-recorderv2.h      |    2 
 firmware/export/config-tpj1022.h         |    2 
 43 files changed, 205 insertions(+), 154 deletions(-)

Comment by Frank Gevaerts (fg) - Thursday, 04 September 2008, 15:39 GMT+2
$(RM) $(RESULTS) instead of $(RM) libwps_* ?

edit: same for $(COPY) I guess
Comment by Frank Gevaerts (fg) - Thursday, 04 September 2008, 16:28 GMT+2
Adding libwps to the SUBDIRS line in wpseditor.pro seems to get qmake to do the right thing
Comment by Maurus Cuelenaere (mcuelenaere) - Thursday, 04 September 2008, 16:43 GMT+2
Contains the fixes gevaerts suggested.
   wpseditor_build_cleanup3.diff (27.9 KiB)
 utils/wpseditor/wpseditor.pro            |    4 
 utils/wpseditor/libwps/Makefile          |  226 +++++++++++++------------------
 utils/wpseditor/libwps/src/proxy.c       |    8 -
 utils/wpseditor/libwps/targets.txt       |    9 -
 utils/wpseditor/gui/src/qwpsdrawer.cpp   |   27 ++-
 utils/wpseditor/gui/src/qwpsdrawer.h     |    8 +
 firmware/export/config-c100.h            |    2 
 firmware/export/config-c200.h            |    2 
 firmware/export/config-cowond2.h         |    2 
 firmware/export/config-creativezv.h      |    2 
 firmware/export/config-creativezvm60gb.h |    2 
 firmware/export/config-creativezvm.h     |    4 
 firmware/export/config-e200.h            |    2 
 firmware/export/config-fmrecorder.h      |    2 
 firmware/export/config-gigabeat.h        |    2 
 firmware/export/config-gigabeat-s.h      |    2 
 firmware/export/config-h100.h            |    2 
 firmware/export/config-h120.h            |    2 
 firmware/export/config-h300.h            |    2 
 firmware/export/config-hdd1630.h         |    2 
 firmware/export/config-iaudiom3.h        |    2 
 firmware/export/config-iaudiom5.h        |    2 
 firmware/export/config-iaudiox5.h        |    2 
 firmware/export/config-ifp7xx.h          |    2 
 firmware/export/config-ipod1g2g.h        |    2 
 firmware/export/config-ipod3g.h          |    2 
 firmware/export/config-ipod4g.h          |    2 
 firmware/export/config-ipodcolor.h       |    2 
 firmware/export/config-ipodmini2g.h      |    2 
 firmware/export/config-ipodmini.h        |    2 
 firmware/export/config-ipodnano.h        |    2 
 firmware/export/config-ipodvideo.h       |    2 
 firmware/export/config-logikdax.h        |    2 
 firmware/export/config-m200.h            |    2 
 firmware/export/config-meizu-m6sl.h      |    4 
 firmware/export/config-mrobe500.h        |    1 
 firmware/export/config-ondavx747.h       |    2 
 firmware/export/config-ondiofm.h         |    2 
 firmware/export/config-ondiosp.h         |    2 
 firmware/export/config-player.h          |    2 
 firmware/export/config-recorder.h        |    2 
 firmware/export/config-recorderv2.h      |    2 
 firmware/export/config-tpj1022.h         |    2 
 43 files changed, 205 insertions(+), 154 deletions(-)

Loading...