Browse Source

[OSX] revert renaming of Bitcoin-Qt.app

Github-Pull: #6214
Rebased-From: a2241eabfdbdadd2f96c0a538b9901257831b642
pull/145/head
Jonas Schnelli 9 years ago
committed by Wladimir J. van der Laan
parent
commit
4d435d1c9a
No known key found for this signature in database GPG Key ID: 74810B012346C9A6
  1. 2
      Makefile.am
  2. 2
      contrib/macdeploy/detached-sig-create.sh
  3. 2
      contrib/macdeploy/fancy.plist
  4. 2
      contrib/macdeploy/macdeployqtplus
  5. 4
      doc/build-osx.md
  6. 4
      share/certs/PrivateKeyNotes.md

2
Makefile.am

@ -14,7 +14,7 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
OSX_APP=Bitcoin-Core.app
OSX_APP=Bitcoin-Qt.app
OSX_DMG=Bitcoin-Core.dmg
OSX_BACKGROUND_IMAGE=background.tiff
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus

2
contrib/macdeploy/detached-sig-create.sh

@ -2,7 +2,7 @@
set -e
ROOTDIR=dist
BUNDLE="${ROOTDIR}/Bitcoin Core.app"
BUNDLE="${ROOTDIR}/Bitcoin-Qt.app"
CODESIGN=codesign
TEMPDIR=sign.temp
TEMPLIST=${TEMPDIR}/signatures.txt

2
contrib/macdeploy/fancy.plist

@ -22,7 +22,7 @@
<integer>370</integer>
<integer>156</integer>
</array>
<key>Bitcoin Core.app</key>
<key>Bitcoin-Qt.app</key>
<array>
<integer>128</integer>
<integer>156</integer>

2
contrib/macdeploy/macdeployqtplus

@ -596,7 +596,7 @@ if os.path.exists("dist"):
# ------------------------------------------------
target = os.path.join("dist", "Bitcoin Core.app")
target = os.path.join("dist", "Bitcoin-Qt.app")
if verbose >= 2:
print "+ Copying source bundle +"

4
doc/build-osx.md

@ -100,7 +100,7 @@ Creating a release build
------------------------
You can ignore this section if you are building `bitcoind` for your own use.
bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Core.app bundle.
bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Qt.app bundle.
If you are building `bitcoind` or `Bitcoin-Qt` for others, your build machine should be set up
as follows for maximum compatibility:
@ -111,7 +111,7 @@ All dependencies should be compiled with these flags:
-arch x86_64
-isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin-Core.app
Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin-Qt.app
bundle is packaged and signed to create the .dmg disk image that is distributed.
Running

4
share/certs/PrivateKeyNotes.md

@ -7,7 +7,7 @@ signing requests.
For OSX, the private key was generated by Keychain.app on Gavin's main work machine.
The key and certificate is in a separate, passphrase-protected keychain file that is
unlocked to sign the Bitcoin-Core.app bundle.
unlocked to sign the Bitcoin-Qt.app bundle.
For Windows, the private key was generated by Firefox running on Gavin's main work machine.
The key and certificate were exported into a separate, passphrase-protected PKCS#12 file, and
@ -17,7 +17,7 @@ Threat analysis
--
Gavin is a single point of failure. He could be coerced to divulge the secret signing keys,
allowing somebody to distribute a Bitcoin-Core.app or bitcoin-qt-setup.exe with a valid
allowing somebody to distribute a Bitcoin-Qt.app or bitcoin-qt-setup.exe with a valid
signature but containing a malicious binary.
Or the machine Gavin uses to sign the binaries could be compromised, either remotely or

Loading…
Cancel
Save