diff options
| author | BogDan Vatra <bog_dan_ro@yahoo.com> | 2011-10-20 19:12:34 +0300 |
|---|---|---|
| committer | BogDan Vatra <bog_dan_ro@yahoo.com> | 2011-10-20 19:12:34 +0300 |
| commit | 225473ef5ad95365872cf81133fedeb630a022e2 (patch) | |
| tree | f0a9aca44e8cd5593c7964d5587d9d720052375b | |
| parent | 486811ed4d7d01449597af88b1fbc2992d9c5b34 (diff) | |
| parent | e41868a3119245c5002eb21c1bc1369a0654c85e (diff) | |
Merge branch 'unstable' of git.kde.org:ministro into unstable
69 files changed, 1487 insertions, 797 deletions
diff --git a/Ministro/res/values-et/strings.xml b/Ministro/res/values-et/strings.xml index 29c5ae8..525f858 100644 --- a/Ministro/res/values-et/strings.xml +++ b/Ministro/res/values-et/strings.xml @@ -2,21 +2,21 @@ <resources> <string name="app_name">Ministro</string> <string name="repositories_prompt">Vali varamu</string> - <string name="incompatible_ministo_api">Ministro ei ühildu selle programmiga. Palun uuenda Ministro teenust.</string> - <string name="ministro_network_access_msg">Ministro vajab võrgu ligipääsu. Aktiveeri mobiilne internet või WiFi.</string> + <string name="incompatible_ministo_api">Ministro ei Ć¼hildu selle programmiga. Palun uuenda Ministro teenust.</string> + <string name="ministro_network_access_msg">Ministro vajab vƵrgu ligipƤƤsu. Aktiveeri mobiilne internet vƵi WiFi.</string> <string name="settings_msg">Seaded</string> - <string name="wait_for_network_connection_msg">Ootan võrguühendust</string> + <string name="wait_for_network_connection_msg">Ootan vƵrguĆ¼hendust</string> <string name="download_app_libs_msg"> %1$s vajab lisateeke.\nSoovite need kohe alla laadida?</string> <string name="start_downloading_msg">Alustan allalaadimist...</string> <string name="downloading_qt_libraries_msg">Laadin alla Qt teeke</string> <string name="checking_libraries_msg">Kontrollin teeke. Palun oota...</string> - <string name="extracting_SSL_msg">Eraldan välja SSL juurserte. Palun oota...</string> + <string name="extracting_SSL_msg">Eraldan vƤlja SSL juurserte. Palun oota...</string> <string name="new_qt_libs_msg">Uued Qt teegid leitud</string> <string name="new_qt_libs_tap_msg">Uued Qt teegid leitud, puuduta uuenduse alustamiseks.</string> - <string name="ministro_repository_msg">Ministro kasutab %1$s varamut.</string> + <string name="ministro_repository_msg">Uued Qt teegid leitud, puuduta uuenduse alustamiseks.</string> <string name="ministro_repository_changed_msg">Ministro varamu on muutunud.</string> <string name="ministro_update_msg">Ministro uuendus</string> <string name="ministro_repository_changed_tap_msg">Ministro varamu on muutunud, puuduta uuenduse alustamiseks.</string> <string name="invalid_parameters">Vigased parameetrid</string> - <string name="dependencies_error">Ministro ei suuda selle programmi sõltuvusi lahendada.</string> + <string name="dependencies_error">Ministro ei suuda selle programmi sƵltuvusi lahendada.</string> </resources> diff --git a/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java b/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java index 11568b9..65f6985 100644 --- a/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java +++ b/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java @@ -17,11 +17,14 @@ package org.kde.necessitas.ministro; +import java.io.BufferedReader; +import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; @@ -67,7 +70,7 @@ public class MinistroActivity extends Activity { public native static int nativeChmode(String filepath, int mode); - private static final String DOMAIN_NAME="http://files.kde.org/necessitas/ministro/"; + private static final String DOMAIN_NAME="http://files.kde.org/necessitas/ministro/necessitas/"; private String[] m_modules; private int m_id=-1; @@ -187,7 +190,7 @@ public class MinistroActivity extends Activity return new URL(DOMAIN_NAME+MinistroService.getRepository(c)+"/android/"+android.os.Build.CPU_ABI+"/android-"+android.os.Build.VERSION.SDK_INT+"/versions.xml"); } - private static URL getLibsXmlUrl(Context c, double version) throws MalformedURLException + private static URL getLibsXmlUrl(Context c, String version) throws MalformedURLException { return new URL(DOMAIN_NAME+MinistroService.getRepository(c)+"/android/"+android.os.Build.CPU_ABI+"/android-"+android.os.Build.VERSION.SDK_INT+"/libs-"+version+".xml"); } @@ -201,6 +204,40 @@ public class MinistroActivity extends Activity return false; } + private static String deviceSupportedFeatures(String supportedFeatures) + { + if (null==supportedFeatures) + return ""; + String [] serverFeaturesList=supportedFeatures.trim().split(" "); + String [] deviceFeaturesList=null; + try { + FileInputStream fstream = new FileInputStream("/proc/cpuinfo"); + DataInputStream in = new DataInputStream(fstream); + BufferedReader br = new BufferedReader(new InputStreamReader(in)); + String strLine; + while ((strLine = br.readLine()) != null) + { + if (strLine.startsWith("Features")) + { + deviceFeaturesList=strLine.substring(strLine.indexOf(":")+1).trim().split(" "); + break; + } + } + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + + String features=""; + for(String sfeature: serverFeaturesList) + for (String dfeature: deviceFeaturesList) + if (sfeature.equals(dfeature)) + features+="_"+dfeature; + + return features; + } + + public static double downloadVersionXmlFile(Context c, boolean checkOnly) { if (!isOnline(c)) @@ -221,8 +258,10 @@ public class MinistroActivity extends Activity if (checkOnly) return version; - - connection = getLibsXmlUrl(c, version).openConnection(); + String supportedFeatures=null; + if (root.hasAttribute("features")) + supportedFeatures=root.getAttribute("features"); + connection = getLibsXmlUrl(c, version+deviceSupportedFeatures(supportedFeatures)).openConnection(); connection.setRequestProperty("Accept-Encoding", "gzip,deflate"); File file= new File(MinistroService.instance().getVersionXmlFile()); file.delete(); @@ -623,7 +662,7 @@ public class MinistroActivity extends Activity File dir=new File(m_qtLibsRootPath); dir.mkdirs(); nativeChmode(m_qtLibsRootPath, 0755); - bindService(new Intent("org.kde.necessitas.ministro"), m_ministroConnection, Context.BIND_AUTO_CREATE); + bindService(new Intent("org.kde.necessitas.ministro.IMinistro"), m_ministroConnection, Context.BIND_AUTO_CREATE); } @Override diff --git a/MinistroConfigurationTool/src/org/kde/ministro/config/MinistroConfigurationToolActivity.java b/MinistroConfigurationTool/src/org/kde/ministro/config/MinistroConfigurationToolActivity.java new file mode 100644 index 0000000..d62b828 --- /dev/null +++ b/MinistroConfigurationTool/src/org/kde/ministro/config/MinistroConfigurationToolActivity.java @@ -0,0 +1,67 @@ +/* + 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/>. +*/ + +package org.kde.ministro.config; + +import android.app.Activity; +import android.app.AlertDialog; +import android.content.ComponentName; +import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; + +public class MinistroConfigurationToolActivity extends Activity { + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + try + { + Intent intent = new Intent(); + intent.setComponent(new ComponentName("org.kde.necessitas.ministro", "org.kde.necessitas.ministro.MinistroConfigActivity")); + startActivity(intent); + finish(); + } + catch (Exception e) { + AlertDialog.Builder downloadDialog = new AlertDialog.Builder(this); + downloadDialog.setMessage("This tool needs latest Ministro service. Would you like to install it?"); + downloadDialog.setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialogInterface, int i) { + try + { + Uri uri = Uri.parse("market://search?q=pname:org.kde.necessitas.ministro"); + Intent intent = new Intent(Intent.ACTION_VIEW, uri); + startActivity(intent); + finish(); + } + catch (Exception e) { + e.printStackTrace(); + finish(); + } + } + }); + + downloadDialog.setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialogInterface, int i) { + finish(); + } + }); + downloadDialog.show(); + } + super.onCreate(savedInstanceState); + } +} diff --git a/Necessitas_SDK/build_ndk.sh b/Necessitas_SDK/build_ndk.sh index baffd9c..baffd9c 100755..100644 --- a/Necessitas_SDK/build_ndk.sh +++ b/Necessitas_SDK/build_ndk.sh diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh index 7f02fa8..8176055 100755 --- a/Necessitas_SDK/build_sdk.sh +++ b/Necessitas_SDK/build_sdk.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x # Copyright (c) 2011, BogDan Vatra <bog_dan_ro@yahoo.com> # Copyright (c) 2011, Ray Donnelly <mingw.android@gmail.com> @@ -21,6 +21,11 @@ . sdk_vars.sh +function help +{ + echo "Help" +} + while getopts "h:c:" arg; do case $arg in h) @@ -52,27 +57,32 @@ if [ "$OSTYPE" = "darwin9.0" -o "$OSTYPE" = "darwin10.0" ]; then # On Mac OS X, user accounts don't have write perms for /var, same is true for Ubuntu. sudo mkdir -p $TEMP_PATH sudo chmod 777 $TEMP_PATH - sudo mkdir -p $TEMP_PATH_PREFIX/www - sudo chmod 777 $TEMP_PATH_PREFIX/www + sudo mkdir -p $TEMP_PATH/out + sudo chmod 777 $TEMP_PATH/out STRIP="strip -S" CPRL="cp -RL" else - mkdir -p $TEMP_PATH + mkdir -p $TEMP_PATH/out/necessitas STRIP="strip -s" CPRL="cp -rL" fi +. sdk_cleanup.sh + # Global just because 2 functions use them, only acceptable values for GDB_VER are 7.2 and 7.3 -#GDB_VER=7.3 -GDB_VER=7.2 +GDB_VER=7.3 +#GDB_VER=7.2 pushd $TEMP_PATH -MINISTRO_REPO_PATH=$TEMP_PATH_PREFIX/www/necessitas/qt -REPO_PATH=$TEMP_PATH_PREFIX/www/necessitas/sdk -REPO_PATH_PACKAGES=$REPO_SRC_PATH/packages -# TODO :: Ask BogDan what this was here for -# cp -a $REPO_PATH_PACKAGES $TEMP_PATH_PREFIX/www/necessitas/sdk_src +MINISTRO_REPO_PATH=$TEMP_PATH/out/necessitas/qt/$CHECKOUT_BRANCH +REPO_PATH=$TEMP_PATH/out/necessitas/sdk +if [ ! -d $TEMP_PATH/out/necessitas/sdk_src/org.kde.necessitas ] +then + mkdir -p $TEMP_PATH/out/necessitas/sdk_src + cp -a $REPO_SRC_PATH/packages/* $TEMP_PATH/out/necessitas/sdk_src/ +fi +REPO_PATH_PACKAGES=$TEMP_PATH/out/necessitas/sdk_src STATIC_QT_PATH="" SHARED_QT_PATH="" SDK_TOOLS_PATH="" @@ -104,7 +114,7 @@ else JOBS=`sysctl -n hw.ncpu` JOBS=`expr $JOBS + 2` else - HOST_CFG_OPTIONS=" -platform linux-g++ " + HOST_CFG_OPTIONS=" -platform linux-g++ -arch i386" HOST_TAG=linux-x86 HOST_TAG_NDK=linux-x86 SHLIB_EXT=.so @@ -119,6 +129,21 @@ function error_msg exit 1 } +function createArchive # params $1 folder, $2 archive name, $3 extra params +{ + if [ $EXTERNAL_7Z != "" ] + then + EXTRA_PARAMS="" + if [ $HOST_TAG = "windows" ] + then + EXTRA_PARAMS="-l" + fi + $EXTERNAL_7Z $EXTERNAL_7Z_PARAMS -mmt=$JOBS $EXTRA_PARAMS $3 $2 $1 || error_msg "Can't create archive $EXTERNAL_7Z $EXTERNAL_7Z_PARAMS -mmt=$JOBS $2 $1" + else + $SDK_TOOLS_PATH/archivegen $1 $2 + fi +} + function removeAndExit { rm -fr $1 && error_msg "Can't download $1" @@ -164,7 +189,7 @@ function doMake done echo $2>all_done else - make -j$JOBS || error_msg $1 + make -j$JOBS $4|| error_msg $1 echo $2>all_done fi } @@ -213,20 +238,13 @@ function doSed fi } -function downloadLighthouseSource -{ - mkdir -p Android/Qt/$NECESSITAS_QT_VERSION_SHORT - pushd Android/Qt/$NECESSITAS_QT_VERSION_SHORT - if [ ! -d qt-src ] - then - git clone git://anongit.kde.org/android-qt.git qt-src|| error_msg "Can't clone android-qt" - fi +function cloneCheckoutKDEGitRepo #params $1 repo name, $2 branch +{ pushd qt-src - git checkout $CHECKOUT_BRANCH + git checkout $2 git pull popd - popd # Android/Qt/$NECESSITAS_QT_VERSION_SHORT } # $1 is either -d (debug build) or nothing. @@ -234,53 +252,18 @@ function prepareHostQt { # download, compile & install qt, it is used to compile the installer HOST_QT_CONFIG=$1 - if [ ! "$HOST_QT_VERSION" = "lighthouse" ] + if [ ! -d qt-src ] then -# if [ "$OSTYPE" = "msys" -o "$OSTYPE" = "darwin9.0" -o "$OSTYPE" = "darwin10.0" ] - if [ "1" = "1" ] - then - if [ ! -d $HOST_QT_SRCDIR ] - then - git clone git://gitorious.org/~mingwandroid/qt/mingw-android-official-qt.git $HOST_QT_SRCDIR || error_msg "Can't clone mingw qt" - pushd $HOST_QT_SRCDIR - if [ "$HOST_QT_BRANCH" = "4.8" ] ; then - # TODORMD :: Ask BogDan how to get it setup so "git checkout -b $HOST_QT_BRANCH" works for my 4.8 branch. - git checkout -b 4.8 refs/remotes/origin/4.8 - else - git checkout -b $HOST_QT_BRANCH - fi - popd - fi - else - if [ "$OSTYPE" = "msys" ] ; then - HOST_QT_SRC_ARCHIVE=$HOST_QT_VERSION_DL.zip - downloadIfNotExists HOST_QT_SRC_ARCHIVE http://get.qt.nokia.com/qt/source/$HOST_QT_SRC_ARCHIVE - if [ ! -d $HOST_QT_VERSION ] - then - unzip $HOST_QT_SRC_ARCHIVE || error_msg "Can't unzip $HOST_QT_SRC_ARCHIVE" - fi - else - HOST_QT_SRC_ARCHIVE=$HOST_QT_VERSION_DL.tar.gz - downloadIfNotExists HOST_QT_SRC_ARCHIVE http://get.qt.nokia.com/qt/source/$HOST_QT_SRC_ARCHIVE - if [ ! -d $HOST_QT_VERSION ] - then - tar -xzvf $HOST_QT_SRC_ARCHIVE || error_msg "Can't untar $HOST_QT_SRC_ARCHIVE" - fi - fi - fi - else - downloadLighthouseSource + git clone git://anongit.kde.org/android-qt.git qt-src|| error_msg "Can't clone ${1}" + pushd qt-src + git config --add remote.origin.fetch +refs/upstream/*:refs/remotes/upstream/* + git fetch + popd fi - #build qt statically, needed by Sdk installer - if [ "$HOST_QT_VERSION" = "lighthouse" ] ; then - HOST_QT_SRCDIR=lighthouse - fi - mkdir b-$HOST_QT_SRCDIR-st$HOST_QT_CONFIG - pushd b-$HOST_QT_SRCDIR-st$HOST_QT_CONFIG - OPTS_CFG=" -developer-build " + export QT_SRCDIR=$PWD/qt-src + if [ "$HOST_QT_CONFIG" = "-d" ] ; then - STATIC_QT_PATH_DEBUG=$PWD if [ "$OSTYPE" = "msys" ] ; then OPTS_CFG=" -debug " HOST_QT_CFG="CONFIG+=debug" @@ -291,22 +274,23 @@ function prepareHostQt fi fi else - STATIC_QT_PATH=$PWD - STATIC_QT_PATH_DEBUG=$PWD - if [ "$OSTYPE" = "msys" -o "$OSTYPE" = "darwin9.0" -o "$OSTYPE" = "darwin10.0" ] ; then - OPTS_CFG=" -release " - HOST_QT_CFG="CONFIG+=release" - fi + OPTS_CFG=" -release " + HOST_QT_CFG="CONFIG+=release QT+=network" fi + + # Even on Linux, static Qt 4.8 doesn't build! + mkdir static-build$HOST_QT_CONFIG + pushd static-build$HOST_QT_CONFIG + STATIC_QT_PATH=$PWD if [ ! -f all_done ] then + pushd $QT_SRCDIR + git checkout $HOST_QT_BRANCH + git pull + popd rm -fr * - if [ "$HOST_QT_VERSION" = "lighthouse" ] ; then - ../Android/Qt/4762/qt-src/configure -fast -nomake examples -nomake demos -nomake tests -system-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -static -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -qt-sql-sqlite -plugin-sql-sqlite -confirm-license $HOST_CFG_OPTIONS $HOST_CFG_OPTIONS_STATIC $OPTS_CFG -host-little-endian --prefix=$PWD || error_msg "Can't configure $HOST_QT_VERSION" - else - ../$HOST_QT_SRCDIR/configure -fast -nomake examples -nomake demos -nomake tests -system-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -static -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -qt-sql-sqlite -plugin-sql-sqlite -confirm-license $HOST_CFG_OPTIONS $HOST_CFG_OPTIONS_STATIC $OPTS_CFG -host-little-endian --prefix=$PWD || error_msg "Can't configure $HOST_QT_VERSION" - fi + $QT_SRCDIR/configure -fast -nomake examples -nomake demos -nomake tests -qt-zlib -no-gif -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -static -no-webkit -no-phonon -no-dbus -no-opengl -no-qt3support -no-xmlpatterns -no-svg -confirm-license $HOST_CFG_OPTIONS $HOST_CFG_OPTIONS_STATIC $OPTS_CFG -host-little-endian --prefix=$PWD || error_msg "Can't configure $HOST_QT_VERSION" doMake "Can't compile static $HOST_QT_VERSION" "all done" ma-make if [ "$OSTYPE" = "msys" ]; then # Horrible; need to fix this properly. @@ -318,17 +302,17 @@ function prepareHostQt popd #build qt shared, needed by QtCreator - mkdir b-$HOST_QT_SRCDIR-sh$HOST_QT_CONFIG - pushd b-$HOST_QT_SRCDIR-sh$HOST_QT_CONFIG + mkdir shared-build$HOST_QT_CONFIG + pushd shared-build$HOST_QT_CONFIG SHARED_QT_PATH=$PWD if [ ! -f all_done ] then + pushd $QT_SRCDIR + git checkout $HOST_QT_BRANCH + git pull + popd rm -fr * - if [ "$HOST_QT_VERSION" = "lighthouse" ] ; then - ../Android/Qt/4762/qt-src/configure -fast -nomake examples -nomake demos -nomake tests -system-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -shared -webkit -no-phonon -qt-sql-sqlite -plugin-sql-sqlite -no-qt3support -confirm-license $HOST_CFG_OPTIONS $OPTS_CFG -host-little-endian --prefix=$PWD || error_msg "Can't configure $HOST_QT_VERSION" - else - ../$HOST_QT_SRCDIR/configure -fast -nomake examples -nomake demos -nomake tests -system-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -shared -webkit -no-phonon -qt-sql-sqlite -plugin-sql-sqlite -no-qt3support -confirm-license $HOST_CFG_OPTIONS $OPTS_CFG -host-little-endian --prefix=$PWD || error_msg "Can't configure $HOST_QT_VERSION" - fi + $QT_SRCDIR/configure $HOST_CFG_OPTIONS -fast -nomake examples -nomake demos -nomake tests -system-zlib -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg -opensource -shared -webkit -no-phonon -qt-sql-sqlite -plugin-sql-sqlite -no-qt3support -confirm-license $HOST_CFG_OPTIONS $OPTS_CFG -host-little-endian --prefix=$PWD || error_msg "Can't configure $HOST_QT_VERSION" doMake "Can't compile shared $HOST_QT_VERSION" "all done" ma-make if [ "$OSTYPE" = "msys" ]; then # Horrible; need to fix this properly. @@ -338,23 +322,24 @@ function prepareHostQt fi fi popd + } function prepareSdkInstallerTools { # get installer source code - SDK_TOOLS_PATH=$PWD/necessitas-installer-framework-$HOST_QT_BRANCH$HOST_QT_CONFIG/installerbuilder/bin - if [ ! -d necessitas-installer-framework-$HOST_QT_BRANCH$HOST_QT_CONFIG ] + SDK_TOOLS_PATH=$PWD/necessitas-installer-framework/installerbuilder/bin + if [ ! -d necessitas-installer-framework ] then - git clone git://gitorious.org/~taipan/qt-labs/necessitas-installer-framework.git necessitas-installer-framework-$HOST_QT_BRANCH$HOST_QT_CONFIG || error_msg "Can't clone necessitas-installer-framework" + git clone git://gitorious.org/~taipan/qt-labs/necessitas-installer-framework.git necessitas-installer-framework || error_msg "Can't clone necessitas-installer-framework" fi - pushd necessitas-installer-framework-$HOST_QT_BRANCH$HOST_QT_CONFIG/installerbuilder + pushd necessitas-installer-framework/installerbuilder git checkout $CHECKOUT_BRANCH git pull if [ ! -f all_done ] then - $STATIC_QT_PATH_DEBUG/bin/qmake CONFIG+=static $HOST_QT_CFG $HOST_QM_CFG_OPTIONS -r || error_msg "Can't configure necessitas-installer-framework" + $STATIC_QT_PATH/bin/qmake CONFIG+=static $HOST_QT_CFG $HOST_QM_CFG_OPTIONS -r || error_msg "Can't configure necessitas-installer-framework" doMake "Can't compile necessitas-installer-framework" "all done" ma-make fi popd @@ -380,8 +365,9 @@ function prepareNecessitasQtCreator pushd $QTC_PATH QTC_INST_PATH=$PWD/QtCreator$HOST_QT_CONFIG if [ ! -f all_done ] ; then - git checkout 2.3-necessitas + git checkout unstable git pull + export UPDATEINFO_DISABLE=false $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 fi @@ -389,18 +375,18 @@ function prepareNecessitasQtCreator export INSTALL_ROOT=$QTC_INST_PATH make install - #download and install sdk-updater-plugin - export QTC_SOURCE=$PWD - downloadIfNotExists research-sdk-updater-plugin-master-snapshot-20110524185306-updated.tar.gz http://android-lighthouse.googlecode.com/files/research-sdk-updater-plugin-master-snapshot-20110524185306-updated.tar.gz - if [ ! -d research-sdk-updater-plugin-master-snapshot-20110524185306 ] - then - tar xvfz research-sdk-updater-plugin-master-snapshot-20110524185306-updated.tar.gz - fi - pushd research-sdk-updater-plugin-master-snapshot-20110524185306 - $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 - popd +# #download and install sdk-updater-plugin +# export QTC_SOURCE=$PWD +# downloadIfNotExists research-sdk-updater-plugin-master-snapshot-20110524185306-updated.tar.gz http://android-lighthouse.googlecode.com/files/research-sdk-updater-plugin-master-snapshot-20110524185306-updated.tar.gz +# if [ ! -d research-sdk-updater-plugin-master-snapshot-20110524185306 ] +# then +# tar xvfz research-sdk-updater-plugin-master-snapshot-20110524185306-updated.tar.gz +# fi +# pushd research-sdk-updater-plugin-master-snapshot-20110524185306 +# $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 +# popd mkdir -p $QTC_INST_PATH/Qt/imports mkdir -p $QTC_INST_PATH/Qt/plugins @@ -452,7 +438,7 @@ function prepareNecessitasQtCreator find . -name "*$SHLIB_EXT" | xargs $STRIP fi popd - $SDK_TOOLS_PATH/archivegen QtCreator$HOST_QT_CONFIG qtcreator-${HOST_TAG}${HOST_QT_CONFIG}.7z + createArchive QtCreator$HOST_QT_CONFIG qtcreator-${HOST_TAG}${HOST_QT_CONFIG}.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.tools.qtcreator/data mv qtcreator-${HOST_TAG}${HOST_QT_CONFIG}.7z $REPO_PATH_PACKAGES/org.kde.necessitas.tools.qtcreator/data/qtcreator-${HOST_TAG}${HOST_QT_CONFIG}.7z popd @@ -566,7 +552,7 @@ function prepareNDKs downloadIfNotExists android-ndk-${ANDROID_NDK_VERSION}-windows.zip http://dl.google.com/android/ndk/android-ndk-${ANDROID_NDK_VERSION}-windows.zip rm -fr android-ndk-${ANDROID_NDK_VERSION} unzip android-ndk-${ANDROID_NDK_VERSION}-windows.zip - $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-windows.7z + createArchive android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-windows.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data mv android-ndk-${ANDROID_NDK_VERSION}-windows.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-windows.7z rm -fr android-ndk-${ANDROID_NDK_VERSION} @@ -578,7 +564,7 @@ function prepareNDKs downloadIfNotExists android-ndk-${ANDROID_NDK_VERSION}-darwin-x86.tar.bz2 http://dl.google.com/android/ndk/android-ndk-${ANDROID_NDK_VERSION}-darwin-x86.tar.bz2 rm -fr android-ndk-${ANDROID_NDK_VERSION} tar xjvf android-ndk-${ANDROID_NDK_VERSION}-darwin-x86.tar.bz2 - $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-darwin-x86.7z + createArchive android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-darwin-x86.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data mv android-ndk-${ANDROID_NDK_VERSION}-darwin-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-darwin-x86.7z rm -fr android-ndk-${ANDROID_NDK_VERSION} @@ -590,67 +576,79 @@ function prepareNDKs downloadIfNotExists android-ndk-${ANDROID_NDK_VERSION}-linux-x86.tar.bz2 http://dl.google.com/android/ndk/android-ndk-${ANDROID_NDK_VERSION}-linux-x86.tar.bz2 rm -fr android-ndk-${ANDROID_NDK_VERSION} tar xjvf android-ndk-${ANDROID_NDK_VERSION}-linux-x86.tar.bz2 - $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-linux-x86.7z + createArchive android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-linux-x86.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data mv android-ndk-${ANDROID_NDK_VERSION}-linux-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-linux-x86.7z 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_MAJOR_VERSION}-ma-windows.7z ] - then - 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_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_MAJOR_VERSION}-ma-darwin-x86.7z ] - then - 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_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_MAJOR_VERSION}-ma-linux-x86.7z ] - then - 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_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 - - export ANDROID_NDK_HOST=$HOST_TAG_NDK - if [ "$USE_MA_NDK" = "0" ]; then - USED_ANDROID_NDK_VERSION=r6b - else - USED_ANDROID_NDK_VERSION=r6 - fi - - if [ $BUILD_ANDROID_GIT_NDK = 1 ] - then - export ANDROID_NDK_ROOT=$PWD/android-ndk-${ANDROID_NDK_VERSION}-git - export ANDROID_NDK_FOLDER_NAME=android-ndk-${ANDROID_NDK_VERSION}-git - else - export ANDROID_NDK_ROOT=$PWD/android-ndk-${USED_ANDROID_NDK_VERSION} - export ANDROID_NDK_FOLDER_NAME=android-ndk-${USED_ANDROID_NDK_VERSION} - fi +# TODO Ray should uncomment/review it when Linaro toolchain is ready +# if [ $BUILD_ANDROID_GIT_NDK = 1 ] +# then +# downloadIfNotExists android-ndk-${ANDROID_NDK_VERSION}-linux-x86.tar.bz2 http://dl.google.com/android/ndk/android-ndk-${ANDROID_NDK_VERSION}-linux-x86.tar.bz2 +# rm -fr android-ndk-${ANDROID_NDK_VERSION} +# tar xjvf android-ndk-${ANDROID_NDK_VERSION}-linux-x86.tar.bz2 +# $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION} android-ndk-${ANDROID_NDK_VERSION}-linux-x86.7z +# mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data +# mv android-ndk-${ANDROID_NDK_VERSION}-linux-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_MAJOR_VERSION}/data/android-ndk-${ANDROID_NDK_VERSION}-linux-x86.7z +# 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_MAJOR_VERSION}-ma-windows.7z ] +# then +# 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_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_MAJOR_VERSION}-ma-darwin-x86.7z ] +# then +# 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_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_MAJOR_VERSION}-ma-linux-x86.7z ] +# then +# 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_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 +# +# export ANDROID_NDK_HOST=$HOST_TAG_NDK +# if [ "$USE_MA_NDK" = "0" ]; then +# ANDROID_NDK_VERSION=r6b +# else +# ANDROID_NDK_VERSION=r6 +# fi +# +# if [ $BUILD_ANDROID_GIT_NDK = 1 ] +# then +# export ANDROID_NDK_ROOT=$PWD/android-ndk-${ANDROID_NDK_VERSION}-git +# export ANDROID_NDK_FOLDER_NAME=android-ndk-${ANDROID_NDK_VERSION}-git +# else + export ANDROID_NDK_ROOT=$PWD/android-ndk-${ANDROID_NDK_VERSION} + export ANDROID_NDK_FOLDER_NAME=android-ndk-${ANDROID_NDK_VERSION} +# fi if [ ! -d $ANDROID_NDK_FOLDER_NAME ]; then if [ "$USE_MA_NDK" = "0" ]; then @@ -697,7 +695,7 @@ function prepareNDKs popd rm -fr android_git_ndk mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_VERSION}_git/data - $SDK_TOOLS_PATH/archivegen android-ndk-${ANDROID_NDK_VERSION}-git $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_VERSION}_git/data/android-ndk-${ANDROID_NDK_VERSION}-git-${HOST_TAG_NDK}.7z + createArchive android-ndk-${ANDROID_NDK_VERSION}-git $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ndk.${ANDROID_NDK_VERSION}_git/data/android-ndk-${ANDROID_NDK_VERSION}-git-${HOST_TAG_NDK}.7z fi fi @@ -880,14 +878,15 @@ function prepareGDB OLDPATH=$PATH export PATH=$install_dir/bin/:$PATH if [ -z $GDB_TARG_HOST_TAG ] ; then - CC=$CC32 CXX=$CXX32 CFLAGS="-O0 -g" $GDB_ROOT_PATH/configure --enable-initfini-array --enable-gdbserver=no --enable-tui=yes --with-sysroot=$TEMP_PATH/android-ndk-${USED_ANDROID_NDK_VERSION}/platforms/android-9/arch-arm --with-python=$install_dir --with-expat=yes --with-libexpat-prefix=$install_dir --prefix=$target_dir --target=arm-elf-linux --host=$HOST --build=$HOST --disable-nls + CC=$CC32 CXX=$CXX32 CFLAGS="-O0 -g" $GDB_ROOT_PATH/configure --enable-initfini-array --enable-gdbserver=no --enable-tui=yes --with-sysroot=$TEMP_PATH/android-ndk-${ANDROID_NDK_VERSION}/platforms/android-9/arch-arm --with-python=$install_dir --with-expat=yes --with-libexpat-prefix=$install_dir --prefix=$target_dir --target=arm-elf-linux --host=$HOST --build=$HOST --disable-nls else CC=$CC32 CXX=$CXX32 $GDB_ROOT_PATH/configure --enable-initfini-array --enable-gdbserver=no --enable-tui=yes --with-python=$install_dir --with-expat=yes --with-libexpat-prefix=$install_dir --prefix=$target_dir --target=$HOST --host=$HOST --build=$HOST --disable-nls fi doMake "Can't compile android gdb $GDB_VER" "all done" cp -a gdb/gdb$EXE_EXT $target_dir/ - cp -a gdb/gdbtui$EXE_EXT $target_dir/ -# $STRIP $target_dir/gdb$EXE_EXT .. Just while I fix native host GDB (can't debug the installer exe) and thumb-2 issues. +# cp -a gdb/gdbtui$EXE_EXT $target_dir/ + $STRIP $target_dir/gdb$EXE_EXT # .. Just while I fix native host GDB (can't debug the installer exe) and thumb-2 issues. +# $STRIP $target_dir/gdbtui$EXE_EXT # .. Just while I fix native host GDB (can't debug the installer exe) and thumb-2 issues. export PATH=$OLDPATH popd fi @@ -902,7 +901,7 @@ function prepareGDB find . -name tests | xargs rm -fr popd - $SDK_TOOLS_PATH/archivegen $GDB_FLDR_NAME $GDB_PKG_NAME.7z + createArchive $GDB_FLDR_NAME $GDB_PKG_NAME.7z mkdir -p $package_path mv $GDB_PKG_NAME.7z $package_path/ @@ -937,11 +936,11 @@ function prepareGDBServer pushd gdb-src/build-gdbserver-$GDB_VER mkdir android-sysroot - $CPRL $TEMP_PATH/android-ndk-${USED_ANDROID_NDK_VERSION}/platforms/android-9/arch-arm/* android-sysroot/ || error_msg "Can't copy android sysroot" + $CPRL $TEMP_PATH/android-ndk-${ANDROID_NDK_VERSION}/platforms/android-9/arch-arm/* android-sysroot/ || error_msg "Can't copy android sysroot" rm -f android-sysroot/usr/lib/libthread_db* rm -f android-sysroot/usr/include/thread_db.h - TOOLCHAIN_PREFIX=$TEMP_PATH/android-ndk-${USED_ANDROID_NDK_VERSION}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$HOST_TAG_NDK/bin/arm-linux-androideabi + TOOLCHAIN_PREFIX=$TEMP_PATH/android-ndk-${ANDROID_NDK_VERSION}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$HOST_TAG_NDK/bin/arm-linux-androideabi OLD_CC="$CC" OLD_CFLAGS="$CFLAGS" @@ -956,7 +955,7 @@ function prepareGDBServer export LDFLAGS="-static -Wl,-z,nocopyreloc -Wl,--no-undefined $PWD/android-sysroot/usr/lib/crtbegin_static.o -lc -lm -lgcc -lc $PWD/android-sysroot/usr/lib/crtend_android.o" fi - LIBTHREAD_DB_DIR=$TEMP_PATH/android-ndk-${USED_ANDROID_NDK_VERSION}/sources/android/libthread_db/gdb-7.1.x + LIBTHREAD_DB_DIR=$TEMP_PATH/android-ndk-${ANDROID_NDK_VERSION}/sources/android/libthread_db/gdb-7.1.x cp $LIBTHREAD_DB_DIR/thread_db.h android-sysroot/usr/include/ $TOOLCHAIN_PREFIX-gcc$EXE_EXT --sysroot=$PWD/android-sysroot -o $PWD/android-sysroot/usr/lib/libthread_db.a -c $LIBTHREAD_DB_DIR/libthread_db.c || error_msg "Can't compile android threaddb" $GDB_ROOT_PATH/gdb/gdbserver/configure --host=arm-eabi-linux --with-libthread-db=$PWD/android-sysroot/usr/lib/libthread_db.a || error_msg "Can't configure gdbserver" @@ -973,7 +972,7 @@ function prepareGDBServer cp gdbserver $PWD/gdbserver-$GDB_VER/gdbserver fi - $SDK_TOOLS_PATH/archivegen gdbserver-$GDB_VER gdbserver-$GDB_VER.7z + createArchive gdbserver-$GDB_VER gdbserver-$GDB_VER.7z mkdir -p $package_path mv gdbserver-$GDB_VER.7z $package_path/ @@ -982,22 +981,6 @@ function prepareGDBServer popd #gdb-build } -function repackSDK -{ - package_name=${4//-/_} # replace - with _ - if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data/$2.7z ] - then - downloadIfNotExists $1.zip http://dl.google.com/android/repository/$1.zip - unzip $1.zip - mkdir -p $3 - mv $1 $3/$4 - $SDK_TOOLS_PATH/archivegen $3 $2.7z - mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data - mv $2.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data/$2.7z - rm -fr $3 - fi -} - function prepareGDBVersion { GDB_VER=$1 @@ -1020,46 +1003,82 @@ function prepareGDBVersion fi } +function repackSDK +{ + package_name=${4//-/_} # replace - with _ + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data/$2.7z ] + then + downloadIfNotExists $1.zip http://dl.google.com/android/repository/$1.zip + rm -fr temp_repack + mkdir temp_repack + pushd temp_repack + unzip ../$1.zip + mv * temp_name + mkdir -p $3 + mv temp_name $3/$4 + createArchive $3 $2.7z + mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data + mv $2.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data/$2.7z + popd + rm -fr temp_repack + fi +} + +function repackSDKPlatform-tools +{ + package_name=${4//-/_} # replace - with _ + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data/$2.7z ] + then + downloadIfNotExists $1.zip http://dl.google.com/android/repository/$1.zip + rm -fr android-sdk + unzip $1.zip + mkdir -p $3 + mv $4 $3/$4 + createArchive $3 $2.7z + mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data + mv $2.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.$package_name/data/$2.7z + rm -fr $3 + fi +} + + function prepareSDKs { echo "prepare SDKs" - if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-linux_x86.7z ] + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-linux.7z ] then - downloadIfNotExists android-sdk_${ANDROID_SDK_VERSION}-linux_x86.tgz http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-linux_x86.tgz - if [ ! -d android-sdk-linux_x86 ] - then - tar -xzvf android-sdk_${ANDROID_SDK_VERSION}-linux_x86.tgz - fi - $SDK_TOOLS_PATH/archivegen android-sdk-linux_x86 android-sdk_${ANDROID_SDK_VERSION}-linux_x86.7z + rm -fr android-sdk + downloadIfNotExists android-sdk_${ANDROID_SDK_VERSION}-linux.tgz http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-linux.tgz + tar -xzvf android-sdk_${ANDROID_SDK_VERSION}-linux.tgz + mv android-sdk-linux android-sdk + createArchive android-sdk android-sdk_${ANDROID_SDK_VERSION}-linux.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data - mv android-sdk_${ANDROID_SDK_VERSION}-linux_x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-linux_x86.7z - rm -fr android-sdk-linux_x86 + mv android-sdk_${ANDROID_SDK_VERSION}-linux.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-linux.7z + rm -fr android-sdk fi - if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-mac_x86.7z ] + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-macosx.7z ] then - downloadIfNotExists android-sdk_${ANDROID_SDK_VERSION}-mac_x86.zip http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-mac_x86.zip - if [ ! -d android-sdk-mac_x86 ] - then - unzip android-sdk_${ANDROID_SDK_VERSION}-mac_x86.zip - fi - $SDK_TOOLS_PATH/archivegen android-sdk-mac_x86 android-sdk_${ANDROID_SDK_VERSION}-mac_x86.7z + rm -fr android-sdk + downloadIfNotExists android-sdk_${ANDROID_SDK_VERSION}-macosx.zip http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-macosx.zip + unzip android-sdk_${ANDROID_SDK_VERSION}-macosx.zip + mv android-sdk-macosx android-sdk + createArchive android-sdk android-sdk_${ANDROID_SDK_VERSION}-macosx.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data - mv android-sdk_${ANDROID_SDK_VERSION}-mac_x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-mac_x86.7z - rm -fr android-sdk-mac_x86 + mv android-sdk_${ANDROID_SDK_VERSION}-macosx.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-macosx.7z + rm -fr android-sdk fi if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-windows.7z ] then + rm -fr android-sdk downloadIfNotExists android-sdk_${ANDROID_SDK_VERSION}-windows.zip http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-windows.zip - if [ ! -d android-sdk-windows ] - then - unzip android-sdk_${ANDROID_SDK_VERSION}-windows.zip - fi - $SDK_TOOLS_PATH/archivegen android-sdk-windows android-sdk_${ANDROID_SDK_VERSION}-windows.7z + unzip android-sdk_${ANDROID_SDK_VERSION}-windows.zip + mv android-sdk-windows android-sdk + createArchive android-sdk android-sdk_${ANDROID_SDK_VERSION}-windows.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data mv android-sdk_${ANDROID_SDK_VERSION}-windows.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-windows.7z - rm -fr android-sdk-windows + rm -fr android-sdk fi if [ "$OSTYPE" = "msys" ] @@ -1071,68 +1090,56 @@ function prepareSDKs gcc -Wl,-subsystem,windows -Wno-write-strings android.cpp -static-libgcc -s -O2 -o android.exe popd mkdir -p android-sdk-windows/tools/ - cp android-various/android-sdk/android.exe android-sdk-windows/tools/ - $SDK_TOOLS_PATH/archivegen android-sdk-windows android-sdk-windows-tools-mingw-android.7z + cp android-various/android-sdk/android.exe android-sdk/tools/ + createArchive android-sdk-windows android-sdk-windows-tools-mingw-android.7z mv android-sdk-windows-tools-mingw-android.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.platform_tools/data/android-sdk-windows-tools-mingw-android.7z rm -rf android-various fi fi - # repack platform-tools - repackSDK platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-linux platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-linux android-sdk-linux_x86 platform-tools - repackSDK platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-macosx platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-macosx android-sdk-mac_x86 platform-tools - # should we also include ant binary for windows ? - repackSDK platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-windows platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-windows android-sdk-windows platform-tools + # repack platform-tools + repackSDKPlatform-tools platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-linux platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-linux android-sdk platform-tools + repackSDKPlatform-tools platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-macosx platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-macosx android-sdk platform-tools + repackSDKPlatform-tools platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-windows platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-windows android-sdk platform-tools # repack api-4 - repackSDK android-${ANDROID_API_4_VERSION}-linux android-${ANDROID_API_4_VERSION}-linux android-sdk-linux_x86/platforms android-4 - repackSDK android-${ANDROID_API_4_VERSION}-macosx android-${ANDROID_API_4_VERSION}-macosx android-sdk-mac_x86/platforms android-4 - repackSDK android-${ANDROID_API_4_VERSION}-windows android-${ANDROID_API_4_VERSION}-windows android-sdk-windows/platforms android-4 + repackSDK android-${ANDROID_API_4_VERSION}-linux android-${ANDROID_API_4_VERSION}-linux android-sdk/platforms android-4 + repackSDK android-${ANDROID_API_4_VERSION}-macosx android-${ANDROID_API_4_VERSION}-macosx android-sdk/platforms android-4 + repackSDK android-${ANDROID_API_4_VERSION}-windows android-${ANDROID_API_4_VERSION}-windows android-sdk/platforms android-4 # repack api-5 - repackSDK android-${ANDROID_API_5_VERSION}-linux android-${ANDROID_API_5_VERSION}-linux android-sdk-linux_x86/platforms android-5 - repackSDK android-${ANDROID_API_5_VERSION}-macosx android-${ANDROID_API_5_VERSION}-macosx android-sdk-mac_x86/platforms android-5 - repackSDK android-${ANDROID_API_5_VERSION}-windows android-${ANDROID_API_5_VERSION}-windows android-sdk-windows/platforms android-5 + repackSDK android-${ANDROID_API_5_VERSION}-linux android-${ANDROID_API_5_VERSION}-linux android-sdk/platforms android-5 + repackSDK android-${ANDROID_API_5_VERSION}-macosx android-${ANDROID_API_5_VERSION}-macosx android-sdk/platforms android-5 + repackSDK android-${ANDROID_API_5_VERSION}-windows android-${ANDROID_API_5_VERSION}-windows android-sdk/platforms android-5 # repack api-6 - repackSDK android-${ANDROID_API_6_VERSION}-linux android-${ANDROID_API_6_VERSION}-linux android-sdk-linux_x86/platforms android-6 - repackSDK android-${ANDROID_API_6_VERSION}-macosx android-${ANDROID_API_6_VERSION}-macosx android-sdk-mac_x86/platforms android-6 - repackSDK android-${ANDROID_API_6_VERSION}-windows android-${ANDROID_API_6_VERSION}-windows android-sdk-windows/platforms android-6 + repackSDK android-${ANDROID_API_6_VERSION}-linux android-${ANDROID_API_6_VERSION}-linux android-sdk/platforms android-6 + repackSDK android-${ANDROID_API_6_VERSION}-macosx android-${ANDROID_API_6_VERSION}-macosx android-sdk/platforms android-6 + repackSDK android-${ANDROID_API_6_VERSION}-windows android-${ANDROID_API_6_VERSION}-windows android-sdk/platforms android-6 # repack api-7 - repackSDK android-${ANDROID_API_7_VERSION}-linux android-${ANDROID_API_7_VERSION}-linux android-sdk-linux_x86/platforms android-7 - repackSDK android-${ANDROID_API_7_VERSION}-macosx android-${ANDROID_API_7_VERSION}-macosx android-sdk-mac_x86/platforms android-7 - repackSDK android-${ANDROID_API_7_VERSION}-windows android-${ANDROID_API_7_VERSION}-windows android-sdk-windows/platforms android-7 + repackSDK android-${ANDROID_API_7_VERSION}-linux android-${ANDROID_API_7_VERSION} android-sdk/platforms android-7 # repack api-8 - repackSDK android-${ANDROID_API_8_VERSION}-linux android-${ANDROID_API_8_VERSION}-linux android-sdk-linux_x86/platforms android-8 - repackSDK android-${ANDROID_API_8_VERSION}-macosx android-${ANDROID_API_8_VERSION}-macosx android-sdk-mac_x86/platforms android-8 - repackSDK android-${ANDROID_API_8_VERSION}-windows android-${ANDROID_API_8_VERSION}-windows android-sdk-windows/platforms android-8 + repackSDK android-${ANDROID_API_8_VERSION}-linux android-${ANDROID_API_8_VERSION} android-sdk/platforms android-8 # repack api-9 - repackSDK android-${ANDROID_API_9_VERSION}-linux android-${ANDROID_API_9_VERSION}-linux android-sdk-linux_x86/platforms android-9 - repackSDK android-${ANDROID_API_9_VERSION}-linux android-${ANDROID_API_9_VERSION}-macosx android-sdk-mac_x86/platforms android-9 - repackSDK android-${ANDROID_API_9_VERSION}-linux android-${ANDROID_API_9_VERSION}-windows android-sdk-windows/platforms android-9 + repackSDK android-${ANDROID_API_9_VERSION}-linux android-${ANDROID_API_9_VERSION} android-sdk/platforms android-9 # repack api-10 - repackSDK android-${ANDROID_API_10_VERSION}-linux android-${ANDROID_API_10_VERSION}-linux android-sdk-linux_x86/platforms android-10 - repackSDK android-${ANDROID_API_10_VERSION}-linux android-${ANDROID_API_10_VERSION}-macosx android-sdk-mac_x86/platforms android-10 - repackSDK android-${ANDROID_API_10_VERSION}-linux android-${ANDROID_API_10_VERSION}-windows android-sdk-windows/platforms android-10 + repackSDK android-${ANDROID_API_10_VERSION}-linux android-${ANDROID_API_10_VERSION} android-sdk/platforms android-10 # repack api-11 - repackSDK android-${ANDROID_API_11_VERSION}-linux android-${ANDROID_API_11_VERSION}-linux android-sdk-linux_x86/platforms android-11 - repackSDK android-${ANDROID_API_11_VERSION}-linux android-${ANDROID_API_11_VERSION}-macosx android-sdk-mac_x86/platforms android-11 - repackSDK android-${ANDROID_API_11_VERSION}-linux android-${ANDROID_API_11_VERSION}-windows android-sdk-windows/platforms android-11 + repackSDK android-${ANDROID_API_11_VERSION}-linux android-${ANDROID_API_11_VERSION} android-sdk/platforms android-11 # repack api-12 - 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 + repackSDK android-${ANDROID_API_12_VERSION}-linux android-${ANDROID_API_12_VERSION} android-sdk/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 + repackSDK android-${ANDROID_API_13_VERSION}-linux android-${ANDROID_API_13_VERSION} android-sdk/platforms android-13 + + # repack api-14 + repackSDK android-${ANDROID_API_14_VERSION} android-${ANDROID_API_14_VERSION} android-sdk/platforms android-14 } function patchQtFiles @@ -1148,7 +1155,7 @@ function patchQtFiles cp -a $SHARED_QT_PATH/bin/*.dll ../qt-src/ fi echo files_to_patch > qpatch.cmdline - echo /data/data/eu.licentia.necessitas.ministro/files/qt >> qpatch.cmdline + echo /data/data/org.kde.necessitas.ministro/files/qt >> qpatch.cmdline echo $PWD >> qpatch.cmdline echo . >> qpatch.cmdline # $QPATCH_PATH @qpatch.cmdline @@ -1173,7 +1180,7 @@ function packSource echo cp -rf $1 $TEMP_PATH/source_temp_path/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/ cp -rf $1 $TEMP_PATH/source_temp_path/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/ pushd $TEMP_PATH/source_temp_path - $SDK_TOOLS_PATH/archivegen Android $1.7z + createArchive Android $1.7z mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.android.$package_name/data mv $1.7z $REPO_PATH_PACKAGES/org.kde.necessitas.android.$package_name/data/$1.7z popd @@ -1191,75 +1198,100 @@ function packSource rm -fr $TEMP_PATH/source_temp_path } -function compileNecessitasQt + +function compileNecessitasQt #params $1 architecture, $2 package path, $3 NDK_TARGET, $4 android architecture { package_name=${1//-/_} # replace - with _ - # Only android-ndk-r6/platforms/android-9/arch-$ARCH/usr/lib (yes both arm and x86) contains crtbegin_so.o, it's missing on - # other platforms; this file also exists in android-ndk-r6/toolchains/arm-linux-androideabi-4.4.3/prebuilt/windows/sysroot/usr/lib - # but not in the x86 equivalent, so for now, build it all for 9). - NDK_TARGET=9 - # NQT_INSTALL_DIR=/data/data/eu.licentia.necessitas.ministro/files/qt + NDK_TARGET=$3 + ANDROID_ARCH=$1 + if [ ! -z $4 ] ; then + ANDROID_ARCH=$4 + fi + # NQT_INSTALL_DIR=/data/data/org.kde.necessitas.ministro/files/qt NQT_INSTALL_DIR=$PWD/install + + if [ "$OSTYPE" = "linux-gnu" ] ; then + if [ ! -d android-sdk-linux/platform-tools ] + then + rm -fr android-sdk-linux + 7z -y x $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.base/data/android-sdk-linux.7z + 7z -y x $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.platform_tools/data/platform-tools_${ANDROID_PLATFORM_TOOLS_VERSION}-linux.7z + 7z -y x $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.android_14/data/android-${ANDROID_API_14_VERSION}.7z + 7z -y x $REPO_PATH_PACKAGES/org.kde.necessitas.misc.sdk.android_8/data/android-${ANDROID_API_8_VERSION}.7z + fi + export ANDROID_SDK_TOOLS_PATH=$PWD/android-sdk/tools/ + export ANDROID_SDK_PLATFORM_TOOLS_PATH=$PWD/android-sdk/platform-tools/ + fi + if [ ! -f all_done ] then - pushd ../qt-src - git checkout experimental - git pull - mkdir -p $NQT_INSTALL_DIR/src/android/cpp/ - # The examples need qtmain_android.cpp in the install dir. - cp src/android/cpp/qtmain_android.cpp $NQT_INSTALL_DIR/src/android/cpp/ - popd - ../qt-src/android/androidconfigbuild.sh -l $NDK_TARGET -c 1 -q 1 -n $TEMP_PATH/android-ndk-${USED_ANDROID_NDK_VERSION} -a $1 -k 0 -i $NQT_INSTALL_DIR || error_msg "Can't configure android-qt" + pushd ../qt-src + git checkout -f mkspecs + mkdir -p $NQT_INSTALL_DIR/src/android/cpp/ + # The examples need qtmain_android.cpp in the install dir. + cp src/android/cpp/qtmain_android.cpp $NQT_INSTALL_DIR/src/android/cpp/ + popd + ../qt-src/android/androidconfigbuild.sh -l $NDK_TARGET -c 1 -q 1 -n $TEMP_PATH/android-ndk-${ANDROID_NDK_VERSION} -a $ANDROID_ARCH -k 0 -i $NQT_INSTALL_DIR || error_msg "Can't configure android-qt" echo "all done">all_done fi - if [ $package_name = "armeabi_v7a" ] + rm -fr install + rm -fr Android + export INSTALL_ROOT="" + make QtJar + ../qt-src/android/androidconfigbuild.sh -l $NDK_TARGET -c 0 -q 0 -n $TEMP_PATH/android-ndk-${ANDROID_NDK_VERSION} -a $ANDROID_ARCH -b 0 -k 1 -i $NQT_INSTALL_DIR || error_msg "Can't install android-qt" + + doSed $"s/= android-5/= android-${NDK_TARGET}/g" install/mkspecs/android-g++/qmake.conf + doSed $"s/= android-5/= android-${NDK_TARGET}/g" install/mkspecs/default/qmake.conf + if [ $ANDROID_ARCH = "armeabi-v7a" ] then - doSed $"s/= armeabi/= armeabi-v7a/g" mkspecs/android-g++/qmake.conf - doSed $"s/= android-4/= android-$NDK_TARGET/g" install/mkspecs/android-g++/qmake.conf + doSed $"s/= armeabi/= armeabi-v7a/g" install/mkspecs/android-g++/qmake.conf + doSed $"s/= armeabi/= armeabi-v7a/g" install/mkspecs/default/qmake.conf else - doSed $"s/= armeabi-v7a/= armeabi/g" mkspecs/android-g++/qmake.conf - doSed $"s/= android-4/= android-$NDK_TARGET/g" install/mkspecs/android-g++/qmake.conf + if [ $ANDROID_ARCH = "x86" ] + then + doSed $"s/= armeabi/= x86/g" install/mkspecs/android-g++/qmake.conf + doSed $"s/= armeabi/= x86/g" install/mkspecs/default/qmake.conf + fi fi - rm -fr install - export INSTALL_ROOT="" - make install -# doMakeInstall "Failed to make-install Qt Android $package_name" make mkdir -p $2/$1 cp -rf $NQT_INSTALL_DIR/bin $2/$1 - $SDK_TOOLS_PATH/archivegen Android qt-tools-${HOST_TAG}.7z + createArchive Android qt-tools-${HOST_TAG}.7z rm -fr $2/$1/bin mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.$package_name/data 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/ - $SDK_TOOLS_PATH/archivegen Android qt-framework.7z + cp -rf jar $2/$1/ + rm -fr $2/$1/bin + createArchive Android qt-framework.7z mv qt-framework.7z $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.$package_name/data/qt-framework.7z # Not sure why we're using a different qt-framework package for Windows. cp $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.$package_name/data/qt-framework.7z $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.$package_name/data/qt-framework-windows.7z + rm -fr ../install-$1 + cp -a install ../install-$1 + cp -rf jar ../install-$1/ # patchQtFiles } function prepareNecessitasQt { - downloadLighthouseSource - + mkdir -p Android/Qt/$NECESSITAS_QT_VERSION_SHORT pushd Android/Qt/$NECESSITAS_QT_VERSION_SHORT - if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.x86/data/qt-tools-${HOST_TAG}.7z ] + if [ ! -d qt-src ] then - mkdir build-x86 - pushd build-x86 - compileNecessitasQt x86 Android/Qt/$NECESSITAS_QT_VERSION_SHORT - popd #build-x86 + git clone git://anongit.kde.org/android-qt.git qt-src|| error_msg "Can't clone ${1}" fi + cloneCheckoutKDEGitRepo android-qt $CHECKOUT_BRANCH + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.armeabi/data/qt-tools-${HOST_TAG}.7z ] then mkdir build-armeabi pushd build-armeabi - compileNecessitasQt armeabi Android/Qt/$NECESSITAS_QT_VERSION_SHORT + compileNecessitasQt armeabi Android/Qt/$NECESSITAS_QT_VERSION_SHORT 5 popd #build-armeabi fi @@ -1267,10 +1299,26 @@ function prepareNecessitasQt then mkdir build-armeabi-v7a pushd build-armeabi-v7a - compileNecessitasQt armeabi-v7a Android/Qt/$NECESSITAS_QT_VERSION_SHORT + compileNecessitasQt armeabi-v7a Android/Qt/$NECESSITAS_QT_VERSION_SHORT 5 popd #build-armeabi-v7a fi + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.armeabi_android_4/data/qt-tools-${HOST_TAG}.7z ] + then + mkdir build-armeabi-android-4 + pushd build-armeabi-android-4 + compileNecessitasQt armeabi-android-4 Android/Qt/$NECESSITAS_QT_VERSION_SHORT 4 armeabi + popd #build-armeabi + fi +# Enable it when QtCreator is ready +# if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.x86/data/qt-tools-${HOST_TAG}.7z ] +# then +# mkdir build-x86 +# pushd build-x86 +# compileNecessitasQt x86 Android/Qt/$NECESSITAS_QT_VERSION_SHORT 9 +# popd #build-x86 +# fi + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.src/data/qt-src.7z ] then packSource qt-src @@ -1281,15 +1329,13 @@ function prepareNecessitasQt function compileNecessitasQtMobility { - export ANDROID_TARGET_ARCH=$1 if [ ! -f all_done ] then pushd ../qtmobility-src git checkout $CHECKOUT_BRANCH git pull popd -# ../qtmobility-src/configure -prefix $PWD/install -staticconfig android -qmake-exec $PWD/../build-$1/install/bin/qmake$EXE_EXT -modules "bearer location contacts multimedia versit messaging systeminfo serviceframework sensors gallery organizer feedback connectivity" || error_msg "Can't configure android-qtmobility" - ../qtmobility-src/configure -prefix $PWD/install -staticconfig android -qmake-exec $TEMP_PATH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/install/bin/qmake$EXE_EXT -modules "bearer location contacts multimedia versit messaging systeminfo serviceframework sensors gallery organizer feedback connectivity" || error_msg "Can't configure android-qtmobility" + ../qtmobility-src/configure -prefix $PWD/install -staticconfig android -qmake-exec $TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/install/bin/qmake$EXE_EXT -modules "bearer location contacts multimedia versit messaging systeminfo serviceframework sensors gallery organizer feedback connectivity" || error_msg "Can't configure android-qtmobility" doMake "Can't compile android-qtmobility" "all done" ma-make fi package_name=${1//-/_} # replace - with _ @@ -1300,11 +1346,9 @@ function compileNecessitasQtMobility mkdir -p $2/$1 mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtmobility.$package_name/data mv $PWD/install/* $2/$1 - cp -a $PWD/$TEMP_PATH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/* $2/$1 - rm -fr $PWD/$TEMP_PATH - $SDK_TOOLS_PATH/archivegen Android qtmobility.7z + createArchive Android qtmobility.7z mv qtmobility.7z $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtmobility.$package_name/data/qtmobility.7z - cp -a $2/$1/* ../build-$1 + cp -a $2/$1/* ../install-$1 # copy files to ministro repository # pushd ../build-$1 # patchQtFiles # popd @@ -1339,6 +1383,22 @@ function prepareNecessitasQtMobility popd #build-mobility-armeabi-v7a fi + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtmobility.armeabi_android_4/data/qtmobility.7z ] + then + mkdir build-mobility-armeabi-android-4 + pushd build-mobility-armeabi-android-4 + compileNecessitasQtMobility armeabi-android-4 Android/Qt/$NECESSITAS_QT_VERSION_SHORT + popd #build-mobility-armeabi-android-4 + fi + +# if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtmobility.x86/data/qtmobility.7z ] +# then +# mkdir build-mobility-x86 +# pushd build-mobility-x86 +# compileNecessitasQtMobility x86 Android/Qt/$NECESSITAS_QT_VERSION_SHORT +# popd #build-mobility-x86 +# fi + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtmobility.src/data/qtmobility-src.7z ] then packSource qtmobility-src @@ -1348,8 +1408,7 @@ function prepareNecessitasQtMobility function compileNecessitasQtWebkit { - export ANDROID_TARGET_ARCH=$1 - export SQLITE3SRCDIR=$TEMP_PATH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/qt-src/src/3rdparty/sqlite + export SQLITE3SRCDIR=$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/qt-src/src/3rdparty/sqlite if [ ! -f all_done ] then if [ "$OSTYPE" = "msys" ] ; then @@ -1376,7 +1435,7 @@ function compileNecessitasQtWebkit fi export WEBKITOUTPUTDIR=$PWD echo "doing perl" - ../qtwebkit-src/WebKitTools/Scripts/build-webkit --qt --makeargs="-j$JOBS" --qmake=$TEMP_PATH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/install/bin/qmake$EXE_EXT --no-video --no-xslt || error_msg "Can't configure android-qtwebkit" + ../qtwebkit-src/Tools/Scripts/build-webkit --qt --makeargs="-j$JOBS" --qmake=$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/install/bin/qmake$EXE_EXT --no-video --no-xslt || error_msg "Can't configure android-qtwebkit" echo "all done">all_done fi package_name=${1//-/_} # replace - with _ @@ -1388,11 +1447,11 @@ function compileNecessitasQtWebkit rm -fr $2 mkdir -p $2/$1 mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtwebkit.$package_name/data - mv $PWD/$TEMP_PATH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/* $2/$1 + mv $PWD/$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/install/* $2/$1 pushd $2/$1 - qt_build_path=$TEMP_PATH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1 + qt_build_path=$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$1/install qt_build_path=${qt_build_path//\//\\\/} - sed_cmd="s/$qt_build_path/\/data\/data\/eu.licentia.necessitas.ministro\/files\/qt/g" + sed_cmd="s/$qt_build_path/\/data\/data\/org.kde.necessitas.ministro\/files\/qt/g" if [ "$OSTYPE" = "darwin9.0" -o "$OSTYPE" = "darwin10.0" ]; then find . -name *.pc | xargs sed -i '.bak' $sed_cmd find . -name *.pc.bak | xargs rm -f @@ -1401,9 +1460,9 @@ function compileNecessitasQtWebkit fi popd rm -fr $PWD/$TEMP_PATH - $SDK_TOOLS_PATH/archivegen Android qtwebkit.7z + createArchive Android qtwebkit.7z mv qtwebkit.7z $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtwebkit.$package_name/data/qtwebkit.7z - cp -a $2/$1/* ../build-$1/ + cp -a $2/$1/* ../install-$1/ # pushd ../build-$1 # patchQtFiles # popd @@ -1438,6 +1497,22 @@ function prepareNecessitasQtWebkit popd #build-webkit-armeabi-v7a fi + if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtwebkit.armeabi_android_4/data/qtwebkit.7z ] + then + mkdir build-webkit-armeabi-android-4 + pushd build-webkit-armeabi-android-4 + compileNecessitasQtWebkit armeabi-android-4 Android/Qt/$NECESSITAS_QT_VERSION_SHORT + popd #build-webkit-armeabi-android-4 + fi + +# if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtwebkit.x86/data/qtwebkit.7z ] +# then +# mkdir build-webkit-x86 +# pushd build-webkit-x86 +# compileNecessitasQtWebkit x86 Android/Qt/$NECESSITAS_QT_VERSION_SHORT +# popd #build-webkit-x86 +# fi +# if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtwebkit.src/data/qtwebkit-src.7z ] then packSource qtwebkit-src @@ -1457,9 +1532,9 @@ function prepareOpenJDK if [ "$OSTYPE" = "msys" -o "$WINE" = "1" ] ; then downloadIfNotExists oscg-openjdk6b21-1-windows-installer.exe http://oscg-downloads.s3.amazonaws.com/installers/oscg-openjdk6b21-1-windows-installer.exe rm -rf openjdk6b21-windows - oscg-openjdk6b21-1-windows-installer.exe --unattendedmodeui none --mode unattended --prefix `pwd`/openjdk6b21-windows + wine oscg-openjdk6b21-1-windows-installer.exe --unattendedmodeui none --mode unattended --prefix `pwd`/openjdk6b21-windows pushd openjdk6b21-windows - $SDK_TOOLS_PATH/archivegen openjdk-6.0.21 openjdk-windows.7z + createArchive openjdk-6.0.21 openjdk-windows.7z mv openjdk-windows.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.openjdk/data/ popd fi @@ -1470,16 +1545,15 @@ function prepareOpenJDK ar x openjdk-1.6.0-b21.i386.openscg.deb tar xzf data.tar.gz pushd opt - $SDK_TOOLS_PATH/archivegen openjdk openjdk-linux-x86.7z + createArchive openjdk openjdk-linux-x86.7z mv openjdk-linux-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.openjdk/data/ popd - tar fi if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.openjdk/data/openjdk-darwin-x86.7z ] ; then downloadIfNotExists oscg-openjdk6b16-5a-osx-installer.zip http://oscg-downloads.s3.amazonaws.com/installers/oscg-openjdk6b16-5a-osx-installer.zip unzip -o oscg-openjdk6b16-5a-osx-installer.zip - $SDK_TOOLS_PATH/archivegen oscg-openjdk6b16-5a-osx-installer.app openjdk-darwin-x86.7z + createArchive oscg-openjdk6b16-5a-osx-installer.app openjdk-darwin-x86.7z mv openjdk-darwin-x86.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.openjdk/data/ fi @@ -1488,13 +1562,16 @@ function prepareOpenJDK function prepareAnt { + mkdir ant + pushd ant if [ ! -f $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ant/data/ant.7z ] ; then mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ant/data downloadIfNotExists apache-ant-1.8.2-bin.tar.bz2 http://mirror.ox.ac.uk/sites/rsync.apache.org//ant/binaries/apache-ant-1.8.2-bin.tar.bz2 tar xjvf apache-ant-1.8.2-bin.tar.bz2 - $SDK_TOOLS_PATH/archivegen apache-ant-1.8.2 ant.7z + createArchive apache-ant-1.8.2 ant.7z mv ant.7z $REPO_PATH_PACKAGES/org.kde.necessitas.misc.ant/data/ fi + popd } function patchPackages @@ -1536,6 +1613,7 @@ function setPackagesVariables patchPackages "@@NECESSITAS_QT_VERSION_SHORT@@" $NECESSITAS_QT_VERSION_SHORT patchPackages "@@NECESSITAS_QTWEBKIT_VERSION@@" $NECESSITAS_QTWEBKIT_VERSION patchPackages "@@NECESSITAS_QTMOBILITY_VERSION@@" $NECESSITAS_QTMOBILITY_VERSION + patchPackages "@@REPOSITORY@@" $CHECKOUT_BRANCH patchPackages "@@TEMP_PATH@@" $TEMP_PATH patchPackage "@@NECESSITAS_QT_CREATOR_VERSION@@" $NECESSITAS_QT_CREATOR_VERSION "org.kde.necessitas.tools.qtcreator" @@ -1554,13 +1632,40 @@ function setPackagesVariables 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_13_VERSION "org.kde.necessitas.misc.sdk.android_13" + patchPackage "@@ANDROID_API_14_VERSION@@" $ANDROID_API_14_VERSION "org.kde.necessitas.misc.sdk.android_14" 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" + + patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi" + patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI_ANDROID_4_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi-android-4" + patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI-V7A_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi-v7a" + patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI_INSTALL_PATH@@" "/data/data/org.kde.necessitas.ministro/files/qt" + patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI_ANDROID_4_INSTALL_PATH@@" "/data/data/org.kde.necessitas.ministro/files/qt" + patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI-V7A_INSTALL_PATH@@" "/data/data/org.kde.necessitas.ministro/files/qt" + } function prepareSDKBinary { $SDK_TOOLS_PATH/binarycreator -v -t $SDK_TOOLS_PATH/installerbase$EXE_EXT -c $REPO_SRC_PATH/config -p $REPO_PATH_PACKAGES -n $REPO_SRC_PATH/necessitas-sdk-installer$HOST_QT_CONFIG$EXE_EXT org.kde.necessitas + mkdir sdkmaintenance + pushd sdkmaintenance + rm -fr *.7z + if [ "$OSTYPE" = "msys" ] ; then + mkdir temp + cp -a $REPO_SRC_PATH/necessitas-sdk-installer$HOST_QT_CONFIG$EXE_EXT temp/SDKMaintenanceToolBase.exe + createArchive temp sdkmaintenance-windows.7z + else + cp -a $REPO_SRC_PATH/necessitas-sdk-installer$HOST_QT_CONFIG$EXE_EXT .tempSDKMaintenanceTool + if [ "$OSTYPE" = "linux-gnu" ] ; then + createArchive . sdkmaintenance-linux-x86.7z + else + createArchive . sdkmaintenance-darwin-x86.7z + fi + fi + mkdir -p $REPO_PATH_PACKAGES/org.kde.necessitas.tools.sdkmaintenance/data/ + cp -f *.7z $REPO_PATH_PACKAGES/org.kde.necessitas.tools.sdkmaintenance/data/ + popd } function prepareSDKRepository @@ -1571,37 +1676,50 @@ function prepareSDKRepository function prepareMinistroRepository { + rm -fr $MINISTRO_REPO_PATH pushd $REPO_SRC_PATH/ministrorepogen if [ ! -f all_done ] then $STATIC_QT_PATH/bin/qmake CONFIG+=static -r || error_msg "Can't configure ministrorepogen" doMake "Can't compile ministrorepogen" "all done" ma-make + if [ "$OSTYPE" = "msys" ] ; then + cp $REPO_SRC_PATH/ministrorepogen/release/ministrorepogen$EXE_EXT $REPO_SRC_PATH/ministrorepogen/ministrorepogen$EXE_EXT + fi fi popd - for architecture in armeabi armeabi-v7a + for platfromArchitecture in armeabi armeabi-v7a armeabi-android-4 do - rm -fr $MINISTRO_REPO_PATH/android/$architecture/objects/$MINISTRO_VERSION - mkdir -p $MINISTRO_REPO_PATH/android/$architecture/objects/$MINISTRO_VERSION - pushd $TEMP_PATH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-$architecture || error_msg "Can't prepare ministro repo, Android Qt not built?" + pushd $TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/install-$platfromArchitecture || error_msg "Can't prepare ministro repo, Android Qt not built?" + architecture=$platfromArchitecture; + repoVersion=$MINISTRO_VERSION-$platfromArchitecture + if [ $architecture = "armeabi-android-4" ] ; then + architecture="armeabi" + fi + MINISTRO_OBJECTS_PATH=$MINISTRO_REPO_PATH/android/$architecture/objects/$repoVersion + rm -fr $MINISTRO_OBJECTS_PATH + mkdir -p $MINISTRO_OBJECTS_PATH rm -fr Android for lib in `find . -name *.so` do libDirname=`dirname $lib` - mkdir -p $MINISTRO_REPO_PATH/android/$architecture/objects/$MINISTRO_VERSION/$libDirname - cp $lib $MINISTRO_REPO_PATH/android/$architecture/objects/$MINISTRO_VERSION/$libDirname/ - $ANDROID_STRIP_BINARY --strip-unneeded $MINISTRO_REPO_PATH/android/$architecture/objects/$MINISTRO_VERSION/$lib + mkdir -p $MINISTRO_OBJECTS_PATH/$libDirname + cp $lib $MINISTRO_OBJECTS_PATH/$libDirname/ + $ANDROID_STRIP_BINARY --strip-unneeded $MINISTRO_OBJECTS_PATH/$lib + done + + for jar in `find . -name *.jar` + do + jarDirname=`dirname $jar` + mkdir -p $MINISTRO_OBJECTS_PATH/$jarDirname + cp $jar $MINISTRO_OBJECTS_PATH/$jarDirname/ done for qmldirfile in `find . -name qmldir` do qmldirfileDirname=`dirname $qmldirfile` - cp $qmldirfile $MINISTRO_REPO_PATH/android/$architecture/objects/$MINISTRO_VERSION/$qmldirfileDirname/ + cp $qmldirfile $MINISTRO_OBJECTS_PATH/$qmldirfileDirname/ done - - if [ "$OSTYPE" = "msys" ] ; then - cp $REPO_SRC_PATH/ministrorepogen/release/ministrorepogen$EXE_EXT $REPO_SRC_PATH/ministrorepogen/ministrorepogen$EXE_EXT - fi - $REPO_SRC_PATH/ministrorepogen/ministrorepogen$EXE_EXT $ANDROID_READELF_BINARY $MINISTRO_REPO_PATH/android/$architecture/objects/$MINISTRO_VERSION $MINISTRO_VERSION $architecture $REPO_SRC_PATH/ministrorepogen/rules.xml $MINISTRO_REPO_PATH + $REPO_SRC_PATH/ministrorepogen/ministrorepogen$EXE_EXT $ANDROID_READELF_BINARY $MINISTRO_OBJECTS_PATH $MINISTRO_VERSION $architecture $REPO_SRC_PATH/ministrorepogen/rules-$platfromArchitecture.xml $MINISTRO_REPO_PATH $repoVersion $CHECKOUT_BRANCH popd done } @@ -1618,7 +1736,7 @@ function packforWindows rm -fr Android_old find -name *.so.4* | xargs rm -fr find -name *.so.1* | xargs rm -fr - $SDK_TOOLS_PATH/archivegen Android $1/$2-windows.7z + createArchive Android $1/$2-windows.7z -l popd rm -fr $TEMP_PATH/packforWindows } @@ -1682,15 +1800,17 @@ if [ "$OSTYPE" = "msys" ] ; then fi prepareHostQt prepareSdkInstallerTools -prepareOpenJDK -prepareAnt prepareNDKs -prepareGDBVersion head $HOST_TAG -prepareGDBVersion head prepareSDKs +# prepareOpenJDK +prepareAnt prepareNecessitasQtCreator +# prepareGDBVersion head $HOST_TAG +prepareGDBVersion 7.3 +# prepareGDBVersion head +mkdir $CHECKOUT_BRANCH +pushd $CHECKOUT_BRANCH prepareNecessitasQt - # TODO :: Fix webkit build in Windows (-no-video fails) and Mac OS X (debug-and-release config incorrectly used and fails) # git clone often fails for webkit # Webkit is broken currently. @@ -1700,7 +1820,9 @@ if [ "$OSTYPE" != "msys" ] ; then prepareNecessitasQtMobility # if [[ `gcc --version` =~ .*llvm.* ]]; => syntax error near `=~' fi -prepareWindowsPackages +popd + +#prepareWindowsPackages setPackagesVariables prepareSDKBinary @@ -1712,6 +1834,8 @@ if [ "$MAKE_DEBUG_HOST_APPS" = "1" ] ; then prepareSDKBinary fi +removeUnusedPackages + prepareSDKRepository prepareMinistroRepository diff --git a/Necessitas_SDK/config/config.xml b/Necessitas_SDK/config/config.xml index 4931289..69ea49f 100644 --- a/Necessitas_SDK/config/config.xml +++ b/Necessitas_SDK/config/config.xml @@ -12,8 +12,8 @@ <UninstallerName>SDKMaintenanceTool</UninstallerName> <RemoteRepositories> <Repository> - <Url>http://files.kde.org/necessitas/sdk</Url> -<!-- <Url>file:///C|/usr/www/necessitas/sdk</Url> --> +<!-- <Url>http://files.kde.org/necessitas/test</Url> --> + <Url>file:///var/debian/tmp/necessitas/out/necessitas/sdk</Url> <Required>true</Required> </Repository> </RemoteRepositories> diff --git a/Necessitas_SDK/config/watermark.png b/Necessitas_SDK/config/watermark.png Binary files differindex 47bac13..add2e74 100644 --- a/Necessitas_SDK/config/watermark.png +++ b/Necessitas_SDK/config/watermark.png diff --git a/Necessitas_SDK/ministrorepogen/main.cpp b/Necessitas_SDK/ministrorepogen/main.cpp index ce8395e..1560fdf 100644 --- a/Necessitas_SDK/ministrorepogen/main.cpp +++ b/Necessitas_SDK/ministrorepogen/main.cpp @@ -32,7 +32,7 @@ void printHelp() { - qDebug()<<"Usage:./ministrorepogen <readelf executable path> <libraries path> <version> <abi version> <xml rules file> <output folder> "; + qDebug()<<"Usage:./ministrorepogen <readelf executable path> <libraries path> <version> <abi version> <xml rules file> <output folder> <out objects repo version> <repository>"; } @@ -51,7 +51,7 @@ void getFileInfo(const QString & filePath, qint64 & fileSize, QString & sha1) int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); - if (argc<7) + if (argc<9) { printHelp(); return 1; @@ -63,6 +63,8 @@ int main(int argc, char *argv[]) const char * abiVersion=argv[4]; const char * rulesFile=argv[5]; const char * outputFolder=argv[6]; + const char * objfolder =argv [7]; + const char * repository =argv [8]; QDomDocument document("libs"); QFile f(rulesFile); @@ -77,14 +79,25 @@ int main(int argc, char *argv[]) if (element.isNull()) return 1; - QMap<int, QVector<int> >platforms; - element=element.firstChildElement("version"); + QMap<int, QVector<int> >platformLibs; + element=element.firstChildElement("libs").firstChildElement("version"); while(!element.isNull()) { if (element.hasAttribute("symlink")) - platforms[element.attribute("symlink", 0).toInt()].push_back(element.attribute("value", 0).toInt()); + platformLibs[element.attribute("symlink", 0).toInt()].push_back(element.attribute("value", 0).toInt()); else - platforms[element.attribute("value", 0).toInt()].clear(); + platformLibs[element.attribute("value", 0).toInt()].clear(); + element = element.nextSiblingElement(); + } + + QMap<int, int >platformJars; + element=root.firstChildElement("platforms").firstChildElement("jars").firstChildElement("version"); + while(!element.isNull()) + { + if (element.hasAttribute("symlink")) + platformJars[element.attribute("value", 0).toInt()]=element.attribute("symlink", 0).toInt(); + else + platformJars[element.attribute("value", 0).toInt()]=element.attribute("value", 0).toInt(); element = element.nextSiblingElement(); } @@ -129,7 +142,7 @@ int main(int argc, char *argv[]) while(!childs.isNull()) { libs[libraryName].dependencies<<childs.attribute("name"); - childs=childs.nextSiblingElement(); + childs=childs.nextSiblingElement("lib"); } childs=element.firstChildElement("needs").firstChildElement("item"); @@ -152,14 +165,14 @@ int main(int argc, char *argv[]) path.mkpath(xmlPath); path.cd(xmlPath); chdir(path.absolutePath().toUtf8().constData()); - foreach (int androdPlatform, platforms.keys()) + foreach (int androdPlatform, platformLibs.keys()) { qDebug()<<"============================================"; qDebug()<<"Generating repository for android platform :"<<androdPlatform; qDebug()<<"--------------------------------------------"; path.mkpath(QString("android-%1").arg(androdPlatform)); xmlPath=QString("android-%1/libs-%2.xml").arg(androdPlatform).arg(version); - foreach(int symLink, platforms[androdPlatform]) + foreach(int symLink, platformLibs[androdPlatform]) QFile::link(QString("android-%1").arg(androdPlatform), QString("android-%1").arg(symLink)); QFile outXmlFile(xmlPath); outXmlFile.open(QIODevice::WriteOnly); @@ -177,8 +190,8 @@ int main(int argc, char *argv[]) qWarning()<<"Warning : Can't find \""<<libsPath+"/"+libs[key].relativePath<<"\" item will be skipped"; continue; } - outXmlFile.write(QString("\t<lib name=\"%1\" url=\"http://files.kde.org/necessitas/qt/android/%2/objects/%3/%4\" file=\"%4\" size=\"%5\" sha1=\"%6\" level=\"%7\"") - .arg(libs[key].name).arg(abiVersion).arg(version).arg(libs[key].relativePath).arg(fileSize).arg(sha1Hash).arg(libs[key].level).toUtf8()); + outXmlFile.write(QString("\t<lib name=\"%1\" url=\"http://files.kde.org/necessitas/ministro/necessitas/%8/android/%2/objects/%3/%4\" file=\"%4\" size=\"%5\" sha1=\"%6\" level=\"%7\"") + .arg(libs[key].name).arg(abiVersion).arg(objfolder).arg(libs[key].relativePath).arg(fileSize).arg(sha1Hash).arg(libs[key].level).arg(repository).toUtf8()); if (!libs[key].dependencies.size() && !libs[key].needs.size()) { outXmlFile.write(" />\n\n"); @@ -201,10 +214,10 @@ int main(int argc, char *argv[]) { qint64 fileSize; QString sha1Hash; - getFileInfo(libsPath+"/"+needed.relativePath, fileSize, sha1Hash); + getFileInfo(libsPath+"/"+needed.relativePath.arg(platformJars[androdPlatform]), fileSize, sha1Hash); if (-1==fileSize) { - qWarning()<<"Warning : Can't find \""<<libsPath+"/"+needed.relativePath<<"\" item will be skipped"; + qWarning()<<"Warning : Can't find \""<<libsPath+"/"+needed.relativePath.arg(platformJars[androdPlatform])<<"\" item will be skipped"; continue; } @@ -212,8 +225,8 @@ int main(int argc, char *argv[]) if (needed.type.length()) type=QString(" type=\"%1\" ").arg(needed.type); - outXmlFile.write(QString("\t\t\t<item name=\"%1\" url=\"http://files.kde.org/necessitas/qt/android/%2/objects/%3/%4\" file=\"%4\" size=\"%5\" sha1=\"%6\"%7/>\n") - .arg(needed.name).arg(abiVersion).arg(version).arg(needed.relativePath).arg(fileSize).arg(sha1Hash).arg(type).toUtf8()); + outXmlFile.write(QString("\t\t\t<item name=\"%1\" url=\"http://files.kde.org/necessitas/ministro/necessitas/%8/android/%2/objects/%3/%4\" file=\"%4\" size=\"%5\" sha1=\"%6\"%7/>\n") + .arg(needed.name).arg(abiVersion).arg(objfolder).arg(needed.relativePath.arg(platformJars[androdPlatform])).arg(fileSize).arg(sha1Hash).arg(type).arg(repository).toUtf8()); } outXmlFile.write("\t\t</needs>\n"); } diff --git a/Necessitas_SDK/ministrorepogen/rules.xml b/Necessitas_SDK/ministrorepogen/rules-armeabi-android-4.xml index 2a440dc..3bb63e2 100644 --- a/Necessitas_SDK/ministrorepogen/rules.xml +++ b/Necessitas_SDK/ministrorepogen/rules-armeabi-android-4.xml @@ -1,24 +1,27 @@ <root> <platforms> - <version value="4"/> - <version value="5"/> - <version value="6" symlink="5"/> - <version value="7" symlink="5"/> - <version value="8"/> - <version value="9"/> - <version value="10" symlink="9"/> - <version value="11" symlink="9"/> - <version value="12" symlink="9"/> + <libs> + <version value="4"/> + </libs> + <jars> + <version value="4" symlink="8"/> + </jars> </platforms> <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtLoader" applicationParameters="-platform android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl QML_IMPORT_PATH=MINISTRO_PATH/qt/imports QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins"> + <lib file="lib/libQtCore.so" > + <needs> + <item name="QtIndustrius" type="jar" file="jar/QtIndustrius-%1.jar"/> + </needs> + </lib> + <lib file="lib/libQtNetwork.so" > <needs> <item name="GenericBearerPlugin" file="plugins/bearer/libqgenericbearer.so"/> </needs> </lib> - <lib file="lib/libQtSvg.so" > + <lib file="lib/libQtSql.so" > <needs> <item name="QSQLitePlugin" file="plugins/sqldrivers/libqsqlite.so"/> </needs> diff --git a/Necessitas_SDK/ministrorepogen/rules-armeabi-v7a.xml b/Necessitas_SDK/ministrorepogen/rules-armeabi-v7a.xml new file mode 100644 index 0000000..535f13e --- /dev/null +++ b/Necessitas_SDK/ministrorepogen/rules-armeabi-v7a.xml @@ -0,0 +1,201 @@ +<root> + <platforms> + <libs> + <version value="5"/> + <version value="6" symlink="5"/> + <version value="7" symlink="5"/> + <version value="8"/> + <version value="9"/> + <version value="10" symlink="9"/> + <version value="11" symlink="9"/> + <version value="12" symlink="9"/> + <version value="13" symlink="9"/> + <version value="14" symlink="9"/> + </libs> + <jars> + <version value="5" symlink="8"/> + <version value="8"/> + <version value="9" symlink="14"/> + </jars> + </platforms> + + <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtLoader" applicationParameters="-platform android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl QML_IMPORT_PATH=MINISTRO_PATH/qt/imports QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins"> + <lib file="lib/libQtCore.so" > + <needs> + <item name="QtIndustrius" type="jar" file="jar/QtIndustrius-%1.jar"/> + </needs> + </lib> + + <lib file="lib/libQtNetwork.so" > + <needs> + <item name="GenericBearerPlugin" file="plugins/bearer/libqgenericbearer.so"/> + </needs> + </lib> + + <lib file="lib/libQtSql.so" > + <needs> + <item name="QSQLitePlugin" file="plugins/sqldrivers/libqsqlite.so"/> + </needs> + </lib> + + <lib file="lib/libQtSvg.so" > + <needs> + <item name="QtSvgIconPlugin" file="plugins/iconengines/libqsvgicon.so"/> + <item name="QtSvgPlugin" file="plugins/imageformats/libqsvg.so"/> + </needs> + </lib> + + <lib file="lib/libQtWebKit.so" > + <needs> + <item name="QmlWebkitPlugin" file="imports/QtWebKit/libqmlwebkitplugin.so" /> + <item name="QmlDir" file="imports/QtWebKit/qmldir" /> + </needs> + </lib> + + <lib file="lib/libQtDeclarative.so"> + <needs> + <item name="QmlFolderListModelPlugin" file="imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" /> + <item name="QmlDir" file="imports/Qt/labs/folderlistmodel/qmldir" /> + <item name="QmlGesturesPlugin" file="imports/Qt/labs/gestures/libqmlgesturesplugin.so" /> + <item name="QmlDir" file="imports/Qt/labs/gestures/qmldir" /> + <item name="QmlParticlesPlugin" file="imports/Qt/labs/particles/libqmlparticlesplugin.so" /> + <item name="QmlDir" file="imports/Qt/labs/particles/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtGui.so"> + <needs> + <item name="QtAccessibleWidgets" file="plugins/accessible/libqtaccessiblewidgets.so"/> + <item name="QtGifPlugin" file="plugins/imageformats/libqgif.so" /> + <item name="QtIcoPlugin" file="plugins/imageformats/libqico.so" /> + <item name="QtJpegPlugin" file="plugins/imageformats/libqjpeg.so" /> + <item name="QtMngPlugin" file="plugins/imageformats/libqmng.so" /> + <item name="QtTiffPlugin" file="plugins/imageformats/libqtiff.so" /> + </needs> + <depends> + <lib name="QtAndroidPlatformPlugin"/> + </depends> + </lib> + <lib file="plugins/platforms/android/libandroid-4.so" name="QtAndroidPlatformPlugin" platform="4" level="9999" /> + <lib file="plugins/platforms/android/libandroid-5.so" name="QtAndroidPlatformPlugin" platform="5" level="9999" /> + <lib file="plugins/platforms/android/libandroid-8.so" name="QtAndroidPlatformPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtSystemInfo.so"> + <needs> + <item name="QmlSystemInfoPlugin" file="imports/QtMobility/systeminfo/libdeclarative_systeminfo.so" /> + <item name="QmlDir" file="imports/QtMobility/systeminfo/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtLocation.so"> + <needs> + <item name="QmlLocationPlugin" file="imports/QtMobility/location/libdeclarative_location.so" /> + <item name="QmlDir" file="imports/QtMobility/location/qmldir" /> + <item name="QtGeoServicesNokiaPlugin" file="plugins/geoservices/libqtgeoservices_nokia.so" /> + </needs> + <depends> + <lib name="QtLandmarksPlugin"/> + </depends> + </lib> + <lib file="plugins/landmarks/libqtlandmarks_sqlite.so" name="QtLandmarksPlugin" level="9999" /> + + + <lib file="lib/libQtContacts.so"> + <needs> + <item name="QmlContactsPlugin" file="imports/QtMobility/contacts/libdeclarative_contacts.so" /> + <item name="QmlDir" file="imports/QtMobility/contacts/qmldir" /> + <item name="QtContactsServiceActionManagerPlugin" file="plugins/contacts/libqtcontacts_serviceactionmanager.so" /> + </needs> + <depends> + <lib name="QtAndroidContactsPlugin"/> + <lib name="QtVersit"/> + </depends> + </lib> + <lib file="plugins/contacts/libqtcontacts_android.so" name="QtAndroidContactsPlugin" platform="5" level="9999" /> + <lib file="plugins/contacts/libqtcontacts_android.so" name="QtAndroidContactsPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtFeedback.so"> + <needs> + <item name="QmlFeedbackPlugin" file="imports/QtMobility/feedback/libdeclarative_feedback.so" /> + <item name="QmlDir" file="imports/QtMobility/feedback/qmldir" /> + </needs> + <depends> + <lib name="QtAndroidFeedbackPlugin"/> + </depends> + </lib> + <lib file="plugins/feedback/libqtfeedback_android.so" name="QtAndroidFeedbackPlugin" platform="5" level="9999" /> + <lib file="plugins/feedback/libqtfeedback_android.so" name="QtAndroidFeedbackPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtVersit.so"> + <needs> + <item name="VersitBackupHandlerPlugin" file="plugins/versit/libqtversit_backuphandler.so" /> + <item name="VersitVcardPreserverPlugin" file="plugins/versit/libqtversit_vcardpreserver.so" /> + </needs> + </lib> + + + <lib file="lib/libQtSensors.so"> + <needs> + <item name="QmlSensorsPlugin" file="imports/QtMobility/sensors/libdeclarative_sensors.so" /> + <item name="QmlDir" file="imports/QtMobility/sensors/qmldir" /> + </needs> + <depends> + <lib name="QtAndroidSensorsPlugin"/> + </depends> + </lib> + <lib file="plugins/sensors/libqtsensors_android.so" name="QtAndroidSensorsPlugin" platform="5" level="9999" /> + <lib file="plugins/sensors/libqtsensors_android.so" name="QtAndroidSensorsPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtOrganizer.so"> + <needs> + <item name="QmlOrganizerPlugin" file="imports/QtMobility/organizer/libdeclarative_organizer.so" /> + <item name="QmlDir" file="imports/QtMobility/organizer/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtConnectivity.so"> + <needs> + <item name="QmlConnectivityPlugin" file="imports/QtMobility/connectivity/libdeclarative_connectivity.so" /> + <item name="QmlDir" file="imports/QtMobility/connectivity/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtGallery.so"> + <needs> + <item name="QmlGalleryPlugin" file="imports/QtMobility/gallery/libdeclarative_gallery.so" /> + <item name="QmlDir" file="imports/QtMobility/gallery/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtServiceFramework.so"> + <needs> + <item name="QmlServiceFrameworkPlugin" file="imports/QtMobility/serviceframework/libdeclarative_serviceframework.so" /> + <item name="QmlDir" file="imports/QtMobility/serviceframework/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtMultimediaKit.so"> + <needs> + <item name="QmlMultimediaKitPlugin" file="imports/QtMultimediaKit/libdeclarative_multimedia.so" /> + <item name="QmlDir" file="imports/QtMultimediaKit/qmldir" /> + <item name="QtMultimediaKitM3uPlugin" file="plugins/playlistformats/libqtmultimediakit_m3u.so" /> + </needs> + <depends> + <lib name="QtAndroidMKMediaPlugin"/> + <lib name="QtAndroidMKCameraPlugin"/> + </depends> + </lib> + <lib file="plugins/mediaservice/libqtmultimediakit_androidmedia.so" name="QtAndroidMKMediaPlugin" platform="8" level="9999" /> + <lib file="plugins/mediaservice/libqtmultimediakit_androidcam.so" name="QtAndroidMKCameraPlugin" platform="8" level="9999" /> +</libs> +</root> diff --git a/Necessitas_SDK/ministrorepogen/rules-armeabi.xml b/Necessitas_SDK/ministrorepogen/rules-armeabi.xml new file mode 100644 index 0000000..535f13e --- /dev/null +++ b/Necessitas_SDK/ministrorepogen/rules-armeabi.xml @@ -0,0 +1,201 @@ +<root> + <platforms> + <libs> + <version value="5"/> + <version value="6" symlink="5"/> + <version value="7" symlink="5"/> + <version value="8"/> + <version value="9"/> + <version value="10" symlink="9"/> + <version value="11" symlink="9"/> + <version value="12" symlink="9"/> + <version value="13" symlink="9"/> + <version value="14" symlink="9"/> + </libs> + <jars> + <version value="5" symlink="8"/> + <version value="8"/> + <version value="9" symlink="14"/> + </jars> + </platforms> + + <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtLoader" applicationParameters="-platform android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl QML_IMPORT_PATH=MINISTRO_PATH/qt/imports QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins"> + <lib file="lib/libQtCore.so" > + <needs> + <item name="QtIndustrius" type="jar" file="jar/QtIndustrius-%1.jar"/> + </needs> + </lib> + + <lib file="lib/libQtNetwork.so" > + <needs> + <item name="GenericBearerPlugin" file="plugins/bearer/libqgenericbearer.so"/> + </needs> + </lib> + + <lib file="lib/libQtSql.so" > + <needs> + <item name="QSQLitePlugin" file="plugins/sqldrivers/libqsqlite.so"/> + </needs> + </lib> + + <lib file="lib/libQtSvg.so" > + <needs> + <item name="QtSvgIconPlugin" file="plugins/iconengines/libqsvgicon.so"/> + <item name="QtSvgPlugin" file="plugins/imageformats/libqsvg.so"/> + </needs> + </lib> + + <lib file="lib/libQtWebKit.so" > + <needs> + <item name="QmlWebkitPlugin" file="imports/QtWebKit/libqmlwebkitplugin.so" /> + <item name="QmlDir" file="imports/QtWebKit/qmldir" /> + </needs> + </lib> + + <lib file="lib/libQtDeclarative.so"> + <needs> + <item name="QmlFolderListModelPlugin" file="imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" /> + <item name="QmlDir" file="imports/Qt/labs/folderlistmodel/qmldir" /> + <item name="QmlGesturesPlugin" file="imports/Qt/labs/gestures/libqmlgesturesplugin.so" /> + <item name="QmlDir" file="imports/Qt/labs/gestures/qmldir" /> + <item name="QmlParticlesPlugin" file="imports/Qt/labs/particles/libqmlparticlesplugin.so" /> + <item name="QmlDir" file="imports/Qt/labs/particles/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtGui.so"> + <needs> + <item name="QtAccessibleWidgets" file="plugins/accessible/libqtaccessiblewidgets.so"/> + <item name="QtGifPlugin" file="plugins/imageformats/libqgif.so" /> + <item name="QtIcoPlugin" file="plugins/imageformats/libqico.so" /> + <item name="QtJpegPlugin" file="plugins/imageformats/libqjpeg.so" /> + <item name="QtMngPlugin" file="plugins/imageformats/libqmng.so" /> + <item name="QtTiffPlugin" file="plugins/imageformats/libqtiff.so" /> + </needs> + <depends> + <lib name="QtAndroidPlatformPlugin"/> + </depends> + </lib> + <lib file="plugins/platforms/android/libandroid-4.so" name="QtAndroidPlatformPlugin" platform="4" level="9999" /> + <lib file="plugins/platforms/android/libandroid-5.so" name="QtAndroidPlatformPlugin" platform="5" level="9999" /> + <lib file="plugins/platforms/android/libandroid-8.so" name="QtAndroidPlatformPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtSystemInfo.so"> + <needs> + <item name="QmlSystemInfoPlugin" file="imports/QtMobility/systeminfo/libdeclarative_systeminfo.so" /> + <item name="QmlDir" file="imports/QtMobility/systeminfo/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtLocation.so"> + <needs> + <item name="QmlLocationPlugin" file="imports/QtMobility/location/libdeclarative_location.so" /> + <item name="QmlDir" file="imports/QtMobility/location/qmldir" /> + <item name="QtGeoServicesNokiaPlugin" file="plugins/geoservices/libqtgeoservices_nokia.so" /> + </needs> + <depends> + <lib name="QtLandmarksPlugin"/> + </depends> + </lib> + <lib file="plugins/landmarks/libqtlandmarks_sqlite.so" name="QtLandmarksPlugin" level="9999" /> + + + <lib file="lib/libQtContacts.so"> + <needs> + <item name="QmlContactsPlugin" file="imports/QtMobility/contacts/libdeclarative_contacts.so" /> + <item name="QmlDir" file="imports/QtMobility/contacts/qmldir" /> + <item name="QtContactsServiceActionManagerPlugin" file="plugins/contacts/libqtcontacts_serviceactionmanager.so" /> + </needs> + <depends> + <lib name="QtAndroidContactsPlugin"/> + <lib name="QtVersit"/> + </depends> + </lib> + <lib file="plugins/contacts/libqtcontacts_android.so" name="QtAndroidContactsPlugin" platform="5" level="9999" /> + <lib file="plugins/contacts/libqtcontacts_android.so" name="QtAndroidContactsPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtFeedback.so"> + <needs> + <item name="QmlFeedbackPlugin" file="imports/QtMobility/feedback/libdeclarative_feedback.so" /> + <item name="QmlDir" file="imports/QtMobility/feedback/qmldir" /> + </needs> + <depends> + <lib name="QtAndroidFeedbackPlugin"/> + </depends> + </lib> + <lib file="plugins/feedback/libqtfeedback_android.so" name="QtAndroidFeedbackPlugin" platform="5" level="9999" /> + <lib file="plugins/feedback/libqtfeedback_android.so" name="QtAndroidFeedbackPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtVersit.so"> + <needs> + <item name="VersitBackupHandlerPlugin" file="plugins/versit/libqtversit_backuphandler.so" /> + <item name="VersitVcardPreserverPlugin" file="plugins/versit/libqtversit_vcardpreserver.so" /> + </needs> + </lib> + + + <lib file="lib/libQtSensors.so"> + <needs> + <item name="QmlSensorsPlugin" file="imports/QtMobility/sensors/libdeclarative_sensors.so" /> + <item name="QmlDir" file="imports/QtMobility/sensors/qmldir" /> + </needs> + <depends> + <lib name="QtAndroidSensorsPlugin"/> + </depends> + </lib> + <lib file="plugins/sensors/libqtsensors_android.so" name="QtAndroidSensorsPlugin" platform="5" level="9999" /> + <lib file="plugins/sensors/libqtsensors_android.so" name="QtAndroidSensorsPlugin" platform="8" level="9999" /> + + + <lib file="lib/libQtOrganizer.so"> + <needs> + <item name="QmlOrganizerPlugin" file="imports/QtMobility/organizer/libdeclarative_organizer.so" /> + <item name="QmlDir" file="imports/QtMobility/organizer/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtConnectivity.so"> + <needs> + <item name="QmlConnectivityPlugin" file="imports/QtMobility/connectivity/libdeclarative_connectivity.so" /> + <item name="QmlDir" file="imports/QtMobility/connectivity/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtGallery.so"> + <needs> + <item name="QmlGalleryPlugin" file="imports/QtMobility/gallery/libdeclarative_gallery.so" /> + <item name="QmlDir" file="imports/QtMobility/gallery/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtServiceFramework.so"> + <needs> + <item name="QmlServiceFrameworkPlugin" file="imports/QtMobility/serviceframework/libdeclarative_serviceframework.so" /> + <item name="QmlDir" file="imports/QtMobility/serviceframework/qmldir" /> + </needs> + </lib> + + + <lib file="lib/libQtMultimediaKit.so"> + <needs> + <item name="QmlMultimediaKitPlugin" file="imports/QtMultimediaKit/libdeclarative_multimedia.so" /> + <item name="QmlDir" file="imports/QtMultimediaKit/qmldir" /> + <item name="QtMultimediaKitM3uPlugin" file="plugins/playlistformats/libqtmultimediakit_m3u.so" /> + </needs> + <depends> + <lib name="QtAndroidMKMediaPlugin"/> + <lib name="QtAndroidMKCameraPlugin"/> + </depends> + </lib> + <lib file="plugins/mediaservice/libqtmultimediakit_androidmedia.so" name="QtAndroidMKMediaPlugin" platform="8" level="9999" /> + <lib file="plugins/mediaservice/libqtmultimediakit_androidcam.so" name="QtAndroidMKCameraPlugin" platform="8" level="9999" /> +</libs> +</root> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/installscript.qs index 2fd0ed2..48f5c8c 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/installscript.qs @@ -44,11 +44,12 @@ Component.prototype.createOperations = function() { component.createOperations(); var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/armeabi"; - component.addOperation( "QtPatch", qtPath ); - component.addOperation( "RegisterQtInCreator", - "@TargetDir@", + component.addOperation( "QtPatch2", qtPath ); + component.addOperation( "RegisterQtInCreatorV23", "Necessitas Qt @@NECESSITAS_QT_VERSION@@ for Android armv5", - qtPath ); + qtPath, + "Android", + "Android_Platform_API_5_ARMv5"); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/package.xml index 3bb6a48..f21a97d 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi/meta/package.xml @@ -1,11 +1,12 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt @@NECESSITAS_QT_VERSION@@-armeabi</DisplayName> + <DisplayName>Qt @@NECESSITAS_QT_VERSION@@-armeabi API 5+</DisplayName> <Description>Development libraries for development applications on Android devices, armeabi architecture.</Description> <Version>@@NECESSITAS_QT_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.android.qt.armeabi</Name> <Script>installscript.qs</Script> + <Default>true</Default> <InstallPriority>0</InstallPriority> <SortingPriority>0</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_android_4/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_android_4/meta/installscript.qs new file mode 100644 index 0000000..16610a2 --- /dev/null +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_android_4/meta/installscript.qs @@ -0,0 +1,59 @@ +/* + 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( "qt-framework.7z" ); + component.addDownloadableArchive( "qt-tools-linux-x86.7z" ); + } + else if (installer.value("os") == "win") + { + component.addDownloadableArchive( "qt-framework-windows.7z" ); + component.addDownloadableArchive( "qt-tools-windows.7z" ); + } + else if (installer.value("os") == "mac") + { + component.addDownloadableArchive( "qt-framework.7z" ); + component.addDownloadableArchive( "qt-tools-darwin-x86.7z" ); + } + } +} + +Component.prototype.createOperations = function() +{ + try + { + component.createOperations(); + var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/armeabi-android-4"; + component.addOperation( "QtPatch2", qtPath ); + + component.addOperation( "RegisterQtInCreatorV23", + "Necessitas Qt @@NECESSITAS_QT_VERSION@@ for Android API 4+ armv5", + qtPath, + "Android", + "Android_Platform_API_4_ARMv5"); + } + catch( e ) + { + print( e ); + } +} diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_android_4/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_android_4/meta/package.xml new file mode 100644 index 0000000..6529b3d --- /dev/null +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_android_4/meta/package.xml @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Qt @@NECESSITAS_QT_VERSION@@-armeabi for Android API 4+</DisplayName> + <Description>Development libraries for development applications on Android API+ devices, armeabi architecture. This package desn't support OpenGL, if you need it pllease consider to use API 5+ package </Description> + <Version>@@NECESSITAS_QT_VERSION@@</Version> + <ReleaseDate>@@TODAY@@</ReleaseDate> + <Name>org.kde.necessitas.android.qt.armeabi_android_4</Name> + <Script>installscript.qs</Script> + <InstallPriority>0</InstallPriority> + <SortingPriority>0</SortingPriority> +</Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/installscript.qs index e206cf5..fdbb979 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/installscript.qs @@ -44,11 +44,12 @@ Component.prototype.createOperations = function() { component.createOperations(); var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/armeabi-v7a"; - component.addOperation( "QtPatch", qtPath ); - component.addOperation( "RegisterQtInCreator", - "@TargetDir@", - "Necessitas Qt @@NECESSITAS_QT_VERSION@@ for Android armv7", - qtPath ); + component.addOperation( "QtPatch2", qtPath ); + component.addOperation( "RegisterQtInCreatorV23", + "Necessitas Qt @@NECESSITAS_QT_VERSION@@ for Android armv7a", + qtPath, + "Android", + "Android_Platform_API_5_ARMv7a"); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/package.xml index 27ebe6c..5d5fb9a 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.armeabi_v7a/meta/package.xml @@ -1,11 +1,12 @@ <?xml version="1.0"?> <Package> - <DisplayName>Qt @@NECESSITAS_QT_VERSION@@-armeabi_v7a</DisplayName> + <DisplayName>Qt @@NECESSITAS_QT_VERSION@@-armeabi_v7a API 5+</DisplayName> <Description>Development libraries for development applications on Android devices, armeabi_v7a architecture.</Description> <Version>@@NECESSITAS_QT_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.android.qt.armeabi_v7a</Name> <Script>installscript.qs</Script> + <Default>true</Default> <InstallPriority>0</InstallPriority> <SortingPriority>0</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.src/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.src/meta/installscript.qs index 3817efc..2ec8ca0 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.src/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.src/meta/installscript.qs @@ -36,8 +36,10 @@ Component.prototype.createOperations = function() try { component.createOperations(); - var qtPath = ""; - component.addOperation( "RegisterQtCreatorSourceMapping", "@TargetDir@", "@@TEMP_PATH@@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qt-src", "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qt-src" ); + component.addOperation( "RegisterPersistentSettings", + "source_mapping.xml", + "@@TEMP_PATH@@/@@REPOSITORY@@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qt-src", + "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qt-src" ); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/installscript.qs index 8910d5e..3259d9c 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/installscript.qs @@ -44,11 +44,12 @@ Component.prototype.createOperations = function() { component.createOperations(); var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/x86"; - component.addOperation( "QtPatch", qtPath ); - component.addOperation( "RegisterQtInCreator", - "@TargetDir@", + component.addOperation( "QtPatch2", qtPath ); + component.addOperation( "RegisterQtInCreatorV23", "Necessitas Qt @@NECESSITAS_QT_VERSION@@ for Android x86", - qtPath ); + qtPath, + "Android", + "Android_Platform_API_9_x86"); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/package.xml index 385a6a8..80638fc 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qt.x86/meta/package.xml @@ -6,6 +6,7 @@ <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.android.qt.x86</Name> <Script>installscript.qs</Script> + <Default>true</Default> <InstallPriority>0</InstallPriority> <SortingPriority>0</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/installscript.qs index 0d1e8d2..3d0e487 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/installscript.qs @@ -37,7 +37,7 @@ Component.prototype.createOperations = function() { component.createOperations(); var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/armeabi"; - component.addOperation( "QtPatch", qtPath, "/data/data/eu.licentia.necessitas.ministro/files/qt" ); + component.addOperation( "QtPatch2", qtPath, "@@NECESSITAS_QTMOBILITY_ARMEABI_INSTALL_PATH@@" ); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml index a98fbe6..57d4c63 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml @@ -5,9 +5,9 @@ <Version>@@NECESSITAS_QTMOBILITY_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.android.qtmobility.armeabi</Name> - <Dependencies>org.kde.necessitas.android.qt.armeabi</Dependencies> - <Dependencies>org.kde.necessitas.android.qtwebkit.armeabi</Dependencies> + <Dependencies>org.kde.necessitas.android.qt.armeabi,org.kde.necessitas.android.qtwebkit.armeabi</Dependencies> <Script>installscript.qs</Script> + <Default>true</Default> <InstallPriority>2</InstallPriority> <SortingPriority>2</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/installscript.qs index 46d4814..e06cc67 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/installscript.qs @@ -37,7 +37,7 @@ Component.prototype.createOperations = function() { component.createOperations(); var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/armeabi-v7a"; - component.addOperation( "QtPatch", qtPath, "/data/data/eu.licentia.necessitas.ministro/files/qt" ); + component.addOperation( "QtPatch2", qtPath, "@@NECESSITAS_QTMOBILITY_ARMEABI-V7A_INSTALL_PATH@@" ); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml index d149833..7e3f341 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml @@ -5,9 +5,9 @@ <Version>@@NECESSITAS_QTMOBILITY_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.android.qtmobility.armeabi_v7a</Name> - <Dependencies>org.kde.necessitas.android.qt.armeabi_v7a</Dependencies> - <Dependencies>org.kde.necessitas.android.qtwebkit.armeabi_v7a</Dependencies> + <Dependencies>org.kde.necessitas.android.qt.armeabi_v7a,org.kde.necessitas.android.qtwebkit.armeabi_v7a</Dependencies> <Script>installscript.qs</Script> + <Default>true</Default> <InstallPriority>2</InstallPriority> <SortingPriority>2</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.src/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.src/meta/installscript.qs index 836b44b..95aa240 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.src/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.src/meta/installscript.qs @@ -36,8 +36,10 @@ Component.prototype.createOperations = function() try { component.createOperations(); - var qtPath = ""; - component.addOperation( "RegisterQtCreatorSourceMapping", "@TargetDir@", "@@TEMP_PATH@@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtmobility-src", "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtmobility-src" ); + component.addOperation( "RegisterPersistentSettings", + "source_mapping.xml", + "@@TEMP_PATH@@/@@REPOSITORY@@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtmobility-src", + "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtmobility-src" ); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/installscript.qs index a8caf6e..bdf0844 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/installscript.qs @@ -37,7 +37,7 @@ Component.prototype.createOperations = function() { component.createOperations(); var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/armeabi"; - component.addOperation( "QtPatch", qtPath, "/data/data/eu.licentia.necessitas.ministro/files/qt" ); + component.addOperation( "QtPatch2", qtPath, "@@NECESSITAS_QTWEBKIT_ARMEABI_INSTALL_PATH@@" ); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml index cd96408..449222e 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml @@ -7,6 +7,7 @@ <Name>org.kde.necessitas.android.qtwebkit.armeabi</Name> <Dependencies>org.kde.necessitas.android.qt.armeabi</Dependencies> <Script>installscript.qs</Script> + <Default>true</Default> <InstallPriority>1</InstallPriority> <SortingPriority>1</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/installscript.qs index ce7cea1..534dab2 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/installscript.qs @@ -37,7 +37,7 @@ Component.prototype.createOperations = function() { component.createOperations(); var qtPath = "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/armeabi-v7a"; - component.addOperation( "QtPatch", qtPath, "/data/data/eu.licentia.necessitas.ministro/files/qt" ); + component.addOperation( "QtPatch2", qtPath, "@@NECESSITAS_QTWEBKIT_ARMEABI-V7A_INSTALL_PATH@@" ); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml index 49380c8..25e7885 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml @@ -7,6 +7,7 @@ <Name>org.kde.necessitas.android.qtwebkit.armeabi_v7a</Name> <Dependencies>org.kde.necessitas.android.qt.armeabi_v7a</Dependencies> <Script>installscript.qs</Script> + <Default>true</Default> <InstallPriority>1</InstallPriority> <SortingPriority>1</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.src/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.src/meta/installscript.qs index d0eda00..1543d19 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.src/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.src/meta/installscript.qs @@ -36,8 +36,10 @@ Component.prototype.createOperations = function() try { component.createOperations(); - var qtPath = ""; - component.addOperation( "RegisterQtCreatorSourceMapping", "@TargetDir@", "@@TEMP_PATH@@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtwebkit-src", "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtwebkit-src" ); + component.addOperation( "RegisterPersistentSettings", + "source_mapping.xml", + "@@TEMP_PATH@@/@@REPOSITORY@@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtwebkit-src", + "@TargetDir@/Android/Qt/@@NECESSITAS_QT_VERSION_SHORT@@/qtwebkit-src" ); } catch( e ) { diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/installscript.qs index 75fc78c..23df821 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/installscript.qs @@ -45,9 +45,28 @@ Component.prototype.createOperations = function() // Call the base createOperations(unpacking ...) component.createOperations(); - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "AntLocation", "@TargetDir@/apache-ant-1.8.2/bin/"+OsToAnt() ); } + +Component.prototype.isDefault = function() +{ + if (installer.value("os") == "x11" || installer.value("os") == "mac") + { + ant = installer.execute( "/usr/bin/which", new Array( "ant" ) )[0]; + if (!ant) + { + return true; + } + else + { + return false; + } + } + else + { + return true; + } +} diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/package.xml index b53b0f7..7bc0bc2 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ant/meta/package.xml @@ -1,12 +1,12 @@ <?xml version="1.0"?> <Package> <DisplayName>Apache Ant</DisplayName> - <Description>Apache Ant Build Tool</Description> + <Description>Apache Ant Build Tool, you need it ONLY if you don't have it already installed.</Description> <Version>1.8.2</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.ant</Name> <Script>installscript.qs</Script> - <InstallPriority>99999</InstallPriority> + <Default>script</Default> + <InstallPriority>99</InstallPriority> <SortingPriority>94</SortingPriority> - <ForcedInstallation>false</ForcedInstallation> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/installscript.qs index 404e972..aea8e0f 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/installscript.qs @@ -50,15 +50,13 @@ Component.prototype.createOperations = function() pythonPath+=".exe"; } - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbLocation", gdbPath ); - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbserverLocation", gdbserverPath ); diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/package.xml index 3ae23bd..f179f6d 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_7_3/meta/package.xml @@ -6,7 +6,7 @@ <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.ndk.gdb_7_3</Name> <Script>installscript.qs</Script> - <InstallPriority>99999</InstallPriority> - <SortingPriority>94</SortingPriority> - <ForcedInstallation>false</ForcedInstallation> + <Default>true</Default> + <InstallPriority>99</InstallPriority> + <SortingPriority>99</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_head/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_head/meta/installscript.qs index b5cc95c..5201c63 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_head/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.gdb_head/meta/installscript.qs @@ -50,15 +50,13 @@ Component.prototype.createOperations = function() pythonPath+=".exe"; } - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbLocation", gdbPath ); - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbserverLocation", gdbserverPath ); 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 933e48d..b41e56c 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 @@ -40,15 +40,13 @@ Component.prototype.createOperations = function() // Call the base createOperations(unpacking ...) component.createOperations(); // set NDK Location - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "NDKLocation", "@TargetDir@/android-ndk-@@ANDROID_NDK_MAJOR_VERSION@@" ); // set NDK toolchain version - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "NDKToolchainVersion", "arm-linux-androideabi-4.4.3" ); @@ -68,14 +66,12 @@ Component.prototype.createOperations = function() gdbPath+="darwin-x86/bin/arm-linux-androideabi-gdb"; } - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbLocation", gdbPath ); - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbserverLocation", gdbserverPath ); } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/installscript.qs index 089af39..c6f9e7f 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/installscript.qs @@ -40,18 +40,16 @@ Component.prototype.createOperations = function() // Call the base createOperations(unpacking ...) component.createOperations(); // set NDK Location - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "NDKLocation", "@TargetDir@/android-ndk-@@ANDROID_NDK_VERSION@@" ); // set NDK toolchain version - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "NDKToolchainVersion", "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 gdbserverPath = gdbPath+"gdbserver"; @@ -68,14 +66,13 @@ Component.prototype.createOperations = function() gdbPath+="darwin-x86/bin/arm-linux-androideabi-gdb"; } - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbLocation", gdbPath ); - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "GdbserverLocation", gdbserverPath ); +*/ } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/package.xml index db7a70a..298c5fb 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.ndk.r6/meta/package.xml @@ -7,6 +7,7 @@ <Name>org.kde.necessitas.misc.ndk.@@ANDROID_NDK_MAJOR_VERSION@@</Name> <Script>installscript.qs</Script> <Dependencies>org.kde.necessitas.tools.qtcreator</Dependencies> + <Default>true</Default> <InstallPriority>90</InstallPriority> <SortingPriority>90</SortingPriority> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.openjdk/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.openjdk/meta/installscript.qs index 59ec934..7ac66e9 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.openjdk/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.openjdk/meta/installscript.qs @@ -61,9 +61,8 @@ Component.prototype.createOperations = function() // Call the base createOperations(unpacking ...) component.createOperations(); - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + component.addOperation( "RegisterPersistentSettings", + "android.xml", "OpenJDKLocation", "@TargetDir@/openjdk/"+OsToTargetDir() ); } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/installscript.qs index 201d26a..f2acd83 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/installscript.qs @@ -20,18 +20,7 @@ function Component() { if( component.fromOnlineRepository ) { - if (installer.value("os") == "x11") - { - component.addDownloadableArchive( "android-@@ANDROID_API_10_VERSION@@-linux.7z" ); - } - else if (installer.value("os") == "win") - { - component.addDownloadableArchive( "android-@@ANDROID_API_10_VERSION@@-windows.7z" ); - } - else if (installer.value("os") == "mac") - { - component.addDownloadableArchive( "android-@@ANDROID_API_10_VERSION@@-macosx.7z" ); - } + component.addDownloadableArchive( "android-@@ANDROID_API_10_VERSION@@.7z" ); } } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/package.xml index 5ca0e04..67c5015 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_10/meta/package.xml @@ -5,7 +5,7 @@ <Version>@@ANDROID_API_10_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_10</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> + <Default>true</Default> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/installscript.qs index 798b6f9..f4aa4f7 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/installscript.qs @@ -20,18 +20,7 @@ function Component() { if( component.fromOnlineRepository ) { - if (installer.value("os") == "x11") - { - component.addDownloadableArchive( "android-@@ANDROID_API_11_VERSION@@-linux.7z" ); - } - else if (installer.value("os") == "win") - { - component.addDownloadableArchive( "android-@@ANDROID_API_11_VERSION@@-windows.7z" ); - } - else if (installer.value("os") == "mac") - { - component.addDownloadableArchive( "android-@@ANDROID_API_11_VERSION@@-macosx.7z" ); - } + component.addDownloadableArchive( "android-@@ANDROID_API_11_VERSION@@.7z" ); } } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/package.xml index a09fadf..21be9a4 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_11/meta/package.xml @@ -5,7 +5,6 @@ <Version>@@ANDROID_API_11_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_11</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/installscript.qs index 037c11c..8dbb2d7 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/installscript.qs @@ -20,18 +20,7 @@ function Component() { if( component.fromOnlineRepository ) { - if (installer.value("os") == "x11") - { - component.addDownloadableArchive( "android-@@ANDROID_API_12_VERSION@@-linux.7z" ); - } - else if (installer.value("os") == "win") - { - component.addDownloadableArchive( "android-@@ANDROID_API_12_VERSION@@-windows.7z" ); - } - else if (installer.value("os") == "mac") - { - component.addDownloadableArchive( "android-@@ANDROID_API_12_VERSION@@-macosx.7z" ); - } + component.addDownloadableArchive( "android-@@ANDROID_API_12_VERSION@@.7z" ); } } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/package.xml index e4b0565..918376a 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_12/meta/package.xml @@ -5,7 +5,6 @@ <Version>@@ANDROID_API_12_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_12</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> </Package> 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 index b76137b..f6466c5 100644 --- 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 @@ -20,18 +20,7 @@ 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.addDownloadableArchive( "android-@@ANDROID_API_13_VERSION@@.7z" ); } } 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 index c2670c2..6cd110c 100644 --- 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 @@ -5,7 +5,6 @@ <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> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_14/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_14/meta/installscript.qs new file mode 100644 index 0000000..4e4a3c0 --- /dev/null +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_14/meta/installscript.qs @@ -0,0 +1,31 @@ +/* + 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 ) + { + component.addDownloadableArchive( "android-@@ANDROID_API_14_VERSION@@.7z" ); + } +} + +Component.prototype.createOperations = function() +{ + // Call the base createOperations(unpacking ...) + component.createOperations(); +} diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_14/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_14/meta/package.xml new file mode 100644 index 0000000..b76328b --- /dev/null +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_14/meta/package.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>API 14</DisplayName> + <Description>Android SDK API 14 (@@ANDROID_API_14_VERSION@@)</Description> + <Version>@@ANDROID_API_14_VERSION@@</Version> + <ReleaseDate>@@TODAY@@</ReleaseDate> + <Name>org.kde.necessitas.misc.sdk.android_14</Name> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Script>installscript.qs</Script> +</Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_4/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_4/meta/package.xml index 240443d..b6dbbc3 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_4/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_4/meta/package.xml @@ -5,7 +5,6 @@ <Version>@@ANDROID_API_4_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_4</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_5/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_5/meta/package.xml index 3fc687c..a229ae7 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_5/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_5/meta/package.xml @@ -5,7 +5,6 @@ <Version>@@ANDROID_API_5_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_5</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_6/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_6/meta/package.xml index 983d20b..87fd190 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_6/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_6/meta/package.xml @@ -5,7 +5,6 @@ <Version>@@ANDROID_API_6_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_6</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/installscript.qs index 7e369f4..d4ef563 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/installscript.qs @@ -20,24 +20,11 @@ function Component() { if( component.fromOnlineRepository ) { - if (installer.value("os") == "x11") - { - component.addDownloadableArchive( "android-@@ANDROID_API_7_VERSION@@-linux.7z" ); - } - else if (installer.value("os") == "win") - { - component.addDownloadableArchive( "android-@@ANDROID_API_7_VERSION@@-windows.7z" ); - } - else if (installer.value("os") == "mac") - { - component.addDownloadableArchive( "android-@@ANDROID_API_7_VERSION@@-macosx.7z" ); - } + component.addDownloadableArchive( "android-@@ANDROID_API_7_VERSION@@.7z" ); } } Component.prototype.createOperations = function() { - // Call the base createOperations(unpacking ...) component.createOperations(); - // set SDK Location } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/package.xml index c107f46..b531b01 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_7/meta/package.xml @@ -5,7 +5,7 @@ <Version>@@ANDROID_API_7_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_7</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> + <Default>true</Default> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/installscript.qs index 317d11b..c078f4f 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/installscript.qs @@ -20,18 +20,7 @@ function Component() { if( component.fromOnlineRepository ) { - if (installer.value("os") == "x11") - { - component.addDownloadableArchive( "android-@@ANDROID_API_8_VERSION@@-linux.7z" ); - } - else if (installer.value("os") == "win") - { - component.addDownloadableArchive( "android-@@ANDROID_API_8_VERSION@@-windows.7z" ); - } - else if (installer.value("os") == "mac") - { - component.addDownloadableArchive( "android-@@ANDROID_API_8_VERSION@@-macosx.7z" ); - } + component.addDownloadableArchive( "android-@@ANDROID_API_8_VERSION@@.7z" ); } } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/package.xml index a597d1f..2b097c5 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_8/meta/package.xml @@ -5,7 +5,7 @@ <Version>@@ANDROID_API_8_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_8</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> + <Default>true</Default> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/installscript.qs index 6b3a0c7..bdb00fa 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/installscript.qs @@ -20,18 +20,7 @@ function Component() { if( component.fromOnlineRepository ) { - if (installer.value("os") == "x11") - { - component.addDownloadableArchive( "android-@@ANDROID_API_9_VERSION@@-linux.7z" ); - } - else if (installer.value("os") == "win") - { - component.addDownloadableArchive( "android-@@ANDROID_API_9_VERSION@@-windows.7z" ); - } - else if (installer.value("os") == "mac") - { - component.addDownloadableArchive( "android-@@ANDROID_API_9_VERSION@@-macosx.7z" ); - } + component.addDownloadableArchive( "android-@@ANDROID_API_9_VERSION@@.7z" ); } } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/package.xml index b6384c9..102172f 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.android_9/meta/package.xml @@ -5,7 +5,6 @@ <Version>@@ANDROID_API_9_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.android_9</Name> - <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> - <Dependencies>org.kde.necessitas.misc.sdk.platform_tools</Dependencies> + <Dependencies>org.kde.necessitas.misc.sdk.base,org.kde.necessitas.misc.sdk.platform_tools</Dependencies> <Script>installscript.qs</Script> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/installscript.qs index a1c153b..453f6aa 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/installscript.qs @@ -22,7 +22,7 @@ function Component() { if (installer.value("os") == "x11") { - component.addDownloadableArchive( "android-sdk-linux_x86.7z" ); + component.addDownloadableArchive( "android-sdk-linux.7z" ); } else if (installer.value("os") == "win") { @@ -30,7 +30,7 @@ function Component() } else if (installer.value("os") == "mac") { - component.addDownloadableArchive( "android-sdk-mac_x86.7z" ); + component.addDownloadableArchive( "android-sdk-macosx.7z" ); } } } @@ -39,25 +39,10 @@ Component.prototype.createOperations = function() { // Call the base createOperations(unpacking ...) component.createOperations(); - // set SDK Location - var sdkPath; - if (installer.value("os") == "x11") - { - sdkPath="@TargetDir@/android-sdk-linux_x86"; - } - else if (installer.value("os") == "win") - { - sdkPath="@TargetDir@/android-sdk-windows"; - } - else if (installer.value("os") == "mac") - { - sdkPath="@TargetDir@/android-sdk-mac_x86"; - } - - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "AndroidConfigurations", + // set SDK Location + component.addOperation( "RegisterPersistentSettings", + "android.xml", "SDKLocation", - sdkPath ); + "@TargetDir@/android-sdk" ); } diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/package.xml index b02c7df..35ef6cb 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.base/meta/package.xml @@ -6,4 +6,5 @@ <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.misc.sdk.base</Name> <Script>installscript.qs</Script> + <Virtual>true</Virtual> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.platform_tools/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.platform_tools/meta/package.xml index 1980a65..c6bff7d 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.platform_tools/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.misc.sdk.platform_tools/meta/package.xml @@ -7,4 +7,5 @@ <Name>org.kde.necessitas.misc.sdk.platform_tools</Name> <Dependencies>org.kde.necessitas.misc.sdk.base</Dependencies> <Script>installscript.qs</Script> + <Virtual>true</Virtual> </Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs index 8f928f4..bf8991c 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/installscript.qs @@ -18,7 +18,6 @@ // constructor function Component() { - installer.installationFinished.connect( this, Component.prototype.installationFinished ); if (installer.value("os") == "win") { component.selectedChanged.connect( this, checkWhetherStopProcessIsNeeded ); @@ -62,134 +61,116 @@ checkWhetherStopProcessIsNeeded = function() } - -Component.prototype.createOperations = function() +registerWindowsFileTypeExtensions = function() { - // Call the base createOperations and afterwards set some registry settings - component.createOperations(); + var headerExtensions = new Array("h", "hh", "hxx", "h++", "hpp", "hpp"); - if (installer.value("os") == "win") { - var win_application = installer.value("TargetDir") + "/SDKMaintenanceTool.exe"; - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "Updater", - "Application", - win_application ); - } else if (installer.value("os") == "x11") { - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "Updater", - "Application", - "@TargetDir@/SDKMaintenanceTool" ); - } else if (installer.value("os") == "mac") { - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "Updater", - "Application", - "@TargetDir@/SDKMaintenanceTool.app/Contents/MacOS/SDKMaintenanceTool" ); + for (var i = 0; i < headerExtensions.length; ++i) { + component.addOperation( "RegisterFileType", + headerExtensions[i], + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "C++ Header file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,3"); } - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "Updater", - "CheckOnlyArgument", - "--checkupdates" ); - component.addOperation( "SetQtCreatorValue", - "@TargetDir@", - "Updater", - "RunUiArgument", - "--updater" ); - if ( installer.value("os") == "x11" ) - { -// component.addOperation( "SetPluginPathOnQtCore", -// "@TargetDir@/QtCreator/lib/qtcreator", -// "@TargetDir@/QtCreator/lib/qtcreator/plugins"); + var cppExtensions = new Array("cc", "cxx", "c++", "cp", "cpp"); - component.addOperation( "InstallIcons", "@TargetDir@/QtCreator/icons" ); - component.addOperation( "CreateDesktopEntry", - "Necessitas-qtcreator.desktop", - "Type=Application\nExec=@TargetDir@/QtCreator/bin/necessitas\nPath=@homeDir@\nName=Necessitas Qt Creator\nGenericName=The IDE of choice for development on Android devices.\nIcon=necessitas\nTerminal=false\nCategories=Development;IDE;Qt;\nMimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;" - ); + for (var i = 0; i < cppExtensions.length; ++i) { + component.addOperation( "RegisterFileType", + cppExtensions[i], + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "C++ Source file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,2"); } + + component.addOperation( "RegisterFileType", + "c", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "C Source file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,1"); + component.addOperation( "RegisterFileType", + "ui", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "Qt UI file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,4"); + component.addOperation( "RegisterFileType", + "pro", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "Qt Project file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,5"); + component.addOperation( "RegisterFileType", + "pri", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "Qt Project Include file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,6"); + component.addOperation( "RegisterFileType", + "qs", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "Qt Script file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,0"); + component.addOperation( "RegisterFileType", + "qml", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", + "Qt Quick Markup language file", + "", + "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,0"); +} + +Component.prototype.createOperations = function() +{ + // Call the base createOperations and afterwards set some registry settings + component.createOperations(); if ( installer.value("os") == "win" ) { component.addOperation( "SetPluginPathOnQtCore", "@TargetDir@/QtCreator/bin", "@TargetDir@/QtCreator/plugins"); + component.addOperation( "SetImportsPathOnQtCore", + "@TargetDir@/QtCreator/bin", + "@TargetDir@/QtCreator/bin"); component.addOperation( "CreateShortcut", "@TargetDir@\\QtCreator\\bin\\qtcreator.exe", "@StartMenuDir@/Qt Creator.lnk", "workingDirectory=@homeDir@" ); - - var headerExtensions = new Array("h", "hh", "hxx", "h++", "hpp", "hpp"); - - for (var i = 0; i < headerExtensions.length; ++i) { - component.addOperation( "RegisterFileType", - headerExtensions[i], - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", - "C++ Header file", - "", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,3"); - } - - var cppExtensions = new Array("cc", "cxx", "c++", "cp", "cpp"); - - for (var i = 0; i < cppExtensions.length; ++i) { - component.addOperation( "RegisterFileType", - cppExtensions[i], - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", - "C++ Source file", - "", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,2"); - } - - component.addOperation( "RegisterFileType", - "c", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", - "C Source file", - "", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,1"); - component.addOperation( "RegisterFileType", - "ui", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", - "Qt UI file", - "", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,4"); - component.addOperation( "RegisterFileType", - "pro", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", - "Qt Project file", - "", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,5"); - component.addOperation( "RegisterFileType", - "pri", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe -client '%1'", - "Qt Project Include file", - "", - "@TargetDir@\\QtCreator\\bin\\qtcreator.exe,6"); - + registerWindowsFileTypeExtensions(); } -} + if ( installer.value("os") == "x11" ) + { + component.addOperation( "SetPluginPathOnQtCore", + "@TargetDir@/QtCreator/lib/qtcreator", + "@TargetDir@/QtCreator/lib/qtcreator/plugins"); + component.addOperation( "SetImportsPathOnQtCore", + "@TargetDir@/QtCreator/lib/qtcreator", + "@TargetDir@/QtCreator/bin"); -Component.prototype.installationFinished = function() -{ - if (installer.isInstaller() && component.selected) + component.addOperation( "InstallIcons", "@TargetDir@/QtCreator/images" ); + component.addOperation( "CreateDesktopEntry", + "Necessitas-qtcreator.desktop", + "Type=Application\nExec=@TargetDir@/QtCreator/bin/necessitas\nPath=@homeDir@\nName=Necessitas Qt Creator\nGenericName=The IDE of choice for development on Android devices.\nIcon=necessitas\nTerminal=false\nCategories=Development;IDE;Qt;\nMimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;" + ); + } + if (!installer.isUpdater()) { if (installer.value("os") == "win") { installer.setValue("RunProgram", installer.value("TargetDir") + "\\QtCreator\\bin\\qtcreator.exe"); - installer.setValue("RunProgramDescription", "Launch Qt Creator"); } else if (installer.value("os") == "x11") { installer.setValue("RunProgram", installer.value("TargetDir") + "/QtCreator/bin/necessitas"); - installer.setValue("RunProgramDescription", "Launch Qt Creator"); } else if (installer.value("os") == "mac") { installer.setValue("RunProgram", "\"" + installer.value("TargetDir") + "/QtCreator/bin/NecessitasQtCreator.app/Contents/MacOS/NecessitasQtCreator\""); - installer.setValue("RunProgramDescription", "Launch Qt Creator"); } + installer.setValue("RunProgramDescription", "Launch Qt Creator"); } + } - diff --git a/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/package.xml index ee94558..b506582 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas.tools.qtcreator/meta/package.xml @@ -2,6 +2,7 @@ <Package> <DisplayName>Necessitas Qt Creator Application</DisplayName> <Description>The IDE for Qt development on Android devices.</Description> + <UpdateText>Update to 2.3.1 release</UpdateText> <Version>@@NECESSITAS_QT_CREATOR_VERSION@@</Version> <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas.tools.qtcreator</Name> diff --git a/Necessitas_SDK/packages/org.kde.necessitas.tools.sdkmaintenance/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas.tools.sdkmaintenance/meta/installscript.qs new file mode 100644 index 0000000..0e54d3c --- /dev/null +++ b/Necessitas_SDK/packages/org.kde.necessitas.tools.sdkmaintenance/meta/installscript.qs @@ -0,0 +1,110 @@ +/* + 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( "sdkmaintenance-linux-x86.7z" ); + } + else if (installer.value("os") == "win") + { + component.addDownloadableArchive( "sdkmaintenance-windows.7z" ); + } + else if (installer.value("os") == "mac") + { + component.addDownloadableArchive( "sdkmaintenance-darwin-x86.7z" ); + } + } + + if (installer.value("os") == "win") { + component.installerbaseBinaryPath = "@TargetDir@/temp/SDKMaintenanceToolBase.exe"; + } + else if (installer.value("os") == "x11" || installer.value("os") == "mac") + { + component.installerbaseBinaryPath = "@TargetDir@/.tempSDKMaintenanceTool"; + } + installer.setInstallerBaseBinary(component.installerbaseBinaryPath); +} + + +Component.prototype.createOperationsForArchive = function(archive) +{ + //installer.performOperation in older versions of the installer framework don't supports @TargetDir@ + var normalizedInstallerbaseBinaryPath = component.installerbaseBinaryPath.replace(/@TargetDir@/, + installer.value("TargetDir")); + + installer.performOperation("SimpleMoveFile", + new Array(normalizedInstallerbaseBinaryPath, normalizedInstallerbaseBinaryPath + "_backup")); + component.createOperationsForArchive(archive); +} + +Component.prototype.createOperations = function() +{ + // Call the base createOperations(unpacking ...) + component.createOperations(); + if (installer.value("os") == "win") { + var win_application = installer.value("TargetDir") + "/SDKMaintenanceTool.exe"; + component.addOperation( "RegisterPersistentSettings", + "updateInfo.xml", + "Application", + win_application ); + component.addOperation( "CreateShortcut", + win_application, + "@StartMenuDir@/Maintain Qt SDK.lnk", + " --manage-packages"); + component.addOperation( "CreateShortcut", + win_application, + "@StartMenuDir@/Update Qt SDK.lnk", + " --updater"); + } + else if (installer.value("os") == "x11") + { + component.addOperation( "RegisterPersistentSettings", + "updateInfo.xml", + "Application", + "@TargetDir@/SDKMaintenanceTool" ); + component.addOperation( "InstallIcons", "@TargetDir@/icons" ); + component.addOperation( "CreateDesktopEntry", + "Necessitas-SDKMaintenanceTool.desktop", + "Type=Application\nExec=@TargetDir@/SDKMaintenanceTool\nPath=@TargetDir@\nName=SDK-Maintenance-Tool\nGenericName=Install or uninstall components of the Qt SDK.\nIcon=Nokia-SDKPM\nTerminal=false\nCategories=Development;Qt;" + ); + component.addOperation( "CreateDesktopEntry", + "Necessitas-SDKUpdater.desktop", + "Type=Application\nExec=@TargetDir@/SDKMaintenanceTool --updater\nPath=@TargetDir@\nName=SDK-Update-Tool\nGenericName=Update components of the Qt SDK.\nIcon=Nokia-SDKUp\nTerminal=false\nCategories=Development;Qt;" + ); + } + else if (installer.value("os") == "mac") + { + component.addOperation( "RegisterPersistentSettings", + "updateInfo.xml", + "Application", + "@TargetDir@/SDKMaintenanceTool.app/Contents/MacOS/SDKMaintenanceTool" ); + } + + component.addOperation( "RegisterPersistentSettings", + "updateInfo.xml", + "CheckOnlyArgument", + "--checkupdates" ); + component.addOperation( "RegisterPersistentSettings", + "updateInfo.xml", + "RunUiArgument", + "--updater" ); +} diff --git a/Necessitas_SDK/packages/org.kde.necessitas.tools.sdkmaintenance/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.tools.sdkmaintenance/meta/package.xml new file mode 100644 index 0000000..f497b0c --- /dev/null +++ b/Necessitas_SDK/packages/org.kde.necessitas.tools.sdkmaintenance/meta/package.xml @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>SDKMaintenance</DisplayName> + <Description>SDKMaintenance is a tool to update/install/uninstall components to the Qt SDK.</Description> + <Version>1.2.0-11</Version> + <ReleaseDate>@@TODAY@@</ReleaseDate> + <Name>org.kde.necessitas.tools.sdkmaintenance</Name> + <Script>installscript.qs</Script> + <Virtual>true</Virtual> + <ForcedInstallation>true</ForcedInstallation> +</Package> diff --git a/Necessitas_SDK/packages/org.kde.necessitas/meta/installscript.qs b/Necessitas_SDK/packages/org.kde.necessitas/meta/installscript.qs index 9e01985..55921c1 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas/meta/installscript.qs +++ b/Necessitas_SDK/packages/org.kde.necessitas/meta/installscript.qs @@ -18,123 +18,22 @@ // constructor function Component() { - component.loaded.connect( this, Component.prototype.loaded ); - - if(installer.isInstaller()) { - //bugfix to get the value at the beginning - before the wizard is not shown, we can't use installer.setDefaultPageVisible - installer.currentPageChanged.connect( this, updateComponentSelectionPageNeedState ); - } - if (installer.value("os") == "x11" || installer.value("os") == "mac") { - compiler = installer.execute( "/usr/bin/which", new Array( "g++" ) )[0]; - if (!compiler) { - QMessageBox["warning"]( "compilerError", "No compiler!", "You need a C++ compiler. Please install it using the System Package Management tools." ); - } compiler = installer.execute( "/usr/bin/which", new Array( "make" ) )[0]; if (!compiler) { QMessageBox["warning"]( "Error", "No *make* tool!", "You need *make* tool. Please install it using the System Package Management tools." ); } - compiler = installer.execute( "/usr/bin/which", new Array( "ant" ) )[0]; - if (!compiler) { - QMessageBox["warning"]( "Error", "No *ant* tool!", "You need *ant* tool. Please install it using the System Package Management tools." ); - } compiler = installer.execute( "/usr/bin/which", new Array( "java" ) )[0]; if (!compiler) { - QMessageBox["warning"]( "Error", "No java compiler!", "You need a java compiler. Please install it using the System Package Management tools." ); + QMessageBox["warning"]( "Error", "No java compiler!", "You need a java compiler. Please install it using the System Package Management tools (e.g. sudo apt-get install openjdk-6-jdk)." ); } compiler = installer.execute( "/usr/bin/which", new Array( "javac" ) )[0]; if (!compiler) { - QMessageBox["warning"]( "Error", "No java compiler!", "You need a java compiler. Please install it using the System Package Management tools." ); - } - } -} - -// called as soon as the component was loaded -Component.prototype.loaded = function() -{ - try - { - if(installer.isInstaller()) { - // preselect the complete component tree - component.selected = true; - - adjustToDefaultSelection(); - - installer.addWizardPageItem( component, "InstallationKindWidget", QInstaller.TargetDirectory ); - component.userInterface( "InstallationKindWidget" ).DefaultRadioButton['toggled(bool)'].connect(this, changeInstallationKind); - component.userInterface( "InstallationKindWidget" ).CustomRadioButton['toggled(bool)'].connect(this, updateComponentSelectionPageNeedState); - - if (installer.value("QtCreatorSettingsFile") != "") - installer.addWizardPageItem( component, "CreatorSettingsWidget", QInstaller.TargetDirectory ); + QMessageBox["warning"]( "Error", "No java compiler!", "You need a java compiler. Please install it using the System Package Management tools (e.g. sudo apt-get install openjdk-6-jdk)." ); } - - installer.setValue("GlobalExamplesDir", "Examples"); - installer.setValue("GlobalDemosDir", "Demos"); - installer.setValue("QtVersionLabel", "Qt SDK"); - } - catch( e ) - { - print( e ); - } -} - -updateComponentSelectionPageNeedState = function() -{ - installer.setDefaultPageVisible( QInstaller.ComponentSelection, component.userInterface( "InstallationKindWidget" ).CustomRadioButton.checked ); -} - - -changeInstallationKind = function() -{ - //if the DefaultRadioButton is choosen we have to select all components again - if( component.userInterface( "InstallationKindWidget" ).DefaultRadioButton.checked ) { - //reset all selections - component.selected = false; - //now set the full selection again(the change from unselected to selected results in calling the preselect functions in other scripts) - component.selected = true; - adjustToDefaultSelection(); - } -} - -adjustToDefaultSelection = function() -{ - //remove sources - if (installer.componentByName("org.kde.necessitas.android.qt.src") != null - && installer.componentByName("org.kde.necessitas.android.qt.src").selected) - { - installer.componentByName("org.kde.necessitas.android.qt.src").selected = false; - } - - if (installer.componentByName("org.kde.necessitas.android.qtmobility.src") != null && - installer.componentByName("org.kde.necessitas.android.qtmobility.src").selected) - { - installer.componentByName("org.kde.necessitas.android.qtmobility.src").selected = false; - } - - if (installer.componentByName("org.kde.necessitas.android.qtwebkit.src") != null && - installer.componentByName("org.kde.necessitas.android.qtwebkit.src").selected) - { - installer.componentByName("org.kde.necessitas.android.qtwebkit.src").selected = false; - } - - - // deselect all deprecated packages by default - if (installer.componentByName("org.kde.necessitas.misc.sdk.android_5") != null && - installer.componentByName("org.kde.necessitas.misc.sdk.android_5").selected) - { - installer.componentByName("org.kde.necessitas.misc.sdk.android_5").selected = false; - } - - if (installer.componentByName("org.kde.necessitas.misc.sdk.android_6") != null && - installer.componentByName("org.kde.necessitas.misc.sdk.android_6").selected) - { - installer.componentByName("org.kde.necessitas.misc.sdk.android_6").selected = false; - } - - if (installer.componentByName("org.kde.necessitas.misc.sdk.android_9") != null && - installer.componentByName("org.kde.necessitas.misc.sdk.android_9").selected) - { - installer.componentByName("org.kde.necessitas.misc.sdk.android_9").selected = false; } + installer.setValue("GlobalExamplesDir", "Examples"); + installer.setValue("GlobalDemosDir", "Demos"); + installer.setValue("QtVersionLabel", "Necessitas Qt SDK"); } diff --git a/Necessitas_SDK/packages/org.kde.necessitas/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas/meta/package.xml index e63a842..818b4ab 100644 --- a/Necessitas_SDK/packages/org.kde.necessitas/meta/package.xml +++ b/Necessitas_SDK/packages/org.kde.necessitas/meta/package.xml @@ -6,5 +6,4 @@ <ReleaseDate>@@TODAY@@</ReleaseDate> <Name>org.kde.necessitas</Name> <Script>installscript.qs</Script> - <InstallPriority>1</InstallPriority> </Package> diff --git a/Necessitas_SDK/sdk_cleanup.sh b/Necessitas_SDK/sdk_cleanup.sh new file mode 100644 index 0000000..0d1d161 --- /dev/null +++ b/Necessitas_SDK/sdk_cleanup.sh @@ -0,0 +1,16 @@ +# remove things which are not ready for release +function removeUnusedPackages +{ + # x86 support needs much more love than just a compilation, QtCreator needs to handle it correctly + rm -fr $TEMP_PATH/out/necessitas/sdk_src/org.kde.necessitas.android.qt.x86 + + # Wait until Linaro toolchain is ready + rm -fr $TEMP_PATH/out/necessitas/sdk_src/org.kde.necessitas.misc.ndk.ma_r6 + + # Do we really need this packages ? + rm -fr $TEMP_PATH/out/necessitas/sdk_src/org.kde.necessitas.misc.ndk.gdb_head + rm -fr $TEMP_PATH/out/necessitas/sdk_src/org.kde.necessitas.misc.host_gdb_head + + # OpenJDK needs to be handled into QtCeator + rm -fr $TEMP_PATH/out/necessitas/sdk_src/org.kde.necessitas.misc.openjdk +} diff --git a/Necessitas_SDK/sdk_vars.sh b/Necessitas_SDK/sdk_vars.sh index c64bd43..c7bdc96 100644 --- a/Necessitas_SDK/sdk_vars.sh +++ b/Necessitas_SDK/sdk_vars.sh @@ -1,25 +1,15 @@ MINISTRO_VERSION="0.3" #Ministro repo version -# There's no qpa plugin for Windows in Lighthouse yet. -# The easiest workaround is probably to use angle (a Google Chrome spin-off project): -# svn checkout http://angleproject.googlecode.com/svn/trunk/ angleproject-read-only -# ..which translates GL to DirectX and apparently works quite well, and as used by -# http://code.google.com/p/gamekit/source/browse/#svn%2Ftrunk%2FDependencies%2FWin32%2Fgles2 -# But for now, lighthouse can only be used as the Host Qt on Mac and Linux. -# Configure options from http://wayland.freedesktop.org/toolkits.html are -qpa -egl -opengl es2 -# if [ "$OSTYPE" = "msys" ] ; then -if [ "$1" = "$1" ] ; then - HOST_QT_VERSION=qt-everywhere-opensource-src-4.8.0 # Qt which is used to build QtCreator and the SDK installer (only matters that this isn't lighthouse) - HOST_QT_BRANCH=4.8 - HOST_QT_SRCDIR=qeos-$HOST_QT_BRANCH -else - HOST_QT_VERSION=lighthouse -fi +HOST_QT_BRANCH="remotes/upstream/tags/v4.7.4" CHECKOUT_BRANCH="unstable" NECESSITAS_QT_CREATOR_VERSION="2.3.81" + +EXTERNAL_7Z=7z +EXTERNAL_7Z_PARAMS="a -t7z -mx=9" + # Qt Framework versions NECESSITAS_QT_VERSION_SHORT=4763 #Necessitas Qt Framework Version NECESSITAS_QT_VERSION="4.7.63" #Necessitas Qt Framework Long Version @@ -32,21 +22,22 @@ NECESSITAS_QTMOBILITY_VERSION="1.2.0" #Necessitas QtMobility Version 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 (and ma ndk) ANDROID_NDK_VERSION=r6b # NDK full package version -USE_MA_NDK=1 +USE_MA_NDK=0 # SDK variables -ANDROID_SDK_VERSION=r12 -ANDROID_PLATFORM_TOOLS_VERSION=r06 +ANDROID_SDK_VERSION=r14 +ANDROID_PLATFORM_TOOLS_VERSION=r08 ANDROID_API_4_VERSION=1.6_r03 ANDROID_API_5_VERSION=2.0_r01 ANDROID_API_6_VERSION=2.0.1_r01 -ANDROID_API_7_VERSION=2.1_r02 -ANDROID_API_8_VERSION=2.2_r02 +ANDROID_API_7_VERSION=2.1_r03 +ANDROID_API_8_VERSION=2.2_r03 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_10_VERSION=2.3.3_r02 +ANDROID_API_11_VERSION=3.0_r02 +ANDROID_API_12_VERSION=3.1_r03 ANDROID_API_13_VERSION=3.2_r01 +ANDROID_API_14_VERSION=14_r01 # Make debug versions of host applications (Qt Creator and installer). MAKE_DEBUG_HOST_APPS=0 |
