Ministro repo refactoring

Fix windows src packages

9 files changed, 23 insertions, 44 deletions

diff --git a/Ministro/AndroidManifest.xml b/Ministro/AndroidManifest.xml
index fb5d403..aabad18 100644
--- a/Ministro/AndroidManifest.xml
+++ b/Ministro/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.kde.necessitas.ministro" android:versionName="5.0" android:versionCode="5">
+    package="org.kde.necessitas.ministro" android:versionName="6.0" android:versionCode="6">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".MinistroActivity"
                 android:label="@string/app_name"
diff --git a/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java b/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java
index e24e935..90562f1 100644
--- a/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java
+++ b/Ministro/src/org/kde/necessitas/ministro/MinistroActivity.java
@@ -69,7 +69,7 @@ import android.provider.Settings;
 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/necessitas/";
+    private static final String DOMAIN_NAME="http://files.kde.org/necessitas/ministro/android/necessitas/";
 
     private String[] m_modules;
     private int m_id=-1;
@@ -186,12 +186,12 @@ public class MinistroActivity extends Activity
 
     private static URL getVersionUrl(Context c) throws MalformedURLException
     {
-        return new URL(DOMAIN_NAME+MinistroService.getRepository(c)+"/android/"+android.os.Build.CPU_ABI+"/android-"+android.os.Build.VERSION.SDK_INT+"/versions.xml");
+        return new URL(DOMAIN_NAME+MinistroService.getRepository(c)+"/"+android.os.Build.CPU_ABI+"/android-"+android.os.Build.VERSION.SDK_INT+"/versions.xml");
     }
 
     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");
+        return new URL(DOMAIN_NAME+MinistroService.getRepository(c)+"/"+android.os.Build.CPU_ABI+"/android-"+android.os.Build.VERSION.SDK_INT+"/libs-"+version+".xml");
     }
 
     public static boolean isOnline(Context c)
diff --git a/Necessitas_SDK/BootstrapMinGWAndroid.vbs b/Necessitas_SDK/BootstrapMinGWAndroid.vbs
index 6ad47e7..ad8484e 100644
--- a/Necessitas_SDK/BootstrapMinGWAndroid.vbs
+++ b/Necessitas_SDK/BootstrapMinGWAndroid.vbs
@@ -21,7 +21,7 @@ function downloadHTTP(sourceUrl,destFilepath)
 		objStream.SaveToFile destFilepath, 2
 		objStream.Close
 	end if
-end function 
+end function
 
 function run(ByVal command)
 	dim shell
diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh
index 3faaacd..7e5a9f8 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/$CHECKOUT_BRANCH
+MINISTRO_REPO_PATH=$TEMP_PATH/out/ministro
 REPO_PATH=$TEMP_PATH/out/necessitas/sdk
 if [ ! -d $TEMP_PATH/out/necessitas/sdk_src/org.kde.necessitas ]
 then
@@ -1180,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
-    createArchive Android $1.7z
+    createArchive Android $1.7z -l
     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
@@ -1269,11 +1269,10 @@ function compileNecessitasQt #params $1 architecture, $2 package path, $3 NDK_TA
     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/
+    packforWindows $REPO_PATH_PACKAGES/org.kde.necessitas.android.qt.$package_name/data/ qt-framework
 #    patchQtFiles
 }
 
