diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2011-09-03 23:04:04 +0100 |
|---|---|---|
| committer | Ray Donnelly <mingw.android@gmail.com> | 2011-09-03 23:04:04 +0100 |
| commit | 8e40b39d31a7b5f3a836b038fd3e2250bd69de34 (patch) | |
| tree | f1efcefef2a0fb4cdbcdd6f0023a6675296e7c6c | |
| parent | e8452794dcaf4a07b0b3ad055c58e103a9cc7f74 (diff) | |
do prepareNDKs before prepareGDBVersion
| -rwxr-xr-x | Necessitas_SDK/build_sdk.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh index e0f8982..6b833e5 100755 --- a/Necessitas_SDK/build_sdk.sh +++ b/Necessitas_SDK/build_sdk.sh @@ -380,7 +380,7 @@ function prepareNecessitasQtCreator pushd $QTC_PATH QTC_INST_PATH=$PWD/QtCreator$HOST_QT_CONFIG if [ ! -f all_done ] ; then - git checkout 2.3-stagging + git checkout 2.3-necessitas git pull $SHARED_QT_PATH/bin/qmake $HOST_QT_CFG $HOST_QM_CFG_OPTIONS -r || error_msg "Can't configure android-qt-creator" doMake "Can't compile $QTC_PATH" "all done" ma-make @@ -397,6 +397,7 @@ function prepareNecessitasQtCreator tar xvfz research-sdk-updater-plugin-master-snapshot-20110524185306.tar.gz fi pushd research-sdk-updater-plugin-master-snapshot-20110524185306 + doSed $"s/FutureProgress::DontKeepOnFinish/FutureProgress::HideOnFinish/" updateinfoplugin.cpp $SHARED_QT_PATH/bin/qmake $HOST_QT_CFG $HOST_QM_CFG_OPTIONS -r || error_msg "Can't configure sdk-updater-plugin" doMake "Can't compile sdk-updater-plugin" "all done" ma-make make install @@ -1682,9 +1683,9 @@ prepareHostQt prepareSdkInstallerTools prepareOpenJDK prepareAnt +prepareNDKs prepareGDBVersion head $HOST_TAG prepareGDBVersion head -prepareNDKs prepareSDKs prepareNecessitasQtCreator prepareNecessitasQt |