Merge tag 'branch-0.13' into bugfix_gitdir

This commit is contained in:
Luke Dashjr
2016-08-09 05:45:50 +00:00
1194 changed files with 128879 additions and 101019 deletions

View File

@@ -15,23 +15,19 @@ fi
DESC=""
SUFFIX=""
LAST_COMMIT_DATE=""
if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" -a "$(git status --porcelain -u no --ignored "$0" | cut -b1)" != "?" ]; then
# clean 'dirty' status of touched files that haven't been modified
git diff >/dev/null 2>/dev/null
# if latest commit is tagged and not dirty, then override using the tag name
RAWDESC=$(git describe --abbrev=0 2>/dev/null)
if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC)" ]; then
if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then
git diff-index --quiet HEAD -- && DESC=$RAWDESC
fi
# otherwise generate suffix from git, i.e. string like "59887e8-dirty"
SUFFIX=$(git rev-parse --short HEAD)
git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
# get a string like "2012-04-10 16:27:19 +0200"
LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
fi
if [ -n "$DESC" ]; then
@@ -45,7 +41,4 @@ fi
# only update build.h if necessary
if [ "$INFO" != "$NEWINFO" ]; then
echo "$NEWINFO" >"$FILE"
if [ -n "$LAST_COMMIT_DATE" ]; then
echo "#define BUILD_DATE \"$LAST_COMMIT_DATE\"" >> "$FILE"
fi
fi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

View File

@@ -3,7 +3,7 @@
<plist version="0.9">
<dict>
<key>LSMinimumSystemVersion</key>
<string>10.6.0</string>
<string>10.7.0</string>
<key>LSArchitecturePriority</key>
<array>
@@ -17,7 +17,7 @@
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers</string>
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
<key>CFBundleShortVersionString</key>
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
@@ -30,6 +30,12 @@
<key>CFBundleExecutable</key>
<string>Bitcoin-Qt</string>
<key>CFBundleName</key>
<string>Bitcoin-Qt</string>
<key>LSHasLocalizedDisplayName</key>
<true/>
<key>CFBundleIdentifier</key>
<string>org.bitcoinfoundation.Bitcoin-Qt</string>

View File

