Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Bitcoin->MasterCore in Mac OS X places #203

Open
wants to merge 1 commit into
base: mscore-0.0.9
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ src/qt/test/moc*.cpp
*.qm
Makefile
mastercore-qt
Bitcoin-Qt.app
MasterCore-Qt.app

# Unit-tests
Makefile.test
Expand Down
10 changes: 5 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/mastercore-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/mastercore-cli$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

OSX_APP=Bitcoin-Qt.app
OSX_DMG=Bitcoin-Qt.dmg
OSX_APP=MasterCore-Qt.app
OSX_DMG=MasterCore-Qt.dmg
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
Expand Down Expand Up @@ -72,13 +72,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
$(OSX_APP)/Contents/MacOS/MasterCore-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

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/Bitcoin-Qt
$(OSX_APP)/Contents/MacOS/MasterCore-Qt

if BUILD_DARWIN
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
Expand All @@ -91,7 +91,7 @@ $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(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
$(GENISOIMAGE) -no-cache-inodes -l -probe -V "MasterCore-Qt" -no-pad -r -apple -o $@ dist
endif

if TARGET_DARWIN
Expand Down
2 changes: 1 addition & 1 deletion contrib/macdeploy/fancy.plist
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<integer>370</integer>
<integer>156</integer>
</array>
<key>Bitcoin-Qt.app</key>
<key>MasterCore-Qt.app</key>
<array>
<integer>128</integer>
<integer>156</integer>
Expand Down
2 changes: 1 addition & 1 deletion contrib/macdeploy/macdeployqtplus
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ if config.dmg is not None:
items_positions.append(itemscript.substitute(params))

params = {
"disk" : "Bitcoin-Qt",
"disk" : "MasterCore-Qt",
"window_bounds" : "300,300,800,620",
"icon_size" : "96",
"background_commands" : "",
Expand Down
4 changes: 2 additions & 2 deletions share/qt/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
<string>????</string>

<key>CFBundleExecutable</key>
<string>Bitcoin-Qt</string>
<string>MasterCore-Qt</string>

<key>CFBundleIdentifier</key>
<string>org.bitcoinfoundation.Bitcoin-Qt</string>
<string>org.mastercoin.MasterCore-Qt</string>

<key>CFBundleURLTypes</key>
<array>
Expand Down