2 files changed, 7 insertions, 1 deletions
diff --git a/Swift/QtUI/.gitignore b/Swift/QtUI/.gitignore
index b776b0d..379d4f5 100644
--- a/Swift/QtUI/.gitignore
+++ b/Swift/QtUI/.gitignore
@@ -1,2 +1,3 @@
 Swift
 BuildVersion.h
+Swift-*.dmg
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index b7eefaf..77bc8f8 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -62,67 +62,72 @@ sources = [
     "QtMainWindowFactory.cpp",
     "QtSettingsProvider.cpp",
     "QtStatusWidget.cpp",
     "QtSwift.cpp",
     "QtChatView.cpp",
     "QtChatTabs.cpp",
     "QtSoundPlayer.cpp",
     "QtSystemTray.cpp",
     "QtTabbable.cpp",
     "QtTextEdit.cpp",
     "QtXMLConsoleWidgetFactory.cpp",
     "QtXMLConsoleWidget.cpp",
     "ChatSnippet.cpp",
     "MessageSnippet.cpp",
     "SystemMessageSnippet.cpp",
     "Roster/RosterModel.cpp",
     "Roster/QtTreeWidget.cpp",
     "Roster/QtTreeWidgetItem.cpp",
     "Roster/RosterDelegate.cpp",
     "EventViewer/EventView.cpp",
     "EventViewer/EventModel.cpp",
     "EventViewer/EventDelegate.cpp",
     "QtRosterHeader.cpp",
     "qrc_DefaultTheme.cc",
     "qrc_Swift.cc",
   ]
 
 
 myenv.BuildVersion("BuildVersion.h", version = env["SWIFT_VERSION"])
 
 if env["PLATFORM"] == "win32" :
   myenv.RES("../resources/Windows/Swift.rc")
   sources += ["../resources/Windows/Swift.res"]
 
 if env["PLATFORM"] == "darwin" or env["PLATFORM"] == "win32" :
   swiftProgram = myenv.Program("Swift", sources)
 else :
   swiftProgram = myenv.Program("swift", sources)
 
 myenv.Uic4("QtJoinMUCDialog.ui")
 myenv.Uic4("QtAddContactDialog.ui")
 myenv.Qrc("DefaultTheme.qrc")
 myenv.Qrc("Swift.qrc")
 
 if env["PLATFORM"] == "darwin" :
   frameworks = []
   if env["HAVE_SPARKLE"] :
     frameworks.append(env["SPARKLE_FRAMEWORK"])
-  myenv.AppBundle("Swift", version = env["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks)
+  app = myenv.AppBundle("Swift", version = env["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks)
+  if "dist" in COMMAND_LINE_TARGETS :
+    myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], [
+        "$QTDIR/bin/macdeployqt $SOURCE -dmg",
+        Move("$TARGET", "$SOURCE.dir/Swift.dmg")
+      ])
 
 if env.get("SWIFT_INSTALLDIR", "") :
   env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram)
 
 if env["PLATFORM"] == "win32" :
   if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
     myenv.WindowsBundle("Swift", resources = [
         os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),  
         os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),  
       ],  
       qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"],
       qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4"])
 
     myenv.Append(NSIS_OPTIONS = [
         "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
         "/DbuildVersion=" + env["SWIFT_VERSION"]
       ])
     myenv.Nsis("../Packaging/nsis/swift.nsi")