diff options
| author |   Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr> | 2017-04-25 21:17:37 +0200 |
|---|---|---|
| committer | Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr> | 2017-04-25 23:01:06 +0200 |
| commit | 208d43c7988c527691b663e4e00b56b42cc19277 (patch) | |
| tree | e26df3383b4256bcde3c95cc4ce32177c8dd744b /scripts | |
| parent | 4ff32ec79cf0ba8ddb8c46f2f36adce379819643 (diff) | |
correction link libraries libcurl
Change-Id: I8be291ac6b9ec15f0f7bbaa8b434da9d319ae389
Signed-off-by: Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/compile_androidviper.sh | 2 | ||||
| -rwxr-xr-x | scripts/init.sh | 15 | ||||
| -rwxr-xr-x | scripts/init_qt.sh | 15 | ||||
| -rwxr-xr-x | scripts/update.sh | 6 |
4 files changed, 15 insertions, 23 deletions
diff --git a/scripts/compile_androidviper.sh b/scripts/compile_androidviper.sh index 215fecee..518580bd 100755 --- a/scripts/compile_androidviper.sh +++ b/scripts/compile_androidviper.sh @@ -14,7 +14,7 @@ ############################################################################## #!/bin/bash - +set -e export ANDROID_HOME=${SDK} export ANDROID_NDK_HOST=${OS}-${ARCH} export ANDROID_NDK_PLATFORM=android-23 diff --git a/scripts/init.sh b/scripts/init.sh index 7e3d8ccb..6324c6b0 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -158,24 +158,11 @@ fi echo "Create libdash dependencies" if [ ! -d ${INSTALLATION_DIR}/include/curl ]; then - if [ ! -d curl ]; then - git clone https://github.com/curl/curl.git - cd curl - export SYSROOT=$NDK/platforms/android-23/arch-arm - export CC="$NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/${OS}-${ARCH}/bin/arm-linux-androideabi-gcc --sysroot=$SYSROOT" - ./buildconf - ./configure --with-sysroot=$SYSROOT --host=arm - mv src/tool_hugehelp.c.cvs src/tool_hugehelp.c - cd .. - fi - cp -r curl/lib libcurl_android/jni/libcurl/ - cp -r curl/src libcurl_android/jni/libcurl/ - cp -r curl/include libcurl_android/jni/libcurl/ cd libcurl_android ${NDK}/ndk-build echo "Copy libcurl in workspace" cp -rf jni/libcurl/include/curl ${INSTALLATION_DIR}/include/ - cp -f obj/local/${ABI}/libcurl.a ${INSTALLATION_DIR}/lib/ + cp -f obj/local/${ABI}/libcurl*.a ${INSTALLATION_DIR}/lib/ cd .. fi diff --git a/scripts/init_qt.sh b/scripts/init_qt.sh index 93cefd3a..065bffa6 100755 --- a/scripts/init_qt.sh +++ b/scripts/init_qt.sh @@ -42,11 +42,18 @@ if [ ! -d ${QT_HOME} ]; then fi fi -cp -f $DISTILLERY_INSTALL_DIR/lib/lib* ${QT_HOME}/5.7/android_${ANDROID_ARCH}/lib/ +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/ +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 - for folder in $(ls -d $DISTILLERY_INSTALL_DIR/include/*/); do - ln -s $folder ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/ - done + ln -s $DISTILLERY_INSTALL_DIR/include/ccnx ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/ + ln -s $DISTILLERY_INSTALL_DIR/include/boost ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/ + 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/ 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 diff --git a/scripts/update.sh b/scripts/update.sh index e34a6261..e169cd2f 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -28,7 +28,5 @@ git pull cd ../.. cd src/libicnet git pull -cd ../.. -cd src/viper -git pull -cd ../..
\ No newline at end of file +cd ../.. + |