Updated Google Android bits to latest, fix some build_sdk.sh bugs.

Add Android API 13 (3.2_r01)

Update Android ndk version from r6 to r6b (ANDROID_NDK_VERSION)

Update Android platform tools from r04 to r06 (ANDROID_PLATFORM_TOOLS_VERSION)

Update Android sdk version from r11 to r12 (ANDROID_SDK_VERSION)

Fix some calls to doSed when editing paths (changed delims to #)

Make patchPackage function ok in the face of missing folders (it warns too)

4 files changed, 79 insertions, 15 deletions

diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh
index af3cceb..28d0a5d 100755
--- a/Necessitas_SDK/build_sdk.sh
+++ b/Necessitas_SDK/build_sdk.sh
@@ -522,7 +522,7 @@ function makeInstallMinGWLibsAndTools
     if [ ! -f /usr/lib/libz.a ] ; then
         tar -xvzf zlib-1.2.5.tar.gz
         pushd zlib-1.2.5
-        doSed $"s/usr\/local/usr/" win32/Makefile.gcc
+        doSed $"s#usr/#local/usr#" win32/Makefile.gcc
         make -f win32/Makefile.gcc
         export INCLUDE_PATH=/usr/include
         export LIBRARY_PATH=/usr/lib
@@ -1122,6 +1122,11 @@ function prepareSDKs
     repackSDK android-${ANDROID_API_12_VERSION}-linux android-${ANDROID_API_12_VERSION}-linux android-sdk-linux_x86/platforms android-12
     repackSDK android-${ANDROID_API_12_VERSION}-linux android-${ANDROID_API_12_VERSION}-macosx android-sdk-mac_x86/platforms android-12
     repackSDK android-${ANDROID_API_12_VERSION}-linux android-${ANDROID_API_12_VERSION}-windows android-sdk-windows/platforms android-12
+
+    # repack api-13
+    repackSDK android-${ANDROID_API_13_VERSION}-linux android-${ANDROID_API_13_VERSION}-linux android-sdk-linux_x86/platforms android-13
+    repackSDK android-${ANDROID_API_13_VERSION}-linux android-${ANDROID_API_13_VERSION}-macosx android-sdk-mac_x86/platforms android-13
+    repackSDK android-${ANDROID_API_13_VERSION}-linux android-${ANDROID_API_13_VERSION}-windows android-sdk-windows/platforms android-13
 }
 
 function patchQtFiles
@@ -1491,7 +1496,8 @@ function patchPackages
     do
         for file_name in `find . -name $files_name`
         do
-            doSed $"s/$1/$2/g" $file_name
+            # Can't use / as a delimiter for paths.
+            doSed $"s#$1#$2#g" $file_name
         done
     done
     popd
@@ -1499,15 +1505,19 @@ function patchPackages
 
 function patchPackage
 {
-    pushd $REPO_PATH_PACKAGES/$3
-    for files_name in "*.qs" "*.xml"
-    do
-        for file_name in `find . -name $files_name`
+    if [ -d $REPO_PATH_PACKAGES/$3 ] ; then
+        pushd $REPO_PATH_PACKAGES/$3
+        for files_name in "*.qs" "*.xml"
         do
-            doSed $"s/$1/$2/g" $file_name
+            for file_name in `find . -name $files_name`
+            do
+                doSed $"s#$1#$2#g" $file_name
+            done
         done
-    done
-    popd
+        popd
+    else
+        echo "patchPackage : Warning, failed to find directory $REPO_PATH_PACKAGES/$3"
+    fi
 }
 
 function setPackagesVariables
@@ -1534,7 +1544,7 @@ function setPackagesVariables
     patchPackage "@@ANDROID_API_10_VERSION@@" $ANDROID_API_10_VERSION "org.kde.necessitas.misc.sdk.android_10"
     patchPackage "@@ANDROID_API_11_VERSION@@" $ANDROID_API_11_VERSION "org.kde.necessitas.misc.sdk.android_11"
     patchPackage "@@ANDROID_API_12_VERSION@@" $ANDROID_API_12_VERSION "org.kde.necessitas.misc.sdk.android_12"
