Skip to content

Commit

Permalink
Merge pull request #25 from wu-emma/winbuild-update
Browse files Browse the repository at this point in the history
Winbuild update and minor text fixes
  • Loading branch information
van-orton authored Nov 26, 2020
2 parents 0a8e1e7 + 5f5d0f0 commit 30b5a76
Show file tree
Hide file tree
Showing 7 changed files with 1,242 additions and 29 deletions.
1,213 changes: 1,213 additions & 0 deletions build_msvc/test_BGL/script_tests.json.gen

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Drag BGL Core to your applications folder, and then run BGL Core.

### Need Help?

* See the documentation at the [BGL Wiki](https://en.BGL.it/wiki/Main_Page)
for help and more information.
* See the documentation at the [BGL Wiki](https://bitgesell.ca)
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.
* 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).
* Ask for help on the [BGLTalk](https://BGLtalk.org/) forums, in the [Technical Support board](https://BGLtalk.org/index.php?board=4.0).

Expand Down
46 changes: 23 additions & 23 deletions doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
BGL Core
=============
Intro
-----
BGL is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
Setup
-----
Unpack the files into a directory and run BGL-qt.exe.
BGL Core is the original BGL client and it builds the backbone of the network.
However, it downloads and stores the entire history of BGL transactions;
depending on the speed of your computer and network connection, the synchronization
process can take anywhere from a few hours to a day or more.
See the BGL wiki at:
https://en.BGL.it/wiki/Main_Page
for more help and information.
BGL Core
=============

Intro
-----
BGL is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.


Setup
-----
Unpack the files into a directory and run BGL-qt.exe.

BGL Core is the original BGL client and it builds the backbone of the network.
However, it downloads and stores the entire history of BGL transactions;
depending on the speed of your computer and network connection, the synchronization
process can take anywhere from a few hours to a day or more.

See the BGL website at:
https://bitgesell.ca
for more help and information.
2 changes: 1 addition & 1 deletion doc/descriptors.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Descriptors consist of several types of expressions. The top level expression is
- Followed by the actual key, which is either:
- 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).
- Inside `wpkh` and `wsh`, only compressed public keys are permitted.
- [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.
- [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.
- `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)).
- Followed by zero or more `/NUM` unhardened and `/NUM'` hardened BIP32 derivation steps.
- Optionally followed by a single `/*` or `/*'` final step to denote all (direct) unhardened or hardened children.
Expand Down
Binary file modified share/pixmaps/nsis-wizard.bmp
Binary file not shown.
4 changes: 2 additions & 2 deletions share/setup-BGL-win.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English

# Installer attributes
OutFile ..\BGL-0.1.1-win64-setup-unsigned.exe
OutFile ..\BGL-0.1.2.2-win64-setup.exe
InstallDir $PROGRAMFILES64\BGL
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion 0.1.1.0
VIProductVersion 0.1.2.2
VIAddVersionKey ProductName "BGL Core"
VIAddVersionKey ProductVersion "0.1.1"
VIAddVersionKey CompanyName "${COMPANY}"
Expand Down
2 changes: 1 addition & 1 deletion src/qt/intro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz
ui->lblExplanation1->setText(ui->lblExplanation1->text()
.arg(PACKAGE_NAME)
.arg(m_blockchain_size)
.arg(2009)
.arg(2020)
.arg(tr("BGL"))
);
ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(PACKAGE_NAME));
Expand Down

0 comments on commit 30b5a76

Please sign in to comment.