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

List:       kde-commits
Subject:    kdesupport/kdewin-installer/shared
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2007-05-31 20:55:54
Message-ID: 1180644954.493442.25878.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 670247 by habacker:

- disabled debug library packaging support, it does not work in all cases especially \
                when a library or exe ends with 'd'
- generatePackageFileList(): fixed source file list in case of explicit source root \
settings

 M  +17 -2     packager.cpp  


--- trunk/kdesupport/kdewin-installer/shared/packager.cpp #670246:670247
@@ -157,7 +157,6 @@
             case BIN:
                 // assistant.exe can be used separatly from qt doc - better in bin \
                than doc package
                 generateFileList(fileList, dir, "bin", "*.dll assistant.exe \
                qdbus.exe qdbusviewer.exe", "*d.dll *d4.dll");
-                generateFileList(fileList, dir, "lib", " *d.manifest", \
                "*.manifest");
                 generateFileList(fileList, dir, "plugins", "*.dll","*d.dll *d4.dll \
*d1.dll");  generateFileList(fileList, dir, "translations", "*.qm");
                 return true;
@@ -194,16 +193,26 @@
     else         
         switch (type) {
             case BIN:
+                generateFileList(fileList, dir, "bin",  "*.exe *.bat");
+#if DEBUG_LIB_SUPPORT
                 generateFileList(fileList, dir, "bin",  "*.exe *.bat", "*d.exe");
                 generateFileList(fileList, dir, "bin",  "*.dll", "*d.dll");
                 generateFileList(fileList, dir, "lib",  "*.dll", "*d.dll");
+#else
+                generateFileList(fileList, dir, "bin",  "*.dll");
+                generateFileList(fileList, dir, "lib",  "*.dll");
+                generateFileList(fileList, dir, "lib",  "*.exe *.bat");
+#endif
                 generateFileList(fileList, dir, "share", "*.*");
                 generateFileList(fileList, dir, "data", "*.*");
                 generateFileList(fileList, dir, "etc",  "*.*");
                 return true;
             case LIB:
+#if DEBUG_LIB_SUPPORT
                 generateFileList(fileList, dir, "bin",      "*d.dll *d.exe");
                 generateFileList(fileList, dir, "lib",      "*d.dll");
+#else
+#endif
                 generateFileList(fileList, dir, "lib",      "*.lib");   // msvc libs \
                (static & import libs)
                 generateFileList(fileList, dir, "lib",      "*.a");          // gcc \
(static) libs  generateFileList(fileList, dir, "include", "*.*");
@@ -218,7 +227,7 @@
                 if (m_srcRoot.isEmpty())
                     generateFileList(fileList, dir, "src", "*",exclude);
                 else
-                    generateFileList(fileList, m_srcRoot, "", "*",exclude);
+                    generateFileList(fileList, m_srcRoot, ".", "*.*",exclude);
                 return true;
             case NONE:
                 generateFileList(fileList, dir, ".", "*.*", "manifest");
@@ -391,7 +400,13 @@
 bool Packager::stripFiles(const QString &dir)
 {
     QList<InstallFile> fileList; 
+#if DEBUG_LIB_SUPPORT
     generateFileList(fileList,dir,"bin","*.exe *.dll","*d.exe *d.dll *d4.dll");
+    generateFileList(fileList,dir,"lib","*.exe *.dll","*d.exe *d.dll *d4.dll");
+#else
+    generateFileList(fileList,dir,"bin","*.exe *.dll","");
+    generateFileList(fileList,dir,"lib","*.exe *.dll","");
+#endif
     for (int i = 0; i < fileList.size(); i++) 
     {
         QFileInfo fi(dir + "/" + fileList.at(i).inputFile);


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