From 35b8af92265ed74de63c3818e5290c27b3f35df2 Mon Sep 17 00:00:00 2001
From: Cory Fields <theuni-nospam-@xbmc.org>
Date: Mon, 27 May 2013 19:55:01 -0400
Subject: autotools: switch to autotools buildsystem

---
 contrib/macdeploy/macdeployqtplus | 17 +++++++++++++++++
 contrib/macdeploy/notes.txt       | 24 ++++++------------------
 2 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'contrib/macdeploy')

diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 11140d3b85..533be6cffa 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -651,6 +651,23 @@ elif config.sign:
 # ------------------------------------------------
 
 if config.dmg is not None:
+
+    #Patch in check_output for Python 2.6
+    if "check_output" not in dir( subprocess ):
+        def f(*popenargs, **kwargs):
+            if 'stdout' in kwargs:
+                raise ValueError('stdout argument not allowed, it will be overridden.')
+            process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
+            output, unused_err = process.communicate()
+            retcode = process.poll()
+            if retcode:
+                cmd = kwargs.get("args")
+                if cmd is None:
+                    cmd = popenargs[0]
+                raise CalledProcessError(retcode, cmd)
+            return output
+        subprocess.check_output = f
+
     def runHDIUtil(verb, image_basename, **kwargs):
         hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"]
         if kwargs.has_key("capture_stdout"):
diff --git a/contrib/macdeploy/notes.txt b/contrib/macdeploy/notes.txt
index 3d74901437..e7f62c4a39 100644
--- a/contrib/macdeploy/notes.txt
+++ b/contrib/macdeploy/notes.txt
@@ -1,26 +1,14 @@
-
-macdeployqtplus works best on OS X Lion, for Snow Leopard you'd need to install
-Python 2.7 and make it your default Python installation.
-
 You will need the appscript package for the fancy disk image creation to work.
 Install it by invoking "sudo easy_install appscript".
 
-This script should be invoked in the target directory like this:
-$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2
+For Snow Leopard (which uses Python 2.6), you will need the param_parser package.
+Install it by invoking "sudo easy_install argparse"
+
+This script should not be run manually, instead, after building as usual:
+"make deploy"
 
 During the process, the disk image window will pop up briefly where the fancy
 settings are applied. This is normal, please do not interfere.
 
-You can also set up Qt Creator for invoking the script. For this, go to the
-"Projects" tab on the left side, switch to "Run Settings" above and add a
-deploy configuration. Next add a deploy step choosing "Custom Process Step".
-Fill in the following.
-
-Enable custom process step: [x]
-Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus
-Working directory: %{buildDir}
-Command arguments: Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2
-
-After that you can start the deployment process through the menu with
-Build -> Deploy Project "bitcoin-qt"
+When finished, it will produce Bitcoin-Qt.dmg.
 
-- 
cgit v1.2.3