From 6358e611e09092ad121f4a85e548c0d9411ab09f Mon Sep 17 00:00:00 2001
From: "Angelo Mantellini (manangel)" <angelo.mantellini@irt-systemx.fr>
Date: Tue, 6 Jun 2017 14:22:24 +0200
Subject: update applications to use new version libicnet

Change-Id: I4b2381a13cf64488baf83056fc1fa11b359d1147
Signed-off-by: Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr>
---
 scripts/init_qt.sh | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

(limited to 'scripts/init_qt.sh')

diff --git a/scripts/init_qt.sh b/scripts/init_qt.sh
index 065bffa6..62ba3ed0 100755
--- a/scripts/init_qt.sh
+++ b/scripts/init_qt.sh
@@ -17,35 +17,45 @@
 
 set -e
 
-if [ "$ARCH" == "x86" ]; then
+if [ $ARCH = "x86" ]; then
 	echo "Qt is not available for x86 systems"
 	exit 1
 fi
 
+
 mkdir -p qt
 cd qt
-
+echo "####"
+pwd 
+echo ${QT_HOME}
+export QT_HOME=`pwd`/Qt
+echo "####"
 if [ ! -d ${QT_HOME} ]; then
-	if [ "$OS" == "darwin" ]; then
+echo ${QT_HOME}
+	if [ $OS = "darwin" ]; then
 		if [ ! -f qt-opensource-mac-x64-android-5.7.1.dmg ]; then
 			wget http://download.qt.io/archive/qt/5.7/5.7.1/qt-opensource-mac-x64-android-5.7.1.dmg
 		fi
+		
 		VOLUME=$(hdiutil attach qt-opensource-mac-x64-android-5.7.1.dmg | tail -1 | awk '{print $3}')
+		
+		echo "######"
+		pwd
+		echo "######"
 		$VOLUME/qt-opensource-mac-x64-android-5.7.1.app/Contents/MacOS/qt-opensource-mac-x64-android-5.7.1  --script ../scripts/install_script.sh -platform minimal --verbose
 		diskutil unmount $VOLUME
 	else
 		if [ ! -f qt-opensource-linux-x64-android-5.7.1.run ]; then
 			wget http://download.qt.io/archive/qt/5.7/5.7.1/qt-opensource-linux-x64-android-5.7.1.run
-			chmod +x qt-opensource-linux-x64-android-5.7.1.run
 		fi
+		chmod +x qt-opensource-linux-x64-android-5.7.1.run
 		./qt-opensource-linux-x64-android-5.7.1.run --script ../scripts/install_script.sh -platform minimal --verbose
 	fi
 fi
 
-cp -f $DISTILLERY_INSTALL_DIR/lib/libicnet.so ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/
-cp -f $DISTILLERY_INSTALL_DIR/lib/libcrystax.so ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/
+
+echo $DISTILLERY_INSTALL_DIR
 cp -f $DISTILLERY_INSTALL_DIR/lib/libdash.so ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/
-cp -f $DISTILLERY_INSTALL_DIR/lib/libboost_system.so ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/
 
 if [ ! -d ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/boost ]; then
 	ln -s $DISTILLERY_INSTALL_DIR/include/ccnx  ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/
@@ -53,30 +63,32 @@ if [ ! -d ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/boost ]; then
 	ln -s $DISTILLERY_INSTALL_DIR/include/parc  ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/
 	ln -s $DISTILLERY_INSTALL_DIR/include/LongBow  ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/
 	ln -s $DISTILLERY_INSTALL_DIR/include/icnet  ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/
-	ln -s $DISTILLERY_INSTALL_DIR/include/libdash  ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/
+	ln -s $DISTILLERY_INSTALL_DIR/include/dash  ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/
 fi
 
-if [ ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavcodec.so -o ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavfilter.so -o ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavformat.so -o ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavutil.so -o ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libswresample.so -o ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libswscale.so ]; then
+if [[ ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavformat.so || ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavfilter.so || ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavformat.so || ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libavutil.so || ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libswresample.so || ! -f ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/libswscale.so ]]; then
 	if [ ! -f ffmpeg-3.1.4-android.7z ]; then
-		wget https://downloads.sourceforge.net/project/qtav/depends/FFmpeg/android/ffmpeg-3.1.4-android.7z
+		wget https://downloads.sourceforge.net/project/qtav/depends/FFmpeg/android/ffmpeg-3.1.4-android.7z	
 	fi
 	7z x ffmpeg-3.1.4-android.7z -offmpeg
+	echo $QT_HOME
 	cp ffmpeg/ffmpeg-3.1.4-android-armv7a/lib/lib* ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/
 	cp -r ffmpeg/ffmpeg-3.1.4-android-armv7a/include/* ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/
 fi
 
 export ANDROID_HOME=${SDK}
 export ANDROID_NDK_HOST=${OS}-${ARCH}
-export ANDROID_NDK_PLATFORM=android-23
+export ANDROID_NDK_PLATFORM=${ANDROID_PLATFORM}
 export ANDROID_NDK_ROOT=${NDK}
-export ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi
+export ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi  
 export ANDROID_NDK_TOOLCHAIN_VERSION=4.9
-export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi
-export ANDROID_SDK_ROOT=${SDK}
-export ANDROID_API_VERSION=android-23
+export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi  
+export ANDROID_SDK_ROOT=${SDK} 
+export ANDROID_API_VERSION=${ANDROID_PLATFORM}
 export PATH=$PATH:${ANDROID_HOME}/tools:${JAVA_HOME}/bin
 if [ ! -d ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/QtAV ]; then
-	git clone https://github.com/wang-bin/QtAV.git
+	pwd
+	git clone https://github.com/wang-bin/QtAV.git 
 	cd QtAV
 	mkdir -p ${DISTILLERY_BUILD_DIR}/qtav
 	cd ${DISTILLERY_BUILD_DIR}/qtav
@@ -85,4 +97,4 @@ if [ ! -d ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/QtAV ]; then
 	make install INSTALL_ROOT=android
 	sh sdk_install.sh
 fi
-cd ${DISTILLERY_ROOT_DIR}
+cd ${DISTILLERY_ROOT_DIR}
\ No newline at end of file
-- 
cgit 1.2.3-korg