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

Fixappname #20

Closed
wants to merge 6 commits into from
Closed
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
44 changes: 22 additions & 22 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
empty :=
space := $(empty) $(empty)

OSX_APP=Dash-Qt.app
OSX_APP=PACGlobal-Qt.app
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg
Expand All @@ -40,9 +40,9 @@ OSX_PLIST=$(top_builddir)/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)
DIST_CONTRIB = $(top_srcdir)/contrib/dash-cli.bash-completion \
$(top_srcdir)/contrib/dash-tx.bash-completion \
$(top_srcdir)/contrib/dashd.bash-completion \
DIST_CONTRIB = $(top_srcdir)/contrib/pacglobal-cli.bash-completion \
$(top_srcdir)/contrib/pacglobal-tx.bash-completion \
$(top_srcdir)/contrib/pacglobald.bash-completion \
$(top_srcdir)/contrib/init

BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
Expand All @@ -60,9 +60,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
leveldb_baseline.info test_dash_filtered.info total_coverage.info \
leveldb_baseline.info test_pacglobal_filtered.info total_coverage.info \
baseline_filtered.info rpc_test.info rpc_test_filtered.info \
leveldb_baseline_filtered.info test_dash_coverage.info test_dash.info
leveldb_baseline_filtered.info test_pacglobal_coverage.info test_pacglobal.info

dist-hook:
-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
Expand All @@ -82,7 +82,7 @@ $(OSX_APP)/Contents/PkgInfo:

$(OSX_APP)/Contents/Resources/empty.lproj:
$(MKDIR_P) $(@D)
@touch $@
@touch $@

$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
$(MKDIR_P) $(@D)
Expand All @@ -92,7 +92,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

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

Expand All @@ -102,7 +102,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/Dash-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/MacOS/PACGlobal-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

osx_volname:
echo $(OSX_VOLNAME) >$@
Expand All @@ -127,7 +127,7 @@ $(APP_DIST_DIR)/Applications:
@rm -f $@
@cd $(@D); $(LN_S) /Applications $(@F)

$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/PACGlobal-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
Expand All @@ -142,7 +142,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/Dash-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/PACGlobal-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)
Expand Down Expand Up @@ -182,16 +182,16 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@

test_dash.info: baseline_filtered_combined.info
test_pacglobal.info: baseline_filtered_combined.info
$(MAKE) -C src/ check
$(LCOV) -c -d $(abs_builddir)/src -t test_dash -o $@
$(LCOV) -c -d $(abs_builddir)/src -t test_pacglobal -o $@
$(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb

test_dash_filtered.info: test_dash.info
test_pacglobal_filtered.info: test_pacglobal.info
$(LCOV) -r $< "/usr/include/*" -o $@

rpc_test.info: test_dash_filtered.info
rpc_test.info: test_pacglobal_filtered.info
-@TIMEOUT=15 python qa/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS)
$(LCOV) -c -d $(abs_builddir)/src --t rpc-tests -o $@
$(LCOV) -z -d $(abs_builddir)/src
Expand All @@ -200,21 +200,21 @@ rpc_test.info: test_dash_filtered.info
rpc_test_filtered.info: rpc_test.info
$(LCOV) -r $< "/usr/include/*" -o $@

test_dash_coverage.info: baseline_filtered_combined.info test_dash_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -o $@
test_pacglobal_coverage.info: baseline_filtered_combined.info test_pacglobal_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_pacglobal_filtered.info -o $@

total_coverage.info: baseline_filtered_combined.info test_dash_filtered.info rpc_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_dash_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
total_coverage.info: baseline_filtered_combined.info test_pacglobal_filtered.info rpc_test_filtered.info
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_pacglobal_filtered.info -a rpc_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

test_dash.coverage/.dirstamp: test_dash_coverage.info
test_pacglobal.coverage/.dirstamp: test_pacglobal_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

total.coverage/.dirstamp: total_coverage.info
$(GENHTML) -s $< -o $(@D)
@touch $@

cov: test_dash.coverage/.dirstamp total.coverage/.dirstamp
cov: test_pacglobal.coverage/.dirstamp total.coverage/.dirstamp

endif

Expand All @@ -229,5 +229,5 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
DISTCHECK_CONFIGURE_FLAGS = --enable-man

clean-local:
rm -rf coverage_percent.txt test_dash.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
rm -rf coverage_percent.txt test_pacglobal.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
rm -rf qa/pull-tester/__pycache__
2 changes: 1 addition & 1 deletion contrib/macdeploy/custom_dsstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
ds['.']['vSrn'] = ('long', 1)

ds['Applications']['Iloc'] = (370, 156)
ds['Dash-Qt.app']['Iloc'] = (128, 156)
ds['PACGlobal-Qt.app']['Iloc'] = (128, 156)

ds.flush()
ds.close()
2 changes: 1 addition & 1 deletion contrib/macdeploy/detached-sig-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
set -e