@@ -1351,6 +1350,7 @@ function compileNecessitasQtMobility
     createArchive Android qtmobility.7z
     mv qtmobility.7z $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtmobility.$package_name/data/qtmobility.7z
     cp -a $2/$1/* ../install-$1 # copy files to ministro repository
+    packforWindows $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtmobility.$package_name/data/ qtmobility
 #    pushd ../build-$1
 #    patchQtFiles
 #    popd
@@ -1465,6 +1465,7 @@ function compileNecessitasQtWebkit
     createArchive Android qtwebkit.7z
     mv qtwebkit.7z $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtwebkit.$package_name/data/qtwebkit.7z
     cp -a $2/$1/* ../install-$1/
+    packforWindows $REPO_PATH_PACKAGES/org.kde.necessitas.android.qtwebkit.$package_name/data/ qtwebkit
 #    pushd ../build-$1
 #    patchQtFiles
 #    popd
@@ -1699,7 +1700,7 @@ function prepareMinistroRepository
         if [ $architecture = "armeabi-android-4" ] ; then
             architecture="armeabi"
         fi
-        MINISTRO_OBJECTS_PATH=$MINISTRO_REPO_PATH/android/$architecture/objects/$repoVersion
+        MINISTRO_OBJECTS_PATH=$MINISTRO_REPO_PATH/objects/$repoVersion
         rm -fr $MINISTRO_OBJECTS_PATH
         mkdir -p $MINISTRO_OBJECTS_PATH
         rm -fr Android
@@ -1723,7 +1724,7 @@ function prepareMinistroRepository
             qmldirfileDirname=`dirname $qmldirfile`
             cp $qmldirfile $MINISTRO_OBJECTS_PATH/$qmldirfileDirname/
         done
-        $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
+        $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/$CHECKOUT_BRANCH $repoVersion
         popd
     done
 }
diff --git a/Necessitas_SDK/config/config.xml b/Necessitas_SDK/config/config.xml
index 69ea49f..71be359 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/sdk_master</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 b0e1368..2d26638 100644
--- a/Necessitas_SDK/ministrorepogen/main.cpp
+++ b/Necessitas_SDK/ministrorepogen/main.cpp
@@ -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<9)
+    if (argc<8)
     {
         printHelp();
         return 1;
@@ -64,7 +64,6 @@ int main(int argc, char *argv[])
     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);
@@ -168,7 +167,7 @@ int main(int argc, char *argv[])
     SortLibraries(libs, readelfPath, libsPath, excludePaths);
 
     QDir path;
-    QString xmlPath(outputFolder+QString("/android/%1/").arg(abiVersion));
+    QString xmlPath(outputFolder+QString("/%1/").arg(abiVersion));
     path.mkpath(xmlPath);
     path.cd(xmlPath);
     chdir(path.absolutePath().toUtf8().constData());
@@ -197,8 +196,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/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());
+            outXmlFile.write(QString("\t<lib name=\"%1\" url=\"http://files.kde.org/necessitas/android/necessitas/objects/%2/%3\" file=\"%3\" size=\"%4\" sha1=\"%5\" level=\"%6\"")
+                             .arg(libs[key].name).arg(objfolder).arg(libs[key].relativePath).arg(fileSize).arg(sha1Hash).arg(libs[key].level).toUtf8());
             if (!libs[key].dependencies.size() && !libs[key].needs.size())
             {
                 outXmlFile.write(" />\n\n");
@@ -239,8 +238,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/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(QString("\t\t\t<item name=\"%1\" url=\"http://files.kde.org/necessitas/android/necessitas/objects/%2/%3\" file=\"%3\" size=\"%4\" sha1=\"%5\"%6/>\n")
+                                     .arg(needed.name).arg(objfolder).arg(needed.relativePath.arg(platformJars[androdPlatform])).arg(fileSize).arg(sha1Hash).arg(type).toUtf8());
                 }
                 outXmlFile.write("\t\t</needs>\n");
             }
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 2ec8ca0..8d88be8 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
@@ -20,14 +20,7 @@ function Component()
 {
     if( component.fromOnlineRepository )
     {
-        if (installer.value("os") == "win")
-        {
-            component.addDownloadableArchive( "qt-src-windows.7z" );
-        }
-        else
-        {
-            component.addDownloadableArchive( "qt-src.7z" );
-        }
+        component.addDownloadableArchive( "qt-src.7z" );
     }
 }
 
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 95aa240..0a77bb1 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
@@ -20,14 +20,7 @@ function Component()
 {
     if( component.fromOnlineRepository )
     {
-        if (installer.value("os") == "win")
-        {
-            component.addDownloadableArchive( "qtmobility-src-windows.7z" );
-        }
-        else
-        {
-            component.addDownloadableArchive( "qtmobility-src.7z" );
-        }
+        component.addDownloadableArchive( "qtmobility-src.7z" );
     }
 }
 
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 1543d19..8d27584 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
@@ -20,14 +20,7 @@ function Component()
 {
     if( component.fromOnlineRepository )
     {
-        if (installer.value("os") == "win")
-        {
-            component.addDownloadableArchive( "qtwebkit-src-windows.7z" );
-        }
-        else
-        {
-            component.addDownloadableArchive( "qtwebkit-src.7z" );
-        }
+        component.addDownloadableArchive( "qtwebkit-src.7z" );
     }
 }