[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-317-gdd32f58

[jscheer <js...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  dd32f586e22a4c3659d1327101d2ad6b9bd12f21 (commit)
      from  6783f97581a28c6e5bdb2efb9b828cba54e2ad5e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dd32f586e22a4c3659d1327101d2ad6b9bd12f21
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed May 23 15:10:56 2012 +0200

    [DEMOS] Fix Qt build & mkspecs directory paths in ApfDacClientServer's build.sh.

-----------------------------------------------------------------------

Summary of changes:
 software/demos/ApfDacClientServer/src/build.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/software/demos/ApfDacClientServer/src/build.sh b/software/demos/ApfDacClientServer/src/build.sh
index 3cde296..642f9cf 100755
--- a/software/demos/ApfDacClientServer/src/build.sh
+++ b/software/demos/ApfDacClientServer/src/build.sh
@@ -2,7 +2,7 @@
 
 export INITIALPATH=$PATH
 . ../../../../armadeus_env.sh
-ARMADEUS_QTE_DIR=$ARMADEUS_BUILD_DIR/qt-embedded-linux-opensource-src-4.4.3
+ARMADEUS_QTE_DIR=$ARMADEUS_QT_DIR
 
 if [ -d "$ARMADEUS_QTE_DIR" ]; then
 	echo "building the demos for 3 targets......"
@@ -88,7 +88,7 @@ export OUTPUT_DIR=../../bin/apf
 #export QTDIR=$ARMADEUS_ROOTFS_DIR/qt/qtopia.4.2.0/
 export QTDIR=$ARMADEUS_QTE_DIR
 ## due to some installation problems.... I use a custom qmake spec
-export QMAKESPEC=../../QtopiaMkspec/linux-arm-g++/
+export QMAKESPEC=$ARMADEUS_BUILDROOT_DIR/output/host/usr/mkspecs/qws/linux-arm-g++
 export PATH=$ARMADEUS_TOOLCHAIN_PATH:$QTDIR/bin:$INITIALPATH
 
 buildForEnvironment "APF board" $1
@@ -98,7 +98,7 @@ buildForEnvironment "APF board" $1
 
 export OUTPUT_DIR=../../bin/qvbf
 #export QTDIR=$ARMADEUS_ROOTFS_DIR/qt/qvfb/
-export QTDIR=/usr/local/Trolltech/QtEmbedded-4.4.1/
+export QTDIR=/usr/local/Trolltech/QtEmbedded-4.7.2/
 export QMAKESPEC=$QTDIR/mkspecs/linux-g++
 export QMAKEPATH=$QTDIR
 export PATH=$QTDIR/bin:$INITIALPATH


hooks/post-receive
-- 
armadeus