ROOTDIR=dist
BUNDLE="${ROOTDIR}/Dash-Qt.app"
BUNDLE="${ROOTDIR}/PACGlobal-Qt.app"
CODESIGN=codesign
TEMPDIR=sign.temp
TEMPLIST=${TEMPDIR}/signatures.txt
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>Dash-Qt.app</key>
<key>PACGlobal-Qt.app</key>
<array>
<integer>128</integer>
<integer>156</integer>
Expand Down
12 changes: 6 additions & 6 deletions contrib/macdeploy/macdeployqtplus
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class FrameworkInfo(object):
class ApplicationBundleInfo(object):
def __init__(self, path):
self.path = path
appName = "Dash-Qt"
appName = "PACGlobal-Qt"
self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
if not os.path.exists(self.binaryPath):
raise RuntimeError("Could not find bundle binary for " + path)
Expand Down Expand Up @@ -330,7 +330,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
# Get the Qt path from one of the Qt frameworks
if deploymentInfo.qtPath is None and framework.isQtFramework():
deploymentInfo.detectQtPath(framework.frameworkDirectory)

if framework.installName.startswith("@executable_path") or framework.installName.startswith(bundlePath):
if verbose >= 2:
print(framework.frameworkName, "already deployed, skipping.")
Expand Down Expand Up @@ -541,7 +541,7 @@ if len(config.fancy) == 1:
if verbose >= 1:
sys.stderr.write("Error: Could not import plistlib which is required for fancy disk images.\n")
sys.exit(1)

p = config.fancy[0]
if verbose >= 3:
print("Fancy: Loading \"%s\"..." % p)
Expand Down Expand Up @@ -603,7 +603,7 @@ else:

# ------------------------------------------------

target = os.path.join("dist", "Dash-Qt.app")
target = os.path.join("dist", "PACGlobal-Qt.app")

if verbose >= 2:
print("+ Copying source bundle +")
Expand Down Expand Up @@ -850,7 +850,7 @@ if config.dmg is not None:
print("Running AppleScript:")
print(s)

time.sleep(2) # fixes '112:116: execution error: Finder got an error: Can’t get disk "Dash-Core". (-1728)'
time.sleep(2) # fixes '112:116: execution error: Finder got an error: Can’t get disk "PACGlobal-Core". (-1728)'
p = subprocess.Popen(['osascript', '-'], stdin=subprocess.PIPE)
p.communicate(input=s.encode('utf-8'))
if p.returncode:
Expand All @@ -859,7 +859,7 @@ if config.dmg is not None:
if verbose >= 2:
print("+ Finalizing .dmg disk image +")
time.sleep(5)

try:
runHDIUtil("convert", dmg_name + ".temp", format="UDBZ", o=dmg_name + ".dmg", ov=True)
except subprocess.CalledProcessError as e:
Expand Down
20 changes: 10 additions & 10 deletions share/qt/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@
<string>????</string>

<key>CFBundleExecutable</key>
<string>Dash-Qt</string>
<string>PACGlobal-Qt</string>

<key>CFBundleName</key>
<string>Dash-Qt</string>
<string>PACGlobal-Qt</string>

<key>LSHasLocalizedDisplayName</key>
<true/>

<key>CFBundleIdentifier</key>
<string>org.dash.Dash-Qt</string>
<string>org.pacglobal.PACGlobal-Qt</string>

<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>org.dash.DashPayment</string>
<string>org.pacglobal.PACGlobalPayment</string>
<key>CFBundleURLSchemes</key>
<array>
<string>dash</string>
<string>pacglobal</string>
</array>
</dict>
</array>
Expand All @@ -58,20 +58,20 @@
<array>
<dict>
<key>UTTypeIdentifier</key>
<string>org.dash.paymentrequest</string>
<string>org.pacglobal.paymentrequest</string>
<key>UTTypeDescription</key>
<string>Dash payment request</string>
<string>PACGlobal payment request</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.mime-type</key>
<string>application/x-dash-payment-request</string>
<string>application/x-pacglobal-payment-request</string>
<key>public.filename-extension</key>
<array>
<string>dashpaymentrequest</string>
<string>pacglobalpaymentrequest</string>
</array>
</dict>
</dict>
Expand All @@ -84,7 +84,7 @@
<string>Editor</string>
<key>LSItemContentTypes</key>
<array>
<string>org.dash.paymentrequest</string>
<string>org.pacglobal.paymentrequest</string>
</array>
<key>LSHandlerRank</key>
<string>Owner</string>
Expand Down
6 changes: 4 additions & 2 deletions src/wallet/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3347,6 +3347,9 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT

if (recipient.nAmount < COIN && nExtraPayloadSize == 0)
{
if( GetBoolArg("-testnet", false) )
return true;

strFailReason = _("Output amounts must be equal to or greater than 1 PAC");
return false;
}
Expand Down Expand Up @@ -4219,7 +4222,7 @@ bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)

/**
* Mark old keypool keys as used,
* and generate all new keys
* and generate all new keys
*/
bool CWallet::NewKeyPool()
{
Expand Down Expand Up @@ -5608,4 +5611,3 @@ bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState&
{
return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, false, nAbsurdFee);
}