From 7c8c1f611ff46ab00182eeefbb1c1f67c21ef127 Mon Sep 17 00:00:00 2001
From: Konrad Rosenbaum <konrad@silmor.de>
Date: Sun, 11 Aug 2013 15:15:15 +0200
Subject: [PATCH] more accurate installer cfg

---
 magicsmoke.aurora |   39 +++++++++++++++++++--------------------
 taurus            |    2 +-
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/magicsmoke.aurora b/magicsmoke.aurora
index f20052d..6abd186 100644
--- a/magicsmoke.aurora
+++ b/magicsmoke.aurora
@@ -14,29 +14,33 @@
                 zipbase="..." - a prefix directory inside the archive (if missing: no prefix)
                 
         -->
-        <ArchiveSource name="magicsmoke-*.zip" buildbase=".">
+        <ArchiveSource name="magicsmoke-*.zip" buildbase="bin">
                 <!-- list of files or file patterns for one platform
                         os="..." - operating system, "linux", "windows", "any", "all"
                                 any=same for all OS, separate archive files
                                 all=same for all OS, just one archive file for all of them
                         prepare="..." - optional script or command executed before archiving
                 -->
-                <Platform os="linux" prepare="strip bin/*">
-                        bin/magicsmoke
-                        bin/gpg
-                        bin/lib*.so*
+                <Platform os="linux" prepare="strip *">
+                        magicsmoke
+                        gpg
+                        lib*.so*
                 </Platform>
                 <Platform os="windows">
+                        *.exe
+                        *.dll
                 </Platform>
         </ArchiveSource>
-        <ArchiveSource name="distkeys.zip" buildbase="install-gpg" zipbase="bin/aurora-gpg">
-                <Platform os="all">
-                        gpg.conf
-                        pubring.gpg
+        <ArchiveSource name="distkeys.zip" buildbase="install-gpg" zipbase="aurora-gpg">
+                <Platform os="all" cpu="all">
+                        <Files>
+                                gpg.conf
+                                pubring.gpg
+                        </Files>
                 </Platform>
         </ArchiveSource>
         <!-- this one uses pipe-syntax to get to the main path and it also uses additional <Files> tags to drill deeper -->
-        <ArchiveSource name="qtlibs-*.zip" buildbase="|qmake -query QT_INSTALL_PREFIX" zipbase="bin">
+        <ArchiveSource name="qtlibs-*.zip" buildbase="|qmake -query QT_INSTALL_PREFIX">
                 <Platform os="linux">
                         <Files buildbase="./lib">
                                 libQt5Core.so*
@@ -59,7 +63,7 @@
                                 generic/*.so
                         </Files>
                 </Platform>
-                <Platform os="windows" exclude="*d.dll">
+                <Platform os="windows">
                         <Files buildbase="./bin">
                                 Qt5Core.dll
                                 Qt5Gui.dll
@@ -73,7 +77,7 @@
                                 lib*.dll
                                 icu*.dll
                         </Files>
-                        <Files buildbase="./plugins">
+                        <Files buildbase="./plugins" exclude="*d.dll">
                                 platforms/*.dll
                                 imageformats/*.dll
                                 iconengines/*.dll
@@ -85,12 +89,7 @@
         </ArchiveSource>
         
         <!-- this is the result in the meta or installed file -->
-        <Platform os="linux" cpu="x86">
-                <Archive name="magicsmoke-linux-x86.zip" size="12345678" sha1sum="1635ecd482608a93d522a11326e22409ff7d255d"/>
-                <Archive name="distkeys.zip" size="1234" sha1sum="d255d1635ecd482608a93d522a11326e22409ff7"/>
-        </Platform>
-        <Platform os="windows" cpu="x86">
-                <Archive name="magicsmoke-windows-x86.zip" size="15675670" sha1sum="522a11326e22163482608a93d409ff7d255d5ecd"/>
-                <Archive name="distkeys.zip" size="1234" sha1sum="d255d1635ecd482608a93d522a11326e22409ff7"/>
-        </Platform>
+        <Archive name="magicsmoke-linux-x86.zip" size="12345678" sha1sum="1635ecd482608a93d522a11326e22409ff7d255d" os="linux" cpu="x86"/>
+        <Archive name="distkeys.zip" size="1234" sha1sum="d255d1635ecd482608a93d522a11326e22409ff7" os="linux" cpu="all"/>
+        <Archive name="magicsmoke-windows-x86.zip" size="15675670" sha1sum="522a11326e22163482608a93d409ff7d255d5ecd" os="windows" cpu="x86"/>
 </AuroraInfo>
diff --git a/taurus b/taurus
index 7857278..8db2c64 160000
--- a/taurus
+++ b/taurus
@@ -1 +1 @@
-Subproject commit 7857278278e87cc5d588290b1ff0257e46faef4d
+Subproject commit 8db2c6440c48b05426855aa64a1ce7673a754e2f
-- 
1.7.2.5