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

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

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

Revert "Shared stl support"

This reverts commit 1555766a88eaefeda0f5772817c807f1db358290.

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

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

diff --git a/build_sdk.sh b/build_sdk.sh
index 6199d96..0d63444 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,7 +1292,6 @@ 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
 
@@ -2040,4 +2039,5 @@ removeUnusedPackages
 
 prepareSDKRepository
 prepareMinistroRepository
+
 popd
diff --git a/config/config.xml b/config/config.xml
index 6cc9783..18ffabb 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 712adfb..30578a7 100644
--- a/sdk_vars.sh
+++ b/sdk_vars.sh
@@ -1,4 +1,4 @@
-MINISTRO_VERSION="0.403" #Ministro repo version
+MINISTRO_VERSION="0.4" #Ministro repo version
 
 OSTYPE_MAJOR=${OSTYPE//[0-9.]/}
 


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