diff options
author | Daniel Stenberg <daniel@haxx.se> | 2004-05-26 11:18:40 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2004-05-26 11:18:40 +0000 |
commit | 052d21a667ea75fe90b937478eb128c50b9f3154 (patch) | |
tree | 6ea044666466a0e2ae7fdc0fb1715cf1adea665c /tools | |
parent | 5c9c16f32f9872dc8490f5bd83054e49152ac33c (diff) | |
download | rockbox-052d21a667ea75fe90b937478eb128c50b9f3154.tar.gz rockbox-052d21a667ea75fe90b937478eb128c50b9f3154.zip |
* removed some more unused stuff in the simulator makefile
* made the scan for the rockbox source dir a bit cooler, now it can detect
it even when you create and use a build directory that is on the same level
as the rockbox dir itself which might make it easier for people that builds
from (repeatly updated) daily tarballs
* now outputs the found rockbox source code dir found
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4706 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/tools/configure b/tools/configure index 2960e0c439..a6e92bea20 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -46,7 +46,6 @@ simul () { | |||
46 | 46 | ||
47 | sed > Makefile \ | 47 | sed > Makefile \ |
48 | -e "s,@ROOTDIR@,${rootdir},g" \ | 48 | -e "s,@ROOTDIR@,${rootdir},g" \ |
49 | -e "s,@TARGET@,${target},g" \ | ||
50 | -e "s,@ARCHOS@,${archos},g" \ | 49 | -e "s,@ARCHOS@,${archos},g" \ |
51 | -e "s,@DEBUG@,${debug},g" \ | 50 | -e "s,@DEBUG@,${debug},g" \ |
52 | -e "s,@DISPLAY@,${display},g" \ | 51 | -e "s,@DISPLAY@,${display},g" \ |
@@ -60,9 +59,7 @@ sed > Makefile \ | |||
60 | ARCHOS=@ARCHOS@ | 59 | ARCHOS=@ARCHOS@ |
61 | ROOTDIR=@ROOTDIR@ | 60 | ROOTDIR=@ROOTDIR@ |
62 | SIMDIR=\$(ROOTDIR)/uisimulator/@SIMVER@ | 61 | SIMDIR=\$(ROOTDIR)/uisimulator/@SIMVER@ |
63 | TOOLSDIR=\$(ROOTDIR)/tools | ||
64 | DEBUG=@DEBUG@ | 62 | DEBUG=@DEBUG@ |
65 | TARGET=@TARGET@ | ||
66 | DISPLAY=@DISPLAY@ | 63 | DISPLAY=@DISPLAY@ |
67 | KEYPAD=@KEYPAD@ | 64 | KEYPAD=@KEYPAD@ |
68 | THISDIR="@PWD@" | 65 | THISDIR="@PWD@" |
@@ -125,11 +122,6 @@ whichlang() { | |||
125 | done | 122 | done |
126 | } | 123 | } |
127 | 124 | ||
128 | |||
129 | # | ||
130 | # Beging Build Script | ||
131 | # | ||
132 | |||
133 | target=$1 | 125 | target=$1 |
134 | debug=$2 | 126 | debug=$2 |
135 | 127 | ||
@@ -175,7 +167,6 @@ if [ "$target" = "update" ]; then | |||
175 | if { grep "^## Auto" Makefile >/dev/null 2>&1 ; } then | 167 | if { grep "^## Auto" Makefile >/dev/null 2>&1 ; } then |
176 | echo "Existing generated Makefile found. Getting defaults from it." | 168 | echo "Existing generated Makefile found. Getting defaults from it." |
177 | archos=`grep "^ARCHOS=" Makefile | cut -d= -f2-` | 169 | archos=`grep "^ARCHOS=" Makefile | cut -d= -f2-` |
178 | target=`grep "^TARGET=" Makefile | cut -d= -f2-` | ||
179 | debug=`grep "^DEBUG=" Makefile | cut -d= -f2-` | 170 | debug=`grep "^DEBUG=" Makefile | cut -d= -f2-` |
180 | language=`grep "^LANGUAGE=" Makefile | cut -d= -f2-` | 171 | language=`grep "^LANGUAGE=" Makefile | cut -d= -f2-` |
181 | memory=`grep "^MEMORYSIZE=" Makefile | cut -d= -f2-` | 172 | memory=`grep "^MEMORYSIZE=" Makefile | cut -d= -f2-` |
@@ -186,6 +177,8 @@ if [ "$target" = "update" ]; then | |||
186 | display=`grep "^DISPLAY=" Makefile | cut -d= -f2-` | 177 | display=`grep "^DISPLAY=" Makefile | cut -d= -f2-` |
187 | keypad=`grep "^KEYPAD=" Makefile | cut -d= -f2-` | 178 | keypad=`grep "^KEYPAD=" Makefile | cut -d= -f2-` |
188 | simver=`grep "^SIMVER=" Makefile | cut -d= -f2-` | 179 | simver=`grep "^SIMVER=" Makefile | cut -d= -f2-` |
180 | else | ||
181 | target=`grep "^TARGET=" Makefile | cut -d= -f2-` | ||
189 | fi | 182 | fi |
190 | fi | 183 | fi |
191 | fi | 184 | fi |
@@ -317,7 +310,7 @@ if [ -z "$rootdir" ]; then | |||
317 | 310 | ||
318 | firmfile="crt0.S" # a file to check for in the firmware root dir | 311 | firmfile="crt0.S" # a file to check for in the firmware root dir |
319 | 312 | ||
320 | for dir in . .. ../..; do | 313 | for dir in . .. ../.. ../rockbox*; do |
321 | if [ -f $dir/firmware/$firmfile ]; then | 314 | if [ -f $dir/firmware/$firmfile ]; then |
322 | rootdir=$dir | 315 | rootdir=$dir |
323 | break | 316 | break |
@@ -338,6 +331,10 @@ if [ -z "$rootdir" ]; then | |||
338 | cd $rootdir | 331 | cd $rootdir |
339 | rootdir=`pwd` | 332 | rootdir=`pwd` |
340 | 333 | ||
334 | echo "Using this source code root directory:" | ||
335 | echo $rootdir | ||
336 | echo "" | ||
337 | |||
341 | # cd back to the build dir | 338 | # cd back to the build dir |
342 | cd $now | 339 | cd $now |
343 | fi | 340 | fi |