@@ -1,8 +1,9 @@
#!/usr/bin/python
'''
Extract _("...") strings for translation and convert to Qt4 stringdefs so that
Extract _("...") strings for translation and convert to Qt stringdefs so that
they can be picked up by Qt linguist.
'''
from __future__ import division,print_function,unicode_literals
from subprocess import Popen, PIPE
import glob
import operator
@@ -31,7 +32,7 @@ def parse_po(text):
in_msgstr = False
# message start
in_msgid = True
msgid = [line[6:]]
elif line.startswith('msgstr '):
in_msgid = False
@@ -52,17 +53,21 @@ files = sys.argv[1:]
# xgettext -n --keyword=_ $FILES
XGETTEXT=os.getenv('XGETTEXT', 'xgettext')
if not XGETTEXT:
print('Cannot extract strings: xgettext utility is not installed or not configured.',file=sys.stderr)
print('Please install package "gettext" and re-run \'./configure\'.',file=sys.stderr)
exit(1)
child = Popen([XGETTEXT,'--output=-','-n','--keyword=_'] + files, stdout=PIPE)
(out, err) = child.communicate()
messages = parse_po(out)
messages = parse_po(out.decode('utf-8'))
f = open(OUT_CPP, 'w')
f.write("""
#include <QtGlobal>
// Automatically generated by extract_strings.py
// Automatically generated by extract_strings_qt.py
#ifdef __GNUC__
#define UNUSED __attribute__((unused))
#else
@@ -70,6 +75,10 @@ f.write("""
#endif
""")
f.write('static const char UNUSED *bitcoin_strings[] = {\n')
f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('PACKAGE_NAME'),))
f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS'),))
if os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION') != os.getenv('PACKAGE_NAME'):
f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION'),))
messages.sort(key=operator.itemgetter(0))
for (msgid, msgstr) in messages:
if msgid != EMPTY:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

View File

@@ -1,38 +0,0 @@
#!/usr/bin/env python
# W.J. van der Laan, 2011
# Make spinning animation from a .png
# Requires imagemagick 6.7+
from __future__ import division
from os import path
from PIL import Image
from subprocess import Popen
SRC='img/reload.png'
TMPDIR='../../src/qt/res/movies/'
TMPNAME='spinner-%03i.png'
NUMFRAMES=35
FRAMERATE=10.0
CONVERT='convert'
CLOCKWISE=True
DSIZE=(16,16)
im_src = Image.open(SRC)
if CLOCKWISE:
im_src = im_src.transpose(Image.FLIP_LEFT_RIGHT)
def frame_to_filename(frame):
return path.join(TMPDIR, TMPNAME % frame)
frame_files = []
for frame in xrange(NUMFRAMES):
rotation = (frame + 0.5) / NUMFRAMES * 360.0
if CLOCKWISE:
rotation = -rotation
im_new = im_src.rotate(rotation, Image.BICUBIC)
im_new.thumbnail(DSIZE, Image.ANTIALIAS)
outfile = frame_to_filename(frame)
im_new.save(outfile, 'png')
frame_files.append(outfile)

View File

@@ -1,9 +0,0 @@
#!/bin/bash
# create multiresolution windows icon
ICON_SRC=../../src/qt/res/icons/bitcoin.png
ICON_DST=../../src/qt/res/icons/bitcoin.ico
convert ${ICON_SRC} -resize 16x16 bitcoin-16.png
convert ${ICON_SRC} -resize 32x32 bitcoin-32.png
convert ${ICON_SRC} -resize 48x48 bitcoin-48.png
convert bitcoin-16.png bitcoin-32.png bitcoin-48.png ${ICON_DST}

10
share/rpcuser/README.md Normal file
View File

@@ -0,0 +1,10 @@
RPC Tools
---------------------
### [RPCUser](/share/rpcuser) ###
Create an RPC user login credential.
Usage:
./rpcuser.py <username>

41
share/rpcuser/rpcuser.py Executable file
View File

@@ -0,0 +1,41 @@
#!/usr/bin/env python2
# Copyright (c) 2015 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
import hashlib
import sys
import os
from random import SystemRandom
import base64
import hmac
if len(sys.argv) < 2:
sys.stderr.write('Please include username as an argument.\n')
sys.exit(0)
username = sys.argv[1]
#This uses os.urandom() underneath
cryptogen = SystemRandom()
#Create 16 byte hex salt
salt_sequence = [cryptogen.randrange(256) for i in range(16)]
hexseq = list(map(hex, salt_sequence))
salt = "".join([x[2:] for x in hexseq])
#Create 32 byte b64 password
password = base64.urlsafe_b64encode(os.urandom(32))
digestmod = hashlib.sha256
if sys.version_info.major >= 3:
password = password.decode('utf-8')
digestmod = 'SHA256'
m = hmac.new(bytearray(salt, 'utf-8'), bytearray(password, 'utf-8'), digestmod)
result = m.hexdigest()
print("String to be appended to bitcoin.conf:")
print("rpcauth="+username+":"+salt+"$"+result)
print("Your password:\n"+password)

View File

@@ -1,135 +0,0 @@
#!/usr/bin/python
# Copyright (c) 2014 Wladmir J. van der Laan
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
'''
Script to generate list of seed nodes for chainparams.cpp.
This script expects two text files in the directory that is passed as an
argument:
nodes_main.txt
nodes_test.txt
These files must consist of lines in the format
<ip>
<ip>:<port>
[<ipv6>]
[<ipv6>]:<port>
<onion>.onion
0xDDBBCCAA (IPv4 little-endian old pnSeeds format)
The output will be two data structures with the peers in binary format:
static SeedSpec6 pnSeed6_main[]={
...
}
static SeedSpec6 pnSeed6_test[]={
...
}
These should be pasted into `src/chainparamsseeds.h`.
'''
from __future__ import print_function, division
from base64 import b32decode
from binascii import a2b_hex
import sys, os
import re
# ipv4 in ipv6 prefix
pchIPv4 = bytearray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff])
# tor-specific ipv6 prefix
pchOnionCat = bytearray([0xFD,0x87,0xD8,0x7E,0xEB,0x43])
def name_to_ipv6(addr):
if len(addr)>6 and addr.endswith('.onion'):
vchAddr = b32decode(addr[0:-6], True)
if len(vchAddr) != 16-len(pchOnionCat):
raise ValueError('Invalid onion %s' % s)
return pchOnionCat + vchAddr
elif '.' in addr: # IPv4
return pchIPv4 + bytearray((int(x) for x in addr.split('.')))
elif ':' in addr: # IPv6
sub = [[], []] # prefix, suffix
x = 0
addr = addr.split(':')
for i,comp in enumerate(addr):
if comp == '':
if i == 0 or i == (len(addr)-1): # skip empty component at beginning or end
continue
x += 1 # :: skips to suffix
assert(x < 2)
else: # two bytes per component
val = int(comp, 16)
sub[x].append(val >> 8)
sub[x].append(val & 0xff)
nullbytes = 16 - len(sub[0]) - len(sub[1])
assert((x == 0 and nullbytes == 0) or (x == 1 and nullbytes > 0))
return bytearray(sub[0] + ([0] * nullbytes) + sub[1])
elif addr.startswith('0x'): # IPv4-in-little-endian
return pchIPv4 + bytearray(reversed(a2b_hex(addr[2:])))
else:
raise ValueError('Could not parse address %s' % addr)
def parse_spec(s, defaultport):
match = re.match('\[([0-9a-fA-F:]+)\](?::([0-9]+))?$', s)
if match: # ipv6
host = match.group(1)
port = match.group(2)
else:
(host,_,port) = s.partition(':')
if not port:
port = defaultport
else:
port = int(port)
host = name_to_ipv6(host)
return (host,port)
def process_nodes(g, f, structname, defaultport):
g.write('static SeedSpec6 %s[] = {\n' % structname)
first = True
for line in f:
comment = line.find('#')
if comment != -1:
line = line[0:comment]
line = line.strip()
if not line:
continue
if not first:
g.write(',\n')
first = False
(host,port) = parse_spec(line, defaultport)
hoststr = ','.join(('0x%02x' % b) for b in host)
g.write(' {{%s}, %i}' % (hoststr, port))
g.write('\n};\n')
def main():
if len(sys.argv)<2:
print(('Usage: %s <path_to_nodes_txt>' % sys.argv[0]), file=sys.stderr)
exit(1)
g = sys.stdout
indir = sys.argv[1]
g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n')
g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n')
g.write('/**\n')
g.write(' * List of fixed seed nodes for the bitcoin network\n')
g.write(' * AUTOGENERATED by share/seeds/generate-seeds.py\n')
g.write(' *\n')
g.write(' * Each line contains a 16-byte IPv6 address and a port.\n')
g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n')
g.write(' */\n')
with open(os.path.join(indir,'nodes_main.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_main', 8333)
g.write('\n')
with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_test', 18333)
g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n')
if __name__ == '__main__':
main()

View File

@@ -1,629 +0,0 @@
# List of fixed seed nodes for main network
# IPv4 nodes (in old chainparams.cpp 0xDDCCBBAA format)
# n.b. when importing a new list, there is no need to use this format, just use IPv4 dotted addresses directly
0x7e6a692e # 46.105.106.126
0x7d04d1a2 # 162.209.4.125
0x6c0c17d9 # 217.23.12.108
0xdb330ab9 # 185.10.51.219
0xc649c7c6 # 198.199.73.198
0x7895484d # 77.72.149.120
0x047109b0 # 176.9.113.4
0xb90ca5bc # 188.165.12.185
0xd130805f # 95.128.48.209
0xbd074ea6 # 166.78.7.189
0x578ff1c0 # 192.241.143.87
0x286e09b0 # 176.9.110.40
0xd4dcaf42 # 66.175.220.212
0x529b6bb8 # 184.107.155.82
0x635cc6c0 # 192.198.92.99
0xedde892e # 46.137.222.237
0xa976d9c7 # 199.217.118.169
0xea91a4b8 # 184.164.145.234
0x03fa4eb2 # 178.78.250.3
0x6ca9008d # 141.0.169.108
0xaf62c825 # 37.200.98.175
0x93f3ba51 # 81.186.243.147
0xc2c9efd5 # 213.239.201.194
0x0ed5175e # 94.23.213.14
0x487028bc # 188.40.112.72
0x7297c225 # 37.194.151.114
0x8af0c658 # 88.198.240.138
0x2e57ba1f # 31.186.87.46
0xd0098abc # 188.138.9.208
0x46a8853e # 62.133.168.70
0xcc92dc3e # 62.220.146.204
0xeb6f1955 # 85.25.111.235
0x8cce175e # 94.23.206.140
0x237281ae # 174.129.114.35
0x9d42795b # 91.121.66.157
0x4f4f0905 # 5.9.79.79
0xc50151d0 # 208.81.1.197
0xb1ba90c6 # 198.144.186.177
0xaed7175e # 94.23.215.174
0x204de55b # 91.229.77.32
0x4bb03245 # 69.50.176.75
0x932b28bc # 188.40.43.147
0x2dcce65b # 91.230.204.45
0xe2708abc # 188.138.112.226
0x1b08b8d5 # 213.184.8.27
0x12a3dc5b # 91.220.163.18
0x8a884c90 # 144.76.136.138
0xa386a8b8 # 184.168.134.163
0x18e417c6 # 198.23.228.24
0x2e709ac3 # 195.154.112.46
0xeb62e925 # 37.233.98.235
0x6f6503ae # 174.3.101.111
0x05d0814e # 78.129.208.5
0x8a9ac545 # 69.197.154.138
0x946fd65e # 94.214.111.148
0x3f57495d # 93.73.87.63
0x4a29c658 # 88.198.41.74
0xad454c90 # 144.76.69.173
0x15340905 # 5.9.52.21
0x4c3f3b25 # 37.59.63.76
0x01fe19b9 # 185.25.254.1
0x5620595b # 91.89.32.86
0x443c795b # 91.121.60.68
0x44f24ac8 # 200.74.242.68
0x0442464e # 78.70.66.4
0xc8665882 # 130.88.102.200
0xed3f3ec3 # 195.62.63.237
0xf585bf5d # 93.191.133.245
0x5dd141da # 218.65.209.93
0xf93a084e # 78.8.58.249
0x1264dd52 # 82.221.100.18
0x0711c658 # 88.198.17.7
0xf12e7bbe # 190.123.46.241
0x5b02b740 # 64.183.2.91
0x7d526dd5 # 213.109.82.125
0x0cb04c90 # 144.76.176.12
0x2abe1132 # 50.17.190.42
0x61a39f58 # 88.159.163.97
0x044a0618 # 24.6.74.4
0xf3af7dce # 206.125.175.243
0xb994c96d # 109.201.148.185
0x361c5058 # 88.80.28.54
0xca735d53 # 83.93.115.202
0xeca743b0 # 176.67.167.236
0xec790905 # 5.9.121.236
0xc4d37845 # 69.120.211.196
0xa1c4a2b2 # 178.162.196.161
0x726fd453 # 83.212.111.114
0x625cc6c0 # 192.198.92.98
0x6c20132e # 46.19.32.108
0xb7aa0c79 # 121.12.170.183
0xc6ed983d # 61.152.237.198
0x47e4cbc0 # 192.203.228.71
0xa4ac75d4 # 212.117.172.164
0xe2e59345 # 69.147.229.226
0x4d784ad0 # 208.74.120.77
0x18a5ec5e # 94.236.165.24
0x481cc85b # 91.200.28.72
0x7c6c2fd5 # 213.47.108.124
0x5e4d6018 # 24.96.77.94
0x5b4b6c18 # 24.108.75.91
0xd99b4c90 # 144.76.155.217
0xe63987dc # 220.135.57.230
0xb817bb25 # 37.187.23.184
0x141cfeb2 # 178.254.28.20
0x5f005058 # 88.80.0.95
0x0d987f47 # 71.127.152.13
0x242a496d # 109.73.42.36
0x3e519bc0 # 192.155.81.62
0x02b2454b # 75.69.178.2
0xdfaf3dc6 # 198.61.175.223
0x888128bc # 188.40.129.136
0x1165bb25 # 37.187.101.17
0xabfeca5b # 91.202.254.171
0x2ef63540 # 64.53.246.46
0x5773c7c6 # 198.199.115.87
0x1280dd52 # 82.221.128.18
0x8ebcacd9 # 217.172.188.142
0x81c439c6 # 198.57.196.129
0x39fcfa45 # 69.250.252.57
0x62177d41 # 65.125.23.98
0xc975ed62 # 98.237.117.201
0x05cff476 # 118.244.207.5
0xdabda743 # 67.167.189.218
0xaa1ac24e # 78.194.26.170
0xe255a22e # 46.162.85.226
0x88aac705 # 5.199.170.136
0xe707c658 # 88.198.7.231
0xa9e94b5e # 94.75.233.169
0x2893484b # 75.72.147.40
0x99512705 # 5.39.81.153
0xd63970ca # 202.112.57.214
0x45994f32 # 50.79.153.69
0xe519a8ad # 173.168.25.229
0x92e25f5d # 93.95.226.146
0x8b84a9c1 # 193.169.132.139
0x5eaa0a05 # 5.10.170.94
0xa74de55b # 91.229.77.167
0xb090ff62 # 98.255.144.176
0x5eee326c # 108.50.238.94
0xc331a679 # 121.166.49.195
0xc1d9b72e # 46.183.217.193
0x0c6ab982 # 130.185.106.12
0x7362bb25 # 37.187.98.115
0x4cfedd42 # 66.221.254.76
0x1e09a032 # 50.160.9.30
0xa4c34c5e # 94.76.195.164
0x3777d9c7 # 199.217.119.55
0x5edcf260 # 96.242.220.94
0x3ce2b548 # 72.181.226.60
0xd2ac0360 # 96.3.172.210
0x2f80b992 # 146.185.128.47
0x3e4cbb25 # 37.187.76.62
0x3995e236 # 54.226.149.57
0xd03977ae # 174.119.57.208
0x953cf054 # 84.240.60.149
0x3c654ed0 # 208.78.101.60
0x74024c90 # 144.76.2.116
0xa14f1155 # 85.17.79.161
0x14ce0125 # 37.1.206.20
0xc15ebb6a # 106.187.94.193
0x2c08c452 # 82.196.8.44
0xc7fd0652 # 82.6.253.199
0x7604f8ce # 206.248.4.118
0xffb38332 # 50.131.179.255
0xa4c2efd5 # 213.239.194.164
0xe9614018 # 24.64.97.233
0xab49e557 # 87.229.73.171
0x1648c052 # 82.192.72.22
0x36024047 # 71.64.2.54
0x0e8cffad # 173.255.140.14
0x21918953 # 83.137.145.33
0xb61f50ad # 173.80.31.182
0x9b406b59 # 89.107.64.155
0xaf282218 # 24.34.40.175
0x7f1d164e # 78.22.29.127
0x1f560da2 # 162.13.86.31
0xe237be58 # 88.190.55.226
0xbdeb1955 # 85.25.235.189
0x6c0717d9 # 217.23.7.108
0xdaf8ce62 # 98.206.248.218
0x0f74246c # 108.36.116.15
0xdee95243 # 67.82.233.222
0xf23f1a56 # 86.26.63.242
0x61bdf867 # 103.248.189.97
0xd254c854 # 84.200.84.210
0xc4422e4e # 78.46.66.196
0xae0563c0 # 192.99.5.174
0xbdb9a95f # 95.169.185.189
0xa9eb32c6 # 198.50.235.169
0xd9943950 # 80.57.148.217
0x116add52 # 82.221.106.17
0x73a54c90 # 144.76.165.115
0xb36b525e # 94.82.107.179
0xd734175e # 94.23.52.215
0x333d7f76 # 118.127.61.51
0x51431bc6 # 198.27.67.81
0x084ae5cf # 207.229.74.8
0xa60a236c # 108.35.10.166
0x5c67692e # 46.105.103.92
0x0177cf45 # 69.207.119.1
0xa6683ac6 # 198.58.104.166
0x7ff4ea47 # 71.234.244.127
0x2192fab2 # 178.250.146.33
0xa03a0f46 # 70.15.58.160
0xfe3e39ae # 174.57.62.254
0x2cce5fc1 # 193.95.206.44
0xc8a6c148 # 72.193.166.200
0x96fb7e4c # 76.126.251.150
0x0a66c752 # 82.199.102.10
0x6b4d2705 # 5.39.77.107
0xeba0c118 # 24.193.160.235
0x3ba0795b # 91.121.160.59
0x1dccd23e # 62.210.204.29
0x6912f3a2 # 162.243.18.105
0x22f23c41 # 65.60.242.34
0x65646b4a # 74.107.100.101
0x8b9f8705 # 5.135.159.139
0xeb9b9a95 # 149.154.155.235
0x79fe6b4e # 78.107.254.121
0x0536f447 # 71.244.54.5
0x23224d61 # 97.77.34.35
0x5d952ec6 # 198.46.149.93
0x0cb4f736 # 54.247.180.12
0xdc14be6d # 109.190.20.220
0xb24609b0 # 176.9.70.178
0xd3f79b62 # 98.155.247.211
0x6518c836 # 54.200.24.101
0x83a3cf42 # 66.207.163.131
0x9b641fb0 # 176.31.100.155
0x17fef1c0 # 192.241.254.23
0xd508cc82 # 130.204.8.213
0x91a4369b # 155.54.164.145
0x39cb4a4c # 76.74.203.57
0xbbc9536c # 108.83.201.187
0xaf64c44a # 74.196.100.175
0x605eca50 # 80.202.94.96
0x0c6a6805 # 5.104.106.12
0xd07e9d4e # 78.157.126.208
0x78e6d3a2 # 162.211.230.120
0x1b31eb6d # 109.235.49.27
0xaa01feb2 # 178.254.1.170
0x4603c236 # 54.194.3.70
0x1ecba3b6 # 182.163.203.30
0x0effe336 # 54.227.255.14
0xc3fdcb36 # 54.203.253.195
0xc290036f # 111.3.144.194
0x4464692e # 46.105.100.68
0x1aca7589 # 137.117.202.26
0x59a9e52e # 46.229.169.89
0x19aa7489 # 137.116.170.25
0x2622c85e # 94.200.34.38
0xa598d318 # 24.211.152.165
0x438ec345 # 69.195.142.67
0xc79619b9 # 185.25.150.199
0xaf570360 # 96.3.87.175
0x5098e289 # 137.226.152.80
0x36add862 # 98.216.173.54
0x83c1a2b2 # 178.162.193.131
0x969d0905 # 5.9.157.150
0xcf3d156c # 108.21.61.207
0x49c1a445 # 69.164.193.73
0xbd0b7562 # 98.117.11.189
0x8fff1955 # 85.25.255.143
0x1e51fe53 # 83.254.81.30
0x28d6efd5 # 213.239.214.40
0x2837cc62 # 98.204.55.40
0x02f42d42 # 66.45.244.2
0x070e3fb2 # 178.63.14.7
0xbcb18705 # 5.135.177.188
0x14a4e15b # 91.225.164.20
0x82096844 # 68.104.9.130
0xcfcb1c2e # 46.28.203.207
0x37e27fc7 # 199.127.226.55
0x07923748 # 72.55.146.7
0x0c14bc2e # 46.188.20.12
0x26100905 # 5.9.16.38
0xcb7cd93e # 62.217.124.203
0x3bc0d2c0 # 192.210.192.59
0x97131b4c # 76.27.19.151
0x6f1e5c17 # 23.92.30.111
0xa7939f43 # 67.159.147.167
0xb7a0bf58 # 88.191.160.183
0xafa83a47 # 71.58.168.175
0xcbb83f32 # 50.63.184.203
0x5f321cb0 # 176.28.50.95
0x52d6c3c7 # 199.195.214.82
0xdeac5bc7 # 199.91.172.222
0x2cf310cc # 204.16.243.44
0x108a2bc3 # 195.43.138.16
0x726fa14f # 79.161.111.114
0x85bad2cc # 204.210.186.133
0x459e4c90 # 144.76.158.69
0x1a08b8d8 # 216.184.8.26
0xcd7048c6 # 198.72.112.205
0x6d5b4c90 # 144.76.91.109
0xa66cfe7b # 123.254.108.166
0xad730905 # 5.9.115.173
0xdaac5bc7 # 199.91.172.218
0x8417fd9f # 159.253.23.132
0x41377432 # 50.116.55.65
0x1f138632 # 50.134.19.31
0x295a12b2 # 178.18.90.41
0x7ac031b2 # 178.49.192.122
0x3a87d295 # 149.210.135.58
0xe219bc2e # 46.188.25.226
0xf485d295 # 149.210.133.244
0x137b6405 # 5.100.123.19
0xcfffd9ad # 173.217.255.207
0xafe20844 # 68.8.226.175
0x32679a5f # 95.154.103.50
0xa431c644 # 68.198.49.164
0x0e5fce8c # 140.206.95.14
0x305ef853 # 83.248.94.48
0xad26ca32 # 50.202.38.173
0xd9d21a54 # 84.26.210.217
0xddd0d736 # 54.215.208.221
0xc24ec0c7 # 199.192.78.194
0x4aadcd5b # 91.205.173.74
0x49109852 # 82.152.16.73
0x9d6b3ac6 # 198.58.107.157
0xf0aa1e8b # 139.30.170.240
0xf1bfa343 # 67.163.191.241
0x8a30c0ad # 173.192.48.138
0x260f93d4 # 212.147.15.38
0x2339e760 # 96.231.57.35
0x8869959f # 159.149.105.136
0xc207216c # 108.33.7.194
0x29453448 # 72.52.69.41
0xb651ec36 # 54.236.81.182
0x45496259 # 89.98.73.69
0xa23d1bcc # 204.27.61.162
0xb39bcf43 # 67.207.155.179
0xa1d29432 # 50.148.210.161
0x3507c658 # 88.198.7.53
0x4a88dd62 # 98.221.136.74
0x27aff363 # 99.243.175.39
0x7498ea6d # 109.234.152.116
0x4a6785d5 # 213.133.103.74
0x5e6d47c2 # 194.71.109.94
0x3baba542 # 66.165.171.59
0x045a37ae # 174.55.90.4
0xa24dc0c7 # 199.192.77.162
0xe981ea4d # 77.234.129.233
0xed6ce217 # 23.226.108.237
0x857214c6 # 198.20.114.133
0x6b6c0464 # 100.4.108.107
0x5a4945b8 # 184.69.73.90
0x12f24742 # 66.71.242.18
0xf35f42ad # 173.66.95.243
0xfd0f5a4e # 78.90.15.253
0xfb081556 # 86.21.8.251
0xb24b5861 # 97.88.75.178
0x2e114146 # 70.65.17.46
0xb7780905 # 5.9.120.183
0x33bb0e48 # 72.14.187.51
0x39e26556 # 86.101.226.57
0xa794484d # 77.72.148.167
0x4225424d # 77.66.37.66
0x3003795b # 91.121.3.48
0x31c8cf44 # 68.207.200.49
0xd65bad59 # 89.173.91.214
0x127bc648 # 72.198.123.18
0xf2bc4d4c # 76.77.188.242
0x0273dc50 # 80.220.115.2
0x4572d736 # 54.215.114.69
0x064bf653 # 83.246.75.6
0xcdcd126c # 108.18.205.205
0x608281ae # 174.129.130.96
0x4d130087 # 135.0.19.77
0x1016f725 # 37.247.22.16
0xba185fc0 # 192.95.24.186
0x16c1a84f # 79.168.193.22
0xfb697252 # 82.114.105.251
0xa2942360 # 96.35.148.162
0x53083b6c # 108.59.8.83
0x0583f1c0 # 192.241.131.5
0x2d5a2441 # 65.36.90.45
0xc172aa43 # 67.170.114.193
0xcd11cf36 # 54.207.17.205
0x7b14ed62 # 98.237.20.123
0x5c94f1c0 # 192.241.148.92
0x7c23132e # 46.19.35.124
0x39965a6f # 111.90.150.57
0x7890e24e # 78.226.144.120
0xa38ec447 # 71.196.142.163
0xc187f1c0 # 192.241.135.193
0xef80b647 # 71.182.128.239
0xf20a7432 # 50.116.10.242
0x7ad1d8d2 # 210.216.209.122
0x869e2ec6 # 198.46.158.134
0xccdb5c5d # 93.92.219.204
0x9d11f636 # 54.246.17.157
0x2161bb25 # 37.187.97.33
0x7599f889 # 137.248.153.117
0x2265ecad # 173.236.101.34
0x0f4f0e55 # 85.14.79.15
0x7d25854a # 74.133.37.125
0xf857e360 # 96.227.87.248
0xf83f3d6c # 108.61.63.248
0x9cc93bb8 # 184.59.201.156
0x02716857 # 87.104.113.2
0x5dd8a177 # 119.161.216.93
0x8adc6cd4 # 212.108.220.138
0xe5613d46 # 70.61.97.229
0x6a734f50 # 80.79.115.106
0x2a5c3bae # 174.59.92.42
0x4a04c3d1 # 209.195.4.74
0xe4613d46 # 70.61.97.228
0x8426f4bc # 188.244.38.132
0x3e1b5fc0 # 192.95.27.62
0x0d5a3c18 # 24.60.90.13
0xd0f6d154 # 84.209.246.208
0x21c7ff5e # 94.255.199.33
0xeb3f3d6c # 108.61.63.235
0x9da5edc0 # 192.237.165.157
0x5d753b81 # 129.59.117.93
0x0d8d53d4 # 212.83.141.13
0x2613f018 # 24.240.19.38
0x4443698d # 141.105.67.68
0x8ca1edcd # 205.237.161.140
0x10ed3f4e # 78.63.237.16
0x789b403a # 58.64.155.120
0x7b984a4b # 75.74.152.123
0x964ebc25 # 37.188.78.150
0x7520ee60 # 96.238.32.117
0x4f4828bc # 188.40.72.79
0x115c407d # 125.64.92.17
0x32dd0667 # 103.6.221.50
0xa741715e # 94.113.65.167
0x1d3f3532 # 50.53.63.29
0x817d1f56 # 86.31.125.129
0x2f99a552 # 82.165.153.47
0x6b2a5956 # 86.89.42.107
0x8d4f4f05 # 5.79.79.141
0xd23c1e17 # 23.30.60.210
0x98993748 # 72.55.153.152
0x2c92e536 # 54.229.146.44
0x237ebdc3 # 195.189.126.35
0xa762fb43 # 67.251.98.167
0x32016b71 # 113.107.1.50
0xd0e7cf79 # 121.207.231.208
0x7d35bdd5 # 213.189.53.125
0x53dac3d2 # 210.195.218.83
0x31016b71 # 113.107.1.49
0x7fb8f8ce # 206.248.184.127
0x9a38c232 # 50.194.56.154
0xefaa42ad # 173.66.170.239
0x876b823d # 61.130.107.135
0x18175347 # 71.83.23.24
0xdb46597d # 125.89.70.219
0xd2c168da # 218.104.193.210
0xcd6fe9dc # 220.233.111.205
0x45272e4e # 78.46.39.69
0x8d4bca5b # 91.202.75.141
0xa4043d47 # 71.61.4.164
0xaab7aa47 # 71.170.183.170
0x202881ae # 174.129.40.32
0xa4aef160 # 96.241.174.164
0xecd7e6bc # 188.230.215.236
0x391359ad # 173.89.19.57
0xd8cc9318 # 24.147.204.216
0xbbeee52e # 46.229.238.187
0x077067b0 # 176.103.112.7
0xebd39d62 # 98.157.211.235
0x0cedc547 # 71.197.237.12
0x23d3e15e # 94.225.211.35
0xa5a81318 # 24.19.168.165
0x179a32c6 # 198.50.154.23
0xe4d3483d # 61.72.211.228
0x03680905 # 5.9.104.3
0xe8018abc # 188.138.1.232
0xdde9ef5b # 91.239.233.221
0x438b8705 # 5.135.139.67
0xb48224a0 # 160.36.130.180
0xcbd69218 # 24.146.214.203
0x9075795b # 91.121.117.144
0xc6411c3e # 62.28.65.198
0x03833f5c # 92.63.131.3
0xf33f8b5e # 94.139.63.243
0x495e464b # 75.70.94.73
0x83c8e65b # 91.230.200.131
0xac09cd25 # 37.205.9.172
0xdaabc547 # 71.197.171.218
0x7665a553 # 83.165.101.118
0xc5263718 # 24.55.38.197
0x2fd0c5cd # 205.197.208.47
0x22224d61 # 97.77.34.34
0x3e954048 # 72.64.149.62
0xfaa37557 # 87.117.163.250
0x36dbc658 # 88.198.219.54
0xa81453d0 # 208.83.20.168
0x5a941f5d # 93.31.148.90
0xa598ea60 # 96.234.152.165
0x65384ac6 # 198.74.56.101
0x10aaa545 # 69.165.170.16
0xaaab795b # 91.121.171.170
0xdda7024c # 76.2.167.221
0x0966f4c6 # 198.244.102.9
0x68571c08 # 8.28.87.104
0x8b40ee59 # 89.238.64.139
0x33ac096c # 108.9.172.51
0x844b4c4b # 75.76.75.132
0xd392254d # 77.37.146.211
0xba4d5a46 # 70.90.77.186
0x63029653 # 83.150.2.99
0xf655f636 # 54.246.85.246
0xbe4c4bb1 # 177.75.76.190
0x45dad036 # 54.208.218.69
0x204bc052 # 82.192.75.32
0x06c3a2b2 # 178.162.195.6
0xf31fba6a # 106.186.31.243
0xb21f09b0 # 176.9.31.178
0x540d0751 # 81.7.13.84
0xc7b46a57 # 87.106.180.199
0x6a11795b # 91.121.17.106
0x3d514045 # 69.64.81.61
0x0318aa6d # 109.170.24.3
0x30306ec3 # 195.110.48.48
0x5c077432 # 50.116.7.92
0x259ae46d # 109.228.154.37
0x82bbd35f # 95.211.187.130
0xae4222c0 # 192.34.66.174
0x254415d4 # 212.21.68.37
0xbd5f574b # 75.87.95.189
0xd8fd175e # 94.23.253.216
0x0a3f38c3 # 195.56.63.10
0x2dce6bb8 # 184.107.206.45
0xc201d058 # 88.208.1.194
0x17fca5bc # 188.165.252.23
0xe8453cca # 202.60.69.232
0xd361f636 # 54.246.97.211
0xa0d9edc0 # 192.237.217.160
0x2f232e4e # 78.46.35.47
0x134e116c # 108.17.78.19
0x61ddc058 # 88.192.221.97
0x05ba7283 # 131.114.186.5
0xe1f7ed5b # 91.237.247.225
0x040ec452 # 82.196.14.4
0x4b672e4e # 78.46.103.75
0xe4efa36d # 109.163.239.228
0x47dca52e # 46.165.220.71
0xe9332e4e # 78.46.51.233
0xa3acb992 # 146.185.172.163
0x24714c90 # 144.76.113.36
0xa8cc8632 # 50.134.204.168
0x26b1ce6d # 109.206.177.38
0x264e53d4 # 212.83.78.38
0xd3d2718c # 140.113.210.211
0x225534ad # 173.52.85.34
0xe289f3a2 # 162.243.137.226
0x87341717 # 23.23.52.135
0x9255ad4f # 79.173.85.146
0x184bbb25 # 37.187.75.24
0x885c7abc # 188.122.92.136
0x3a6e9ac6 # 198.154.110.58
0x1924185e # 94.24.36.25
0xb73d4c90 # 144.76.61.183
0x946d807a # 122.128.109.148
0xa0d78e3f # 63.142.215.160
0x5a16bb25 # 37.187.22.90
0xcb09795b # 91.121.9.203
0x8d0de657 # 87.230.13.141
0x630b8b25 # 37.139.11.99
0xe572c6cf # 207.198.114.229
0x2b3f1118 # 24.17.63.43
0x4242a91f # 31.169.66.66
0x32990905 # 5.9.153.50
0x058b0905 # 5.9.139.5
0xe266fc60 # 96.252.102.226
0xbe66c5b0 # 176.197.102.190
0xcc98e46d # 109.228.152.204
0x698c943e # 62.148.140.105
0x44bd0cc3 # 195.12.189.68
0x865c7abc # 188.122.92.134
0x771764d3 # 211.100.23.119
0x4675d655 # 85.214.117.70
0x354e4826 # 38.72.78.53
0xb67ac152 # 82.193.122.182
0xaeccf285 # 133.242.204.174
0xea625b4e # 78.91.98.234
0xbcd6031f # 31.3.214.188
0x5e81eb18 # 24.235.129.94
0x74b347ce # 206.71.179.116
0x3ca56ac1 # 193.106.165.60
0x54ee4546 # 70.69.238.84
0x38a8175e # 94.23.168.56
0xa3c21155 # 85.17.194.163
0x2f01576d # 109.87.1.47
0x5d7ade50 # 80.222.122.93
0xa003ae48 # 72.174.3.160
0x2bc1d31f # 31.211.193.43
0x13f5094c # 76.9.245.19
0x7ab32648 # 72.38.179.122
0x542e9fd5 # 213.159.46.84
0x53136bc1 # 193.107.19.83
0x7fdf51c0 # 192.81.223.127
0x802197b2 # 178.151.33.128
0xa2d2cc5b # 91.204.210.162
0x6b5f4bc0 # 192.75.95.107
# Onion nodes
bitcoinostk4e4re.onion:8333
5k4vwyy5stro33fb.onion:8333
zy3kdqowmrb7xm7h.onion:8333
e3tn727fywnioxrc.onion:8333
kjy2eqzk4zwi5zd3.onion:8333
pt2awtcs2ulm75ig.onion:8333
td7tgof3imei3fm6.onion:8333
czsbwh4pq4mh3izl.onion:8333
xdnigz4qn5dbbw2t.onion:8333
ymnsfdejmc74vcfb.onion:7033
jxrvw5iqizppbgml.onion:8333
bk5ejfe56xakvtkk.onion:8333
szsm43ou7otwwyfv.onion:8333
5ghqw4wj6hpgfvdg.onion:8333
evolynhit7shzeet.onion:8333
4crhf372poejlc44.onion:8333
tfu4kqfhsw5slqp2.onion:8333
i2r5tbaizb75h26f.onion:8333
btcnet3utgzyz2bf.onion:8333
vso3r6cmjoomhhgg.onion:8333
pqosrh6wfaucet32.onion:8333
zy3kdqowmrb7xm7h.onion:8333
r4de4zf4lyniu4mx.onion:8444

View File

@@ -1,5 +0,0 @@
# List of fixed seed nodes for testnet
# Onion nodes
thfsmmn2jbitcoin.onion
it2pj4f7657g3rhi.onion

View File

@@ -6,8 +6,8 @@ SetCompressor /SOLID lzma
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@
!define COMPANY "Bitcoin Core project"
!define URL http://www.bitcoin.org/
!define COMPANY "@PACKAGE_NAME@ project"
!define URL @PACKAGE_URL@
# MUI Symbol Definitions
!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico"
@@ -20,7 +20,7 @@ SetCompressor /SOLID lzma
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "@PACKAGE_NAME@"
!define MUI_FINISHPAGE_RUN $INSTDIR\bitcoin-qt.exe
!define MUI_FINISHPAGE_RUN $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
@@ -48,7 +48,7 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
OutFile @abs_top_srcdir@/bitcoin-${VERSION}-win@WINDOWS_BITS@-setup.exe
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe
!if "@WINDOWS_BITS@" == "64"
InstallDir $PROGRAMFILES64\Bitcoin
!else
@@ -59,7 +59,7 @@ XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion ${VERSION}.@CLIENT_VERSION_BUILD@
VIAddVersionKey ProductName "Bitcoin Core"
VIAddVersionKey ProductName "@PACKAGE_NAME@"
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
VIAddVersionKey CompanyWebsite "${URL}"
@@ -73,20 +73,16 @@ ShowUninstDetails show
Section -Main SEC0000
SetOutPath $INSTDIR
SetOverwrite on
File @abs_top_srcdir@/release/bitcoin-qt.exe
File @abs_top_srcdir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
File /oname=COPYING.txt @abs_top_srcdir@/COPYING
File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
SetOutPath $INSTDIR\daemon
File @abs_top_srcdir@/release/bitcoind.exe
File @abs_top_srcdir@/release/bitcoin-cli.exe
File @abs_top_srcdir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
File @abs_top_srcdir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
SetOutPath $INSTDIR\doc
File /r @abs_top_srcdir@/doc\*.*
SetOutPath $INSTDIR
WriteRegStr HKCU "${REGKEY}\Components" Main 1
# Remove old wxwidgets-based-bitcoin executable and locales:
Delete /REBOOTOK $INSTDIR\bitcoin.exe
RMDir /r /REBOOTOK $INSTDIR\locale
SectionEnd
Section -post SEC0001
@@ -95,7 +91,8 @@ Section -post SEC0001
WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory $SMPROGRAMS\$StartMenuGroup
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\bitcoin-qt.exe
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -106,10 +103,10 @@ Section -post SEC0001
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
WriteRegStr HKCR "bitcoin" "URL Protocol" ""
WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin"
WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe
WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "%1"'
WriteRegStr HKCR "@PACKAGE_TARNAME@" "URL Protocol" ""
WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Bitcoin"
WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "%1"'
SectionEnd
# Macro for selecting uninstaller sections
@@ -127,7 +124,7 @@ done${UNSECTION_ID}:
# Uninstaller sections
Section /o -un.Main UNSEC0000
Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe
Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
Delete /REBOOTOK $INSTDIR\COPYING.txt
Delete /REBOOTOK $INSTDIR\readme.txt
RMDir /r /REBOOTOK $INSTDIR\daemon
@@ -139,6 +136,7 @@ Section -un.post UNSEC0001
DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk"
Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
Delete /REBOOTOK $INSTDIR\uninstall.exe
Delete /REBOOTOK $INSTDIR\debug.log
@@ -147,7 +145,7 @@ Section -un.post UNSEC0001
DeleteRegValue HKCU "${REGKEY}" Path
DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components"
DeleteRegKey /IfEmpty HKCU "${REGKEY}"
DeleteRegKey HKCR "bitcoin"
DeleteRegKey HKCR "@PACKAGE_TARNAME@"
RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
RmDir /REBOOTOK $INSTDIR
Push $R0

View File

@@ -1,15 +0,0 @@
bitcoin ICON "pixmaps/bitcoin.ico"
#include "wx/msw/wx.rc"
check ICON "pixmaps/check.ico"
send16 BITMAP "pixmaps/send16.bmp"
send16mask BITMAP "pixmaps/send16mask.bmp"
send16masknoshadow BITMAP "pixmaps/send16masknoshadow.bmp"
send20 BITMAP "pixmaps/send20.bmp"
send20mask BITMAP "pixmaps/send20mask.bmp"
addressbook16 BITMAP "pixmaps/addressbook16.bmp"
addressbook16mask BITMAP "pixmaps/addressbook16mask.bmp"
addressbook20 BITMAP "pixmaps/addressbook20.bmp"
addressbook20mask BITMAP "pixmaps/addressbook20mask.bmp"
favicon ICON "pixmaps/favicon.ico"