From 62e11adcee5917430931ac4a579ce9413a60a66c Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Thu, 7 Apr 2011 18:01:19 +0100
Subject: [PATCH] changed compile-all such that different cache sizes can be
 created, Added 5M and 44M options

---
 build-stuff/readme.txt    |  2 +-
 compile-all               | 46 ++++++++++++++++++++++++++-------------
 lk/target/htcleo/rules.mk |  2 +-
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/build-stuff/readme.txt b/build-stuff/readme.txt
index 45dacb5..516882f 100644
--- a/build-stuff/readme.txt
+++ b/build-stuff/readme.txt
@@ -8,7 +8,7 @@ misc 1M
 recovery 5M
 boot 8M
 system 400M
-cache 5M
+cache 44M
 userdata remaining
 
 Thanks and credits
diff --git a/compile-all b/compile-all
index e373dd6..33641dc 100755
--- a/compile-all
+++ b/compile-all
@@ -1,24 +1,40 @@
 #!/bin/bash
 
 export ARM=$HOME/android/HD2/android/toolchain/arm-2009q3/bin
-export WINE=/opt/cxoffice/bin
-export PATH=$ARM:$WINE:$PATH
+export PATH=$ARM:$PATH
 export VERSION=1.4
-export SIZES="100 150 200 210 250 300 350 400"
-export CACHE=5
+export SIZES="`echo {80..140..10} {160..400..20}`"
+export CACHE="5 44"
+export OUTPUT=$PWD/../cLK-out
+export O_ALL=$OUTPUT/allInOne
+export O_ZIP=$OUTPUT/zips
 
 make clean
+mkdir -p $O_ALL
+mkdir -p $O_ZIP
+rm -rf $O_ALL/{*.nbh,*.zip}
+rm -rf $O_ZIP/*.zip
 
-for size in $SIZES
+for cache in $CACHE
 do
-sed -i s/DEFINES\ +=\ SYSTEM_PARTITION_SIZE=.*/DEFINES\ +=\ SYSTEM_PARTITION_SIZE=${size}/ lk/target/htcleo/rules.mk
-sed -i s/DEFINES\ +=\ CACHE_PARTITION_SIZE=.*/DEFINES\ +=\ CACHE_PARTITION_SIZE=${CACHE}/ lk/target/htcleo/rules.mk
-sed -i s/system\ .*/system\ ${size}M/ build-stuff/readme.txt
-make partition
-pushd build-stuff
-rm -rf ../../cLK-out/cLK${VERSION}_system_${size}M_arif-ali.zip
-mv ../bin/RUU_signed.nbh .
-zip -9Dr ../../cLK-out/cLK${VERSION}_system_${size}M_arif-ali.zip readme.txt CustomRUU.exe RUU_signed.nbh
-popd
-rm -rf RUU_signed.nbh
+  for size in $SIZES
+  do
+    sed -i s/DEFINES\ +=\ SYSTEM_PARTITION_SIZE=.*/DEFINES\ +=\ SYSTEM_PARTITION_SIZE=${size}/ lk/target/htcleo/rules.mk
+    sed -i s/DEFINES\ +=\ CACHE_PARTITION_SIZE=.*/DEFINES\ +=\ CACHE_PARTITION_SIZE=${cache}/ lk/target/htcleo/rules.mk
+    sed -i s/system\ .*/system\ ${size}M/ build-stuff/readme.txt
+    sed -i s/cache\ .*/cache\ ${cache}M/ build-stuff/readme.txt
+    make partition
+    pushd build-stuff
+      rm -rf $O_ZIP/cLK_${VERSION}_${size}_${cache}.zip
+      mv ../bin/RUU_signed.nbh .
+      zip -9Dr $O_ZIP/cLK_${VERSION}_${size}_${cache}.zip readme.txt CustomRUU.exe RUU_signed.nbh
+      cp RUU_signed.nbh $O_ALL/RUU_signed-${size}-${cache}.nbh
+      rm -rf RUU_signed.nbh
+    popd
+  done
 done
+
+pushd $O_ALL
+rm -rf cLK_${VERSION}_layouts_arif.zip
+zip -9Dr cLK_${VERSION}_layouts_arif.zip *.nbh
+popd
diff --git a/lk/target/htcleo/rules.mk b/lk/target/htcleo/rules.mk
index 114b029..7b7482c 100644
--- a/lk/target/htcleo/rules.mk
+++ b/lk/target/htcleo/rules.mk
@@ -7,7 +7,7 @@ PLATFORM := qsd8k
 #define system partition size (in MB), if not defined my custom (from magldr) layout is used. see init.c
 DEFINES += SYSTEM_PARTITION_SIZE=400
 #DEFINES += SYSTEM_PARTITION_SIZE=400
-DEFINES += CACHE_PARTITION_SIZE=5
+DEFINES += CACHE_PARTITION_SIZE=44
 
 #cedesmith note: MEMBASE requires edit in platform/qsd8k/rules.mk
 # maximum partition size will be about 340mb ( MEMBASE-SCRATCH_ADDR)