-    patchPackage "@@ANDROID_API_13_VERSION@@" $ANDROID_API_12_VERSION "org.kde.necessitas.misc.sdk.android_13"
+    patchPackage "@@ANDROID_API_13_VERSION@@" $ANDROID_API_13_VERSION "org.kde.necessitas.misc.sdk.android_13"
     patchPackage "@@ANDROID_PLATFORM_TOOLS_VERSION@@" $ANDROID_PLATFORM_TOOLS_VERSION "org.kde.necessitas.misc.sdk.platform_tools"
     patchPackage "@@ANDROID_SDK_VERSION@@" $ANDROID_SDK_VERSION "org.kde.necessitas.misc.sdk.base"
 }
@@ -1682,9 +1692,9 @@ prepareNecessitasQt
 # git clone often fails for webkit
 prepareNecessitasQtWebkit
 
-#if [ "$OSTYPE" != "msys" ] ; then
+if [ "$OSTYPE" != "msys" ] ; then
     prepareNecessitasQtMobility # if [[ `gcc --version` =~ .*llvm.* ]]; => syntax error near `=~'
-#fi
+fi
 
 prepareWindowsPackages
 setPackagesVariables
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_13/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_13/meta/installscript.qs
new file mode 100644
index 0000000..b76137b
--- /dev/null
+++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_13/meta/installscript.qs
@@ -0,0 +1,42 @@
+/*
+    Copyright (c) 2011, BogDan Vatra <bog_dan_ro@yahoo.com>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// constructor
+function Component()
+{
+    if( component.fromOnlineRepository )
+    {
+        if (installer.value("os") == "x11")
+        {
+            component.addDownloadableArchive( "android-@@ANDROID_API_13_VERSION@@-linux.7z" );
+        }
+        else if (installer.value("os") == "win")
+        {
+            component.addDownloadableArchive( "android-@@ANDROID_API_13_VERSION@@-windows.7z" );
+        }
+        else if (installer.value("os") == "mac")
+        {
+            component.addDownloadableArchive( "android-@@ANDROID_API_13_VERSION@@-macosx.7z" );
+        }
+    }
+}
+
+Component.prototype.createOperations = function()
+{
+    // Call the base createOperations(unpacking ...)
+    component.createOperations();
+}
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_13/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_13/meta/package.xml
new file mode 100644
index 0000000..c2670c2
--- /dev/null
+++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_13/meta/package.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<Package>
+    <DisplayName>API 13</DisplayName>
+    <Description>Android SDK API 13 (@@ANDROID_API_13_VERSION@@)</Description>
+    <Version>@@ANDROID_API_13_VERSION@@</Version>
+    <ReleaseDate>@@TODAY@@</ReleaseDate>
+    <Name>org.kde.necessitas.misc.sdk.android_13</Name>
+    <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies>
+    <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies>
+    <Script>installscript.qs</Script>
+</Package>
diff --git a/Necessitas_SDK/sdk_vars.sh b/Necessitas_SDK/sdk_vars.sh
index b26affd..9e4b58a 100644
--- a/Necessitas_SDK/sdk_vars.sh
+++ b/Necessitas_SDK/sdk_vars.sh
@@ -31,11 +31,11 @@ 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_VERSION=r6 # NDK full package version
+ANDROID_NDK_VERSION=r6b # NDK full package version
 
 # SDK variables
-ANDROID_SDK_VERSION=r11
-ANDROID_PLATFORM_TOOLS_VERSION=r04
+ANDROID_SDK_VERSION=r12
+ANDROID_PLATFORM_TOOLS_VERSION=r06
 ANDROID_API_4_VERSION=1.6_r03
 ANDROID_API_5_VERSION=2.0_r01
 ANDROID_API_6_VERSION=2.0.1_r01
@@ -45,6 +45,7 @@ ANDROID_API_9_VERSION=2.3.1_r02
 ANDROID_API_10_VERSION=2.3.3_r01
 ANDROID_API_11_VERSION=3.0_r01
 ANDROID_API_12_VERSION=3.1_r01
+ANDROID_API_13_VERSION=3.2_r01
 
 # Make debug versions of host applications (Qt Creator and installer).
 MAKE_DEBUG_HOST_APPS=0