devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

* removed some more unused stuff in the simulator makefile

Browse source 
* 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
This commit is contained in:
Daniel Stenberg 2004-05-26 11:18:40 +00:00
parent 5c9c16f32f
commit 052d21a667
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tools/configure vendored
View file

@ -46,7 +46,6 @@ simul () {
sed > Makefile \ sed > Makefile \
-e "s,@ROOTDIR@,${rootdir},g" \ -e "s,@ROOTDIR@,${rootdir},g" \
-e "s,@TARGET@,${target},g" \
-e "s,@ARCHOS@,${archos},g" \ -e "s,@ARCHOS@,${archos},g" \
-e "s,@DEBUG@,${debug},g" \ -e "s,@DEBUG@,${debug},g" \
-e "s,@DISPLAY@,${display},g" \ -e "s,@DISPLAY@,${display},g" \
@ -60,9 +59,7 @@ sed > Makefile \
ARCHOS=@ARCHOS@ ARCHOS=@ARCHOS@
ROOTDIR=@ROOTDIR@ ROOTDIR=@ROOTDIR@
SIMDIR=\$(ROOTDIR)/uisimulator/@SIMVER@ SIMDIR=\$(ROOTDIR)/uisimulator/@SIMVER@
TOOLSDIR=\$(ROOTDIR)/tools
DEBUG=@DEBUG@ DEBUG=@DEBUG@
TARGET=@TARGET@
DISPLAY=@DISPLAY@ DISPLAY=@DISPLAY@
KEYPAD=@KEYPAD@ KEYPAD=@KEYPAD@
THISDIR="@PWD@" THISDIR="@PWD@"
@ -125,11 +122,6 @@ whichlang() {
done done
} }
#
# Beging Build Script
#
target=$1 target=$1
debug=$2 debug=$2
@ -175,7 +167,6 @@ if [ "$target" = "update" ]; then
if { grep "^## Auto" Makefile >/dev/null 2>&1 ; } then if { grep "^## Auto" Makefile >/dev/null 2>&1 ; } then
echo "Existing generated Makefile found. Getting defaults from it." echo "Existing generated Makefile found. Getting defaults from it."
archos=`grep "^ARCHOS=" Makefile | cut -d= -f2-` archos=`grep "^ARCHOS=" Makefile | cut -d= -f2-`
target=`grep "^TARGET=" Makefile | cut -d= -f2-`
debug=`grep "^DEBUG=" Makefile | cut -d= -f2-` debug=`grep "^DEBUG=" Makefile | cut -d= -f2-`
language=`grep "^LANGUAGE=" Makefile | cut -d= -f2-` language=`grep "^LANGUAGE=" Makefile | cut -d= -f2-`
memory=`grep "^MEMORYSIZE=" Makefile | cut -d= -f2-` memory=`grep "^MEMORYSIZE=" Makefile | cut -d= -f2-`
@ -186,6 +177,8 @@ if [ "$target" = "update" ]; then
display=`grep "^DISPLAY=" Makefile | cut -d= -f2-` display=`grep "^DISPLAY=" Makefile | cut -d= -f2-`
keypad=`grep "^KEYPAD=" Makefile | cut -d= -f2-` keypad=`grep "^KEYPAD=" Makefile | cut -d= -f2-`
simver=`grep "^SIMVER=" Makefile | cut -d= -f2-` simver=`grep "^SIMVER=" Makefile | cut -d= -f2-`
else
target=`grep "^TARGET=" Makefile | cut -d= -f2-`
fi fi
fi fi
fi fi
@ -317,7 +310,7 @@ if [ -z "$rootdir" ]; then
firmfile="crt0.S" # a file to check for in the firmware root dir firmfile="crt0.S" # a file to check for in the firmware root dir
for dir in . .. ../..; do for dir in . .. ../.. ../rockbox*; do
if [ -f $dir/firmware/$firmfile ]; then if [ -f $dir/firmware/$firmfile ]; then
rootdir=$dir rootdir=$dir
break break
@ -338,6 +331,10 @@ if [ -z "$rootdir" ]; then
cd $rootdir cd $rootdir
rootdir=`pwd` rootdir=`pwd`
echo "Using this source code root directory:"
echo $rootdir
echo ""
# cd back to the build dir # cd back to the build dir
cd $now cd $now
fi fi