From 01e5327cfc4372158d7074fd8b277166bf271884 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 6 Dec 2013 18:13:25 -0500
Subject: [PATCH] build: hook up "make deploy" for cross osx builds

---
 Makefile.am                |  16 ++++++++++++++--
 configure.ac               |   1 +
 contrib/macdeploy/DS_Store | Bin 0 -> 15364 bytes
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 contrib/macdeploy/DS_Store

diff --git a/Makefile.am b/Makefile.am
index 276e5ef44..e26627f3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
 OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
 OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
 OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
+OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
 
@@ -24,7 +25,8 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
   $(top_srcdir)/doc/README_windows.txt
 
 OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
-  $(top_srcdir)/contrib/macdeploy/background.png
+  $(top_srcdir)/contrib/macdeploy/background.png \
+  $(top_srcdir)/contrib/macdeploy/DS_Store
 
 COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
   leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
@@ -78,9 +80,19 @@ OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lp
   $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
   $(OSX_APP)/Contents/MacOS/Bitcoin-Qt
 
+if BUILD_DARWIN
 $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
+	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
 
+else
+$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
+	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
+	$(MKDIR_P) dist/.background
+	$(INSTALL) contrib/macdeploy/background.png dist/.background
+	$(INSTALL) contrib/macdeploy/DS_Store dist/.DS_Store
+	cd dist; $(LN_S) /Applications Applications
+	$(GENISOIMAGE) -no-cache-inodes -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
+endif
 
 if TARGET_DARWIN
 appbundle: $(OSX_APP_BUILT)
diff --git a/configure.ac b/configure.ac
index 1111575a5..45cd023bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,7 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 AC_PROG_OBJC
+AC_PROG_LN_S
 m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX])
 AC_PROG_MKDIR_P
 AC_PROG_SED
diff --git a/contrib/macdeploy/DS_Store b/contrib/macdeploy/DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b9a1e1486405136607eedf433af8d469ef7059b8
GIT binary patch
literal 15364
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

literal 0
HcmV?d00001