Skip to content

Commit 30b5a76

Browse files
authored
Merge pull request #25 from wu-emma/winbuild-update
Winbuild update and minor text fixes
2 parents 0a8e1e7 + 5f5d0f0 commit 30b5a76

File tree

7 files changed

+1242
-29
lines changed

7 files changed

+1242
-29
lines changed

build_msvc/test_BGL/script_tests.json.gen

+1,213
Large diffs are not rendered by default.

doc/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Drag BGL Core to your applications folder, and then run BGL Core.
2828

2929
### Need Help?
3030

31-
* See the documentation at the [BGL Wiki](https://en.BGL.it/wiki/Main_Page)
32-
for help and more information.
31+
* See the documentation at the [BGL Wiki](https://bitgesell.ca)
32+
for help and more information. The compatibility is largely maintained with BTC code base, so it's wiki and developer documentation stays relevant to BGL.
3333
* Ask for help on [#BGL](http://webchat.freenode.net?channels=BGL) on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net?channels=BGL).
3434
* Ask for help on the [BGLTalk](https://BGLtalk.org/) forums, in the [Technical Support board](https://BGLtalk.org/index.php?board=4.0).
3535

doc/README_windows.txt

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
BGL Core
2-
=============
3-
4-
Intro
5-
-----
6-
BGL is a free open source peer-to-peer electronic cash system that is
7-
completely decentralized, without the need for a central server or trusted
8-
parties. Users hold the crypto keys to their own money and transact directly
9-
with each other, with the help of a P2P network to check for double-spending.
10-
11-
12-
Setup
13-
-----
14-
Unpack the files into a directory and run BGL-qt.exe.
15-
16-
BGL Core is the original BGL client and it builds the backbone of the network.
17-
However, it downloads and stores the entire history of BGL transactions;
18-
depending on the speed of your computer and network connection, the synchronization
19-
process can take anywhere from a few hours to a day or more.
20-
21-
See the BGL wiki at:
22-
https://en.BGL.it/wiki/Main_Page
23-
for more help and information.
1+
BGL Core
2+
=============
3+
4+
Intro
5+
-----
6+
BGL is a free open source peer-to-peer electronic cash system that is
7+
completely decentralized, without the need for a central server or trusted
8+
parties. Users hold the crypto keys to their own money and transact directly
9+
with each other, with the help of a P2P network to check for double-spending.
10+
11+
12+
Setup
13+
-----
14+
Unpack the files into a directory and run BGL-qt.exe.
15+
16+
BGL Core is the original BGL client and it builds the backbone of the network.
17+
However, it downloads and stores the entire history of BGL transactions;
18+
depending on the speed of your computer and network connection, the synchronization
19+
process can take anywhere from a few hours to a day or more.
20+
21+
See the BGL website at:
22+
https://bitgesell.ca
23+
for more help and information.

doc/descriptors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Descriptors consist of several types of expressions. The top level expression is
7272
- Followed by the actual key, which is either:
7373
- Hex encoded public keys (either 66 characters starting with `02` or `03` for a compressed pubkey, or 130 characters starting with `04` for an uncompressed pubkey).
7474
- Inside `wpkh` and `wsh`, only compressed public keys are permitted.
75-
- [WIF](https://en.BGL.it/wiki/Wallet_import_format) encoded private keys may be specified instead of the corresponding public key, with the same meaning.
75+
- [WIF](https://en.bitcoin.it/wiki/Wallet_import_format) encoded private keys may be specified instead of the corresponding public key, with the same meaning.
7676
- `xpub` encoded extended public key or `xprv` encoded extended private key (as defined in [BIP 32](https://github.com/BGL/bips/blob/master/bip-0032.mediawiki)).
7777
- Followed by zero or more `/NUM` unhardened and `/NUM'` hardened BIP32 derivation steps.
7878
- Optionally followed by a single `/*` or `/*'` final step to denote all (direct) unhardened or hardened children.

share/pixmaps/nsis-wizard.bmp

-2 Bytes
Binary file not shown.

share/setup-BGL-win.nsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ Var StartMenuGroup
4646
!insertmacro MUI_LANGUAGE English
4747

4848
# Installer attributes
49-
OutFile ..\BGL-0.1.1-win64-setup-unsigned.exe
49+
OutFile ..\BGL-0.1.2.2-win64-setup.exe
5050
InstallDir $PROGRAMFILES64\BGL
5151
CRCCheck on
5252
XPStyle on
5353
BrandingText " "
5454
ShowInstDetails show
55-
VIProductVersion 0.1.1.0
55+
VIProductVersion 0.1.2.2
5656
VIAddVersionKey ProductName "BGL Core"
5757
VIAddVersionKey ProductVersion "0.1.1"
5858
VIAddVersionKey CompanyName "${COMPANY}"

src/qt/intro.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz
125125
ui->lblExplanation1->setText(ui->lblExplanation1->text()
126126
.arg(PACKAGE_NAME)
127127
.arg(m_blockchain_size)
128-
.arg(2009)
128+
.arg(2020)
129129
.arg(tr("BGL"))
130130
);
131131
ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(PACKAGE_NAME));

0 commit comments

Comments
 (0)