mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
[Mac only] rename Bitcoin-Qt.app to "Bitcoin Core.app"
This commit is contained in:
parent
26e08a16a6
commit
7cef321e65
@ -14,8 +14,8 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
|
|||||||
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
|
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
|
||||||
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
|
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
|
||||||
|
|
||||||
OSX_APP=Bitcoin-Qt.app
|
OSX_APP=Bitcoin-Core.app
|
||||||
OSX_DMG=Bitcoin-Qt.dmg
|
OSX_DMG=Bitcoin-Core.dmg
|
||||||
OSX_BACKGROUND_IMAGE=background.tiff
|
OSX_BACKGROUND_IMAGE=background.tiff
|
||||||
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
|
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
|
||||||
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
|
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
|
||||||
@ -106,7 +106,7 @@ $(APP_DIST_DIR)/Applications:
|
|||||||
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
|
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
|
||||||
|
|
||||||
$(OSX_DMG): $(APP_DIST_EXTRAS)
|
$(OSX_DMG): $(APP_DIST_EXTRAS)
|
||||||
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
|
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -apple -o $@ dist
|
||||||
|
|
||||||
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE)
|
$(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_IMAGE)
|
||||||
$(MKDIR_P) $(@D)
|
$(MKDIR_P) $(@D)
|
||||||
|
@ -33,5 +33,5 @@ script: |
|
|||||||
|
|
||||||
tar -xf ${UNSIGNED}
|
tar -xf ${UNSIGNED}
|
||||||
./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz
|
./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz
|
||||||
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o uncompressed.dmg signed-app
|
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -apple -o uncompressed.dmg signed-app
|
||||||
${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}
|
${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}
|
||||||
|
@ -120,7 +120,7 @@ script: |
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
make deploy
|
make deploy
|
||||||
${WRAP_DIR}/dmg dmg Bitcoin-Qt.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg
|
${WRAP_DIR}/dmg dmg Bitcoin-Core.dmg ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg
|
||||||
|
|
||||||
cd installed
|
cd installed
|
||||||
find . -name "lib*.la" -delete
|
find . -name "lib*.la" -delete
|
||||||
|
Binary file not shown.
@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual:
|
|||||||
During the process, the disk image window will pop up briefly where the fancy
|
During the process, the disk image window will pop up briefly where the fancy
|
||||||
settings are applied. This is normal, please do not interfere.
|
settings are applied. This is normal, please do not interfere.
|
||||||
|
|
||||||
When finished, it will produce `Bitcoin-Qt.dmg`.
|
When finished, it will produce `Bitcoin-Core.dmg`.
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ UNSIGNED=$1
|
|||||||
SIGNATURE=$2
|
SIGNATURE=$2
|
||||||
ARCH=x86_64
|
ARCH=x86_64
|
||||||
ROOTDIR=dist
|
ROOTDIR=dist
|
||||||
BUNDLE=${ROOTDIR}/Bitcoin-Qt.app
|
BUNDLE=${ROOTDIR}/Bitcoin-Core.app
|
||||||
TEMPDIR=signed.temp
|
TEMPDIR=signed.temp
|
||||||
OUTDIR=signed-app
|
OUTDIR=signed-app
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
ROOTDIR=dist
|
ROOTDIR=dist
|
||||||
BUNDLE=${ROOTDIR}/Bitcoin-Qt.app
|
BUNDLE=${ROOTDIR}/Bitcoin-Core.app
|
||||||
CODESIGN=codesign
|
CODESIGN=codesign
|
||||||
TEMPDIR=sign.temp
|
TEMPDIR=sign.temp
|
||||||
TEMPLIST=${TEMPDIR}/signatures.txt
|
TEMPLIST=${TEMPDIR}/signatures.txt
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<integer>370</integer>
|
<integer>370</integer>
|
||||||
<integer>156</integer>
|
<integer>156</integer>
|
||||||
</array>
|
</array>
|
||||||
<key>Bitcoin-Qt.app</key>
|
<key>Bitcoin Core.app</key>
|
||||||
<array>
|
<array>
|
||||||
<integer>128</integer>
|
<integer>128</integer>
|
||||||
<integer>156</integer>
|
<integer>156</integer>
|
||||||
|
@ -155,7 +155,7 @@ class FrameworkInfo(object):
|
|||||||
class ApplicationBundleInfo(object):
|
class ApplicationBundleInfo(object):
|
||||||
def __init__(self, path):
|
def __init__(self, path):
|
||||||
self.path = path
|
self.path = path
|
||||||
appName = os.path.splitext(os.path.basename(path))[0]
|
appName = "Bitcoin-Qt"
|
||||||
self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
|
self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
|
||||||
if not os.path.exists(self.binaryPath):
|
if not os.path.exists(self.binaryPath):
|
||||||
raise RuntimeError("Could not find bundle binary for " + path)
|
raise RuntimeError("Could not find bundle binary for " + path)
|
||||||
@ -596,7 +596,7 @@ if os.path.exists("dist"):
|
|||||||
|
|
||||||
# ------------------------------------------------
|
# ------------------------------------------------
|
||||||
|
|
||||||
target = os.path.join("dist", app_bundle)
|
target = os.path.join("dist", "Bitcoin Core.app")
|
||||||
|
|
||||||
if verbose >= 2:
|
if verbose >= 2:
|
||||||
print "+ Copying source bundle +"
|
print "+ Copying source bundle +"
|
||||||
@ -837,7 +837,7 @@ if config.dmg is not None:
|
|||||||
items_positions.append(itemscript.substitute(params))
|
items_positions.append(itemscript.substitute(params))
|
||||||
|
|
||||||
params = {
|
params = {
|
||||||
"disk" : "Bitcoin-Qt",
|
"disk" : "Bitcoin-Core",
|
||||||
"window_bounds" : "300,300,800,620",
|
"window_bounds" : "300,300,800,620",
|
||||||
"icon_size" : "96",
|
"icon_size" : "96",
|
||||||
"background_commands" : "",
|
"background_commands" : "",
|
||||||
|
@ -100,7 +100,7 @@ Creating a release build
|
|||||||
------------------------
|
------------------------
|
||||||
You can ignore this section if you are building `bitcoind` for your own use.
|
You can ignore this section if you are building `bitcoind` for your own use.
|
||||||
|
|
||||||
bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Qt.app bundle.
|
bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Core.app bundle.
|
||||||
|
|
||||||
If you are building `bitcoind` or `Bitcoin-Qt` for others, your build machine should be set up
|
If you are building `bitcoind` or `Bitcoin-Qt` for others, your build machine should be set up
|
||||||
as follows for maximum compatibility:
|
as follows for maximum compatibility:
|
||||||
@ -111,7 +111,7 @@ All dependencies should be compiled with these flags:
|
|||||||
-arch x86_64
|
-arch x86_64
|
||||||
-isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
|
-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-Qt.app
|
Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin-Core.app
|
||||||
bundle is packaged and signed to create the .dmg disk image that is distributed.
|
bundle is packaged and signed to create the .dmg disk image that is distributed.
|
||||||
|
|
||||||
Running
|
Running
|
||||||
|
@ -7,7 +7,7 @@ signing requests.
|
|||||||
|
|
||||||
For OSX, the private key was generated by Keychain.app on Gavin's main work machine.
|
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
|
The key and certificate is in a separate, passphrase-protected keychain file that is
|
||||||
unlocked to sign the Bitcoin-Qt.app bundle.
|
unlocked to sign the Bitcoin-Core.app bundle.
|
||||||
|
|
||||||
For Windows, the private key was generated by Firefox running on Gavin's main work machine.
|
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
|
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,
|
Gavin is a single point of failure. He could be coerced to divulge the secret signing keys,
|
||||||
allowing somebody to distribute a Bitcoin-Qt.app or bitcoin-qt-setup.exe with a valid
|
allowing somebody to distribute a Bitcoin-Core.app or bitcoin-qt-setup.exe with a valid
|
||||||
signature but containing a malicious binary.
|
signature but containing a malicious binary.
|
||||||
|
|
||||||
Or the machine Gavin uses to sign the binaries could be compromised, either remotely or
|
Or the machine Gavin uses to sign the binaries could be compromised, either remotely or
|
||||||
|
Loading…
Reference in New Issue
Block a user