[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [necessitas-tools] /: Shared stl support
From:       BogDan Vatra <bogdan () kde ! org>
Date:       2012-08-31 17:52:36
Message-ID: 20120831175236.1AC05A60D3 () git ! kde ! org
[Download RAW message or body]

Git commit c30826619292dde23b82a979159ae4a31acecb85 by BogDan Vatra.
Committed on 20/08/2012 at 19:48.
Pushed by vatra into branch 'master'.

Shared stl support

M  +2    -2    build_sdk.sh
M  +2    -2    config/config.xml
M  +1    -1    sdk_vars.sh

http://commits.kde.org/necessitas-tools/c30826619292dde23b82a979159ae4a31acecb85

diff --git a/build_sdk.sh b/build_sdk.sh
index 0d63444..6199d96 100755
--- a/build_sdk.sh
+++ b/build_sdk.sh
@@ -1281,8 +1281,8 @@ function compileNecessitasQt #params $1 architecture, $2 \
package path, $3 NDK_TA  rm -fr install
     rm -fr Android
     unset INSTALL_ROOT
-    make QtJar
     ../qt-src/android/androidconfigbuild.sh -l $NDK_TARGET -c 0 -q 0 -n \
$TEMP_PATH/android-ndk -a $ANDROID_ARCH -b 0 -k 1 -i $NQT_INSTALL_DIR || error_msg \
"Can't install android-qt" +    cp -f lib/libgnustl_shared.so $NQT_INSTALL_DIR/lib/
 
     mkdir -p $2/$1
     cp -rf $NQT_INSTALL_DIR/bin $2/$1
@@ -1292,6 +1292,7 @@ function compileNecessitasQt #params $1 architecture, $2 \
                package path, $3 NDK_TA
     mv qt-tools-${HOST_TAG}.7z \
$REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.$package_name/data/qt-tools-${HOST_TAG}.7z
  cp -rf $NQT_INSTALL_DIR/* $2/$1
     cp -rf ../qt-src/lib/*.xml $2/$1/lib/
+    cp -f lib/libgnustl_shared.so $2/$1/lib/
     cp -rf jar $2/$1/
     rm -fr $2/$1/bin
 
@@ -2039,5 +2040,4 @@ removeUnusedPackages
 
 prepareSDKRepository
 prepareMinistroRepository
-
 popd
diff --git a/config/config.xml b/config/config.xml
index 18ffabb..6cc9783 100644
--- a/config/config.xml
+++ b/config/config.xml
@@ -12,8 +12,8 @@
     <UninstallerName>SDKMaintenanceTool</UninstallerName>
     <RemoteRepositories>
         <Repository>
-<!--            <Url>http://files.kde.org/necessitas/sdk_master</Url> -->
-            <Url>http://filesmaster.kde.org/necessitas/test</Url>
+            <Url>http://files.kde.org/necessitas/sdk_master</Url>
+<!--            <Url>http://filesmaster.kde.org/necessitas/test</Url> -->
             <Required>true</Required>
         </Repository>
     </RemoteRepositories>
diff --git a/sdk_vars.sh b/sdk_vars.sh
index 30578a7..712adfb 100644
--- a/sdk_vars.sh
+++ b/sdk_vars.sh
@@ -1,4 +1,4 @@
-MINISTRO_VERSION="0.4" #Ministro repo version
+MINISTRO_VERSION="0.403" #Ministro repo version
 
 OSTYPE_MAJOR=${OSTYPE//[0-9.]/}
 


[prev in list] [next in list] [prev in thread] [next in thread]