From e8452794dcaf4a07b0b3ad055c58e103a9cc7f74 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 3 Sep 2011 19:25:26 +0100 Subject: Fix for downloading/packaging my version of the ndk (needed until I update to r6b) --- Necessitas_SDK/build_sdk.sh | 51 +++++++++++----------- .../meta/installscript.qs | 10 ++--- .../meta/package.xml | 8 ++-- Necessitas_SDK/sdk_vars.sh | 2 +- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh index 28d0a5d..e0f8982 100755 --- a/Necessitas_SDK/build_sdk.sh +++ b/Necessitas_SDK/build_sdk.sh @@ -596,43 +596,44 @@ function prepareNDKs rm -fr android-ndk-${ANDROID_NDK_VERSION} fi + # mingw android NDKs are only r6 for now, not r6b. # repack mingw android windows NDK - if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-ma-windows.7z ] + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-windows.7z ] then - downloadIfNotExists android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-windows.7z http://mingw-and-ndk.googlecode.com/files/android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-windows.7z -# cp $REPO_SRC_PATH/ndk-packages/android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-windows.7z . - rm -fr android-ndk-${ANDROID_NDK_VERSION} - 7za x android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-windows.7z - $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-ma-windows.7z + downloadIfNotExists android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-windows.7z http://mingw-and-ndk.googlecode.com/files/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-windows.7z +# cp $REPO_SRC_PATH/ndk-packages/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-windows.7z . + rm -fr android-ndk-${ANDROID_NDK_MAJOR_VERSION} + 7za x android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-windows.7z + $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_MAJOR_VERSION} android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-windows.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data - mv android-ndk-${ANDROID_NDK_VERSION}-ma-windows.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-ma-windows.7z - rm -fr android-ndk-${ANDROID_NDK_VERSION} + mv android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-windows.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-windows.7z + rm -fr android-ndk-${ANDROID_NDK_MAJOR_VERSION} fi # repack mingw android mac NDK - if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-ma-darwin-x86.7z ] + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-darwin-x86.7z ] then - downloadIfNotExists android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z http://mingw-and-ndk.googlecode.com/files/android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z -# cp $REPO_SRC_PATH/ndk-packages/android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z . - rm -fr android-ndk-${ANDROID_NDK_VERSION} - 7za x android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z - $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-ma-darwin-x86.7z + downloadIfNotExists android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z http://mingw-and-ndk.googlecode.com/files/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z +# cp $REPO_SRC_PATH/ndk-packages/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z . + rm -fr android-ndk-${ANDROID_NDK_MAJOR_VERSION} + 7za x android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-darwin-x86.7z + $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_MAJOR_VERSION} android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-darwin-x86.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data - mv android-ndk-${ANDROID_NDK_VERSION}-ma-darwin-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-ma-darwin-x86.7z - rm -fr android-ndk-${ANDROID_NDK_VERSION} + mv android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-darwin-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-darwin-x86.7z + rm -fr android-ndk-${ANDROID_NDK_MAJOR_VERSION} fi # repack mingw android linux-x86 NDK - if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-ma-linux-x86.7z ] + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-linux-x86.7z ] then - downloadIfNotExists android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-linux-x86.7z http://mingw-and-ndk.googlecode.com/files/android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-linux-x86.7z -# cp $REPO_SRC_PATH/ndk-packages/android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-linux-x86.7z . - rm -fr android-ndk-${ANDROID_NDK_VERSION} - 7za x android-ndk-${ANDROID_NDK_VERSION}-gdb-7.3.50.20110709-linux-x86.7z - $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-ma-linux-x86.7z + downloadIfNotExists android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-linux-x86.7z http://mingw-and-ndk.googlecode.com/files/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-linux-x86.7z +# cp $REPO_SRC_PATH/ndk-packages/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-linux-x86.7z . + rm -fr android-ndk-${ANDROID_NDK_MAJOR_VERSION} + 7za x android-ndk-${ANDROID_NDK_MAJOR_VERSION}-gdb-7.3.50.20110709-linux-x86.7z + $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_MAJOR_VERSION} android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-linux-x86.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data - mv android-ndk-${ANDROID_NDK_VERSION}-ma-linux-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-ma-linux-x86.7z - rm -fr android-ndk-${ANDROID_NDK_VERSION} + mv android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-linux-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.ma_${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_MAJOR_VERSION}-ma-linux-x86.7z + rm -fr android-ndk-${ANDROID_NDK_MAJOR_VERSION} fi if [ $BUILD_ANDROID_GIT_NDK = 1 ] @@ -1533,7 +1534,7 @@ function setPackagesVariables patchPackage "@@NECESSITAS_QT_CREATOR_VERSION@@" $NECESSITAS_QT_CREATOR_VERSION "org.kde.necessitas.tools.qtcreator" patchPackage "@@ANDROID_NDK_VERSION@@" $ANDROID_NDK_VERSION "org.kde.necessitas.misc.ndk.r6" - patchPackage "@@ANDROID_NDK_VERSION@@" $ANDROID_NDK_VERSION "org.kde.necessitas.misc.ndk.ma_r6" + patchPackage "@@ANDROID_NDK_MAJOR_VERSION@@" $ANDROID_NDK_MAJOR_VERSION "org.kde.necessitas.misc.ndk.ma_r6" patchPackage "@@ANDROID_API_4_VERSION@@" $ANDROID_API_4_VERSION "org.kde.necessitas.misc.sdk.android_4" patchPackage "@@ANDROID_API_5_VERSION@@" $ANDROID_API_5_VERSION "org.kde.necessitas.misc.sdk.android_5" diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/installscript.qs index 0fba60a..933e48d 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/installscript.qs @@ -22,15 +22,15 @@ function Component() { if (installer.value("os") == "x11") { - component.addDownloadableArchive( "android-ndk-@@ANDROID_NDK_VERSION@@-ma-linux-x86.7z" ); + component.addDownloadableArchive( "android-ndk-@@ANDROID_NDK_MAJOR_VERSION@@-ma-linux-x86.7z" ); } else if (installer.value("os") == "win") { - component.addDownloadableArchive( "android-ndk-@@ANDROID_NDK_VERSION@@-ma-windows.7z" ); + component.addDownloadableArchive( "android-ndk-@@ANDROID_NDK_MAJOR_VERSION@@-ma-windows.7z" ); } else if (installer.value("os") == "mac") { - component.addDownloadableArchive( "android-ndk-@@ANDROID_NDK_VERSION@@-ma-darwin-x86.7z" ); + component.addDownloadableArchive( "android-ndk-@@ANDROID_NDK_MAJOR_VERSION@@-ma-darwin-x86.7z" ); } } } @@ -44,7 +44,7 @@ Component.prototype.createOperations = function() "@TargetDir@", "AndroidConfigurations", "NDKLocation", - "@TargetDir@/android-ndk-@@ANDROID_NDK_VERSION@@" ); + "@TargetDir@/android-ndk-@@ANDROID_NDK_MAJOR_VERSION@@" ); // set NDK toolchain version component.addOperation( "SetQtCreatorValue", "@TargetDir@", @@ -53,7 +53,7 @@ Component.prototype.createOperations = function() "arm-linux-androideabi-4.4.3" ); // set DEFAULT gdb location - var gdbPath = "@TargetDir@/android-ndk-@@ANDROID_NDK_VERSION@@/toolchains/arm-linux-androideabi-4.4.3/prebuilt/"; + var gdbPath = "@TargetDir@/android-ndk-@@ANDROID_NDK_MAJOR_VERSION@@/toolchains/arm-linux-androideabi-4.4.3/prebuilt/"; var gdbserverPath = gdbPath+"gdbserver"; if (installer.value("os") == "x11") { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/package.xml index 3f669df..2951c7c 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.ma_r6/meta/package.xml @@ -1,10 +1,10 @@ - Android NDK-@@ANDROID_NDK_VERSION@@ Experimental - Android NDK-@@ANDROID_NDK_VERSION@@ Experimental, includes binutils 2.10.1 and gdb 7.3.50.20110709 - 5.0.0-@@ANDROID_NDK_VERSION@@ + Android NDK-@@ANDROID_NDK_MAJOR_VERSION@@ Experimental + Android NDK-@@ANDROID_NDK_MAJOR_VERSION@@ Experimental, includes binutils 2.10.1 and gdb 7.3.50.20110709 + 5.0.0-@@ANDROID_NDK_MAJOR_VERSION@@ @@TODAY@@ - org.kde.necessitas.misc.ndk.ma_@@ANDROID_NDK_VERSION@@ + org.kde.necessitas.misc.ndk.ma_@@ANDROID_NDK_MAJOR_VERSION@@ org.kde.necessitas.tools.qtcreator 90 diff --git a/Necessitas_SDK/sdk_vars.sh b/Necessitas_SDK/sdk_vars.sh index 9e4b58a..80c7d40 100644 --- a/Necessitas_SDK/sdk_vars.sh +++ b/Necessitas_SDK/sdk_vars.sh @@ -30,7 +30,7 @@ NECESSITAS_QTMOBILITY_VERSION="1.2.0" #Necessitas QtMobility Version # NDK variables BUILD_ANDROID_GIT_NDK=0 # Latest and the greatest NDK built from sources -ANDROID_NDK_MAJOR_VERSION=r6 # NDK major version, used by package name +ANDROID_NDK_MAJOR_VERSION=r6 # NDK major version, used by package name (and ma ndk) ANDROID_NDK_VERSION=r6b # NDK full package version # SDK variables -- cgit v1.2.3