From 79c2e7da8a187c82446a0d6bf1fc3c72c8d36edb Mon Sep 17 00:00:00 2001 From: mcuelenaere Date: Tue, 29 Dec 2009 21:49:44 +0000 Subject: [PATCH] Checkwps: use script for getting the targets instead of hardcoded file (fixes checkwps due to target renaming) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24122 a1c6a512-1295-4272-9138-f99709370657 --- tools/checkwps/buildall.sh | 2 +- tools/checkwps/cleanall.sh | 2 +- tools/checkwps/parse_configure.awk | 11 +++++++++ tools/checkwps/targets.txt | 46 -------------------------------------- 4 files changed, 13 insertions(+), 48 deletions(-) create mode 100644 tools/checkwps/parse_configure.awk delete mode 100644 tools/checkwps/targets.txt diff --git a/tools/checkwps/buildall.sh b/tools/checkwps/buildall.sh index 9bc937fa5..cb01ad903 100755 --- a/tools/checkwps/buildall.sh +++ b/tools/checkwps/buildall.sh @@ -40,7 +40,7 @@ then exit fi -cat $rootdir/targets.txt | ( +awk -f $rootdir/parse_configure.awk $rootdir/../configure | ( while read target model do make -j $jobs clean diff --git a/tools/checkwps/cleanall.sh b/tools/checkwps/cleanall.sh index 19a3aec6f..4b3c72bd2 100755 --- a/tools/checkwps/cleanall.sh +++ b/tools/checkwps/cleanall.sh @@ -5,7 +5,7 @@ outdir=$rootdir/output make clean # make clean the build dir first rm -f autoconf.h rm -f Makefile -cat $rootdir/targets.txt | ( +awk -f $rootdir/parse_configure.awk $rootdir/../configure | ( while read target model do rm -f $outdir/checkwps.$model # then delete any output/checkwps.* diff --git a/tools/checkwps/parse_configure.awk b/tools/checkwps/parse_configure.awk new file mode 100644 index 000000000..0cb0c0b39 --- /dev/null +++ b/tools/checkwps/parse_configure.awk @@ -0,0 +1,11 @@ +BEGIN { FS="[|)]" } + +/^[ \t]*([0-9]+)\|([^)]+)\)$/ { + model=$2 +} + +/^[ \t]*target="[^"]+"$/ { + match($0, "-D[^\"]+") + target=substr($0, RSTART+2, RLENGTH-2) + print target, model +} diff --git a/tools/checkwps/targets.txt b/tools/checkwps/targets.txt deleted file mode 100644 index 094b49d2c..000000000 --- a/tools/checkwps/targets.txt +++ /dev/null @@ -1,46 +0,0 @@ -ARCHOS_RECORDER recorder -ARCHOS_FMRECORDER fmrecorder -ARCHOS_RECORDERV2 recorderv2 -ARCHOS_ONDIOSP ondiosp -ARCHOS_ONDIOFM ondiofm -IRIVER_H120 h120 -IRIVER_H300 h300 -IRIVER_H100 h100 -IRIVER_IFP7XX ifp7xx -IRIVER_H10 h10 -IRIVER_H10_5GB h10_5gb -IPOD_COLOR ipodcolor -IPOD_NANO ipodnano -IPOD_NANO2G ipodnano2g -IPOD_VIDEO ipodvideo -IPOD_3G ipod3g -IPOD_4G ipod4g -IPOD_MINI ipodmini -IPOD_MINI2G ipodmini2g -IPOD_1G2G ipod1g2g -IAUDIO_X5 x5 -IAUDIO_M5 m5 -COWON_D2 cowond2 -IAUDIO_M3 m3 -GIGABEAT_F gigabeatf -GIGABEAT_S gigabeats -MROBE_500 mrobe500 -MROBE_100 mrobe100 -LOGIK_DAX logikdax -CREATIVE_ZVM creativezvm30gb -CREATIVE_ZVM60GB creativezvm60gb -CREATIVE_ZV creativezenvision -SANSA_E200 e200 -SANSA_E200 e200v2 -SANSA_E200 e200r -SANSA_C200 c200 -SANSA_M200 m200 -SANSA_C100 c100 -SANSA_FUZE fuze -SANSA_CLIP clip -ELIO_TPJ1022 tpj1022 -ONDA_VX747 ondavx747 -ONDA_VX777 ondavx777 -SAMSUNG_YH820 yh820 -SAMSUNG_YH920 yh920 -SAMSUNG_YH925 yh925 -- 2.11.4.GIT