From 4358749e0bda10c9276b7a999811d1bbc0bc9839 Mon Sep 17 00:00:00 2001 From: itamarcps <32653934+itamarcps@users.noreply.github.com> Date: Tue, 12 Feb 2019 18:38:52 -0200 Subject: [PATCH 1/2] MacOS Compiling error fix --- Makefile.am | 2 +- Makefile.in | 2 +- doc/build-osx.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5eb3ec5..7d1fe1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX empty := space := $(empty) $(empty) -OSX_APP=INDINODE-Qt.app +OSX_APP=IndiNode-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg diff --git a/Makefile.in b/Makefile.in index 287e467..1fc6400 100644 --- a/Makefile.in +++ b/Makefile.in @@ -489,7 +489,7 @@ BITCOIN_CLI_BIN = $(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT) BITCOIN_WIN_INSTALLER = $(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT) empty := space := $(empty) $(empty) -OSX_APP = INDINODE-Qt.app +OSX_APP = IndiNode-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG = background.svg diff --git a/doc/build-osx.md b/doc/build-osx.md index d08444a..9078fc2 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -81,7 +81,7 @@ Creating a release build ------------------------ You can ignore this section if you are building `indinoded` for your own use. -indinoded/indinode-cli binaries are not included in the indinode-Qt.app bundle. +indinoded/indinode-cli binaries are not included in the IndiNode-Qt.app bundle. If you are building `indinoded` or `indinode-qt` for others, your build machine should be set up as follows for maximum compatibility: From 62cbdd768473e070e487fde794253bb7f3e90a3c Mon Sep 17 00:00:00 2001 From: itamarcps <32653934+itamarcps@users.noreply.github.com> Date: Tue, 12 Feb 2019 18:44:01 -0200 Subject: [PATCH 2/2] Missing MacOS Declarations Fix --- Makefile.am | 8 ++++---- Makefile.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7d1fe1d..31153a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/INDINODE-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/IndiNode-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ @@ -96,7 +96,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/INDINODE-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/MacOS/IndiNode-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -121,7 +121,7 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/INDINODE-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/IndiNode-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist @@ -136,7 +136,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN) $(PYTHON) $< "$@" "$(OSX_VOLNAME)" -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/INDINODE-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/IndiNode-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 deploydir: $(APP_DIST_EXTRAS) diff --git a/Makefile.in b/Makefile.in index 1fc6400..9921157 100644 --- a/Makefile.in +++ b/Makefile.in @@ -520,7 +520,7 @@ COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \ OSX_APP_BUILT = $(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/INDINODE-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/MacOS/IndiNode-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings @BUILD_DARWIN_FALSE@APP_DIST_DIR = $(top_builddir)/dist @BUILD_DARWIN_FALSE@APP_DIST_EXTRAS = $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE) $(APP_DIST_DIR)/.DS_Store $(APP_DIST_DIR)/Applications @@ -1058,7 +1058,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/INDINODE-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/IndiNode-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ @@ -1085,7 +1085,7 @@ osx_volname: @BUILD_DARWIN_FALSE@ @rm -f $@ @BUILD_DARWIN_FALSE@ @cd $(@D); $(LN_S) /Applications $(@F) -@BUILD_DARWIN_FALSE@$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/INDINODE-Qt +@BUILD_DARWIN_FALSE@$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/IndiNode-Qt @BUILD_DARWIN_FALSE@$(OSX_DMG): $(APP_DIST_EXTRAS) @BUILD_DARWIN_FALSE@ $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist @@ -1099,7 +1099,7 @@ osx_volname: @BUILD_DARWIN_FALSE@$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN) @BUILD_DARWIN_FALSE@ $(PYTHON) $< "$@" "$(OSX_VOLNAME)" -@BUILD_DARWIN_FALSE@$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/INDINODE-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +@BUILD_DARWIN_FALSE@$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/IndiNode-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) @BUILD_DARWIN_FALSE@ INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 @BUILD_DARWIN_FALSE@deploydir: $(APP_DIST_EXTRAS)