Fix ministrorepoggen tool

6 files changed, 527 insertions, 62 deletions

diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh
index bb65a15..8176055 100755
--- a/Necessitas_SDK/build_sdk.sh
+++ b/Necessitas_SDK/build_sdk.sh
@@ -75,7 +75,7 @@ GDB_VER=7.3
 
 pushd $TEMP_PATH
 
-MINISTRO_REPO_PATH=$TEMP_PATH/out/necessitas/qt
+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
@@ -1140,18 +1140,6 @@ function prepareSDKs
 
     # repack api-14
     repackSDK android-${ANDROID_API_14_VERSION} android-${ANDROID_API_14_VERSION} android-sdk/platforms android-14
-    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
 }
 
 function patchQtFiles
@@ -1221,6 +1209,20 @@ function compileNecessitasQt #params $1 architecture, $2 package path, $3 NDK_TA
     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
@@ -1269,6 +1271,7 @@ function compileNecessitasQt #params $1 architecture, $2 package path, $3 NDK_TA
     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
 }
 
@@ -1326,7 +1329,6 @@ function prepareNecessitasQt
 
 function compileNecessitasQtMobility
 {
-    export ANDROID_TARGET_ARCH=$1
     if [ ! -f all_done ]
     then
         pushd ../qtmobility-src
@@ -1381,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
@@ -1390,7 +1408,6 @@ function prepareNecessitasQtMobility
 
 function compileNecessitasQtWebkit
 {
-    export ANDROID_TARGET_ARCH=$1
     export SQLITE3SRCDIR=$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/qt-src/src/3rdparty/sqlite
     if [ ! -f all_done ]
     then
@@ -1480,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
@@ -1580,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"
@@ -1602,10 +1636,12 @@ function setPackagesVariables
     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@@" $ANDROID_SDK_VERSION
-#     patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI-V7A_INSTALL_PATH@@" $ANDROID_SDK_VERSION
-#     patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI_INSTALL_PATH@@" $ANDROID_SDK_VERSION
-#     patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI-V7A_INSTALL_PATH@@" $ANDROID_SDK_VERSION
+    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"
 
 }
 
@@ -1640,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/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/install-$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
 }
@@ -1788,6 +1837,6 @@ fi
 removeUnusedPackages
 
 prepareSDKRepository
-#prepareMinistroRepository
+prepareMinistroRepository
 
 popd
diff --git a/Necessitas_SDK/config/config.xml b/Necessitas_SDK/config/config.xml
index aeb2d07..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/test</Url>
-<!--            <Url>file:///var/debian/tmp/necessitas/out/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/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 1081ca3..3bb63e2 100644
--- a/Necessitas_SDK/ministrorepogen/rules.xml
+++ b/Necessitas_SDK/ministrorepogen/rules-armeabi-android-4.xml
@@ -1,26 +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"/>
-        <version value="13" symlink="9"/>
-        <version value="14" 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>