Skip to content

Commit

Permalink
Minor changes for 0.15 (#445)
Browse files Browse the repository at this point in the history
* Litecoin: Branding

* Litecoin: Update man files

* Litecoin: Update Qt translations
  • Loading branch information
thrasher- authored Feb 27, 2018
1 parent 845fc69 commit 0b47699
Show file tree
Hide file tree
Showing 21 changed files with 195 additions and 189 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ the pull request affects. Valid areas as:

- *Consensus* for changes to consensus critical code
- *Docs* for changes to the documentation
- *Qt* for changes to bitcoin-qt
- *Qt* for changes to litecoin-qt
- *Mining* for changes to the mining code
- *Net* or *P2P* for changes to the peer-to-peer network code
- *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs
- *Scripts and tools* for changes to the scripts and tools
- *Tests* for changes to the bitcoin unit tests or QA tests
- *Tests* for changes to the litecoin unit tests or QA tests
- *Trivial* should **only** be used for PRs that do not change generated
executable code. Notably, refactors (change of function arguments and code
reorganization) and changes in behavior should **not** be marked as trivial.
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Building Bitcoin
Building Litecoin
================

See doc/build-*.md for instructions on building the various
elements of the Bitcoin Core reference implementation of Bitcoin.
elements of the Litecoin Core reference implementation of Litecoin.
4 changes: 2 additions & 2 deletions build-aux/m4/bitcoin_qt.m4
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
AC_DEFUN([BITCOIN_QT_FAIL],[
if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then
if test x$bitcoin_enable_qt != xno; then
AC_MSG_WARN([$1; bitcoin-qt frontend will not be built])
AC_MSG_WARN([$1; litecoin-qt frontend will not be built])
fi
bitcoin_enable_qt=no
bitcoin_enable_qt_test=no
Expand Down Expand Up @@ -54,7 +54,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
dnl enable qt support
AC_ARG_WITH([gui],
[AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
[build bitcoin-qt GUI (default=auto, qt5 tried first)])],
[build litecoin-qt GUI (default=auto, qt5 tried first)])],
[
bitcoin_qt_want_version=$withval
if test x$bitcoin_qt_want_version = xyes; then
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"

AC_ARG_WITH([utils],
[AS_HELP_STRING([--with-utils],
[build bitcoin-cli bitcoin-tx (default=yes)])],
[build litecoin-cli litecoin-tx (default=yes)])],
[build_bitcoin_utils=$withval],
[build_bitcoin_utils=yes])

Expand All @@ -309,7 +309,7 @@ AC_ARG_WITH([libs],

AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon],
[build bitcoind daemon (default=yes)])],
[build litecoind daemon (default=yes)])],
[build_bitcoind=$withval],
[build_bitcoind=yes])

Expand Down
24 changes: 12 additions & 12 deletions contrib/devtools/gen-manpages.sh
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
#!/bin/sh
#!/bin/bash

TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)}
SRCDIR=${SRCDIR:-$TOPDIR/src}
MANDIR=${MANDIR:-$TOPDIR/doc/man}

BITCOIND=${BITCOIND:-$SRCDIR/litecoind}
BITCOINCLI=${BITCOINCLI:-$SRCDIR/litecoin-cli}
BITCOINTX=${BITCOINTX:-$SRCDIR/litecoin-tx}
BITCOINQT=${BITCOINQT:-$SRCDIR/qt/litecoin-qt}
LITECOIND=${LITECOIND:-$SRCDIR/litecoind}
LITECOINCLI=${LITECOINCLI:-$SRCDIR/litecoin-cli}
LITECOINTX=${LITECOINTX:-$SRCDIR/litecoin-tx}
LITECOINQT=${LITECOINQT:-$SRCDIR/qt/litecoin-qt}

[ ! -x $BITCOIND ] && echo "$LITECOIND not found or not executable." && exit 1
[ ! -x $LITECOIND ] && echo "$LITECOIND not found or not executable." && exit 1

# The autodetected version git tag can screw up manpage output a little bit
BTCVER=($($LITECOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))
LTCVER=($($LITECOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))

# Create a footer file with copyright content.
# This gets autodetected fine for bitcoind if --version-string is not set,
# but has different outcomes for bitcoin-qt and bitcoin-cli.
echo "[COPYRIGHT]" > footer.h2m
$BITCOIND --version | sed -n '1!p' >> footer.h2m
$LITECOIND --version | sed -n '1!p' >> footer.h2m

for cmd in $BITCOIND $BITCOINCLI $BITCOINTX $BITCOINQT; do
for cmd in $LITECOIND $LITECOINCLI $LITECOINTX $LITECOINQT; do
cmdname="${cmd##*/}"
help2man -N --version-string=${BTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
sed -i "s/\\\-${BTCVER[1]}//g" ${MANDIR}/${cmdname}.1
help2man -N --version-string=${LTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
sed -i "s/\\\-${LTCVER[1]}//g" ${MANDIR}/${cmdname}.1
done

rm -f footer.h2m
rm -f footer.h2m
2 changes: 1 addition & 1 deletion contrib/linearize/example-linearize.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# litecoind RPC settings (linearize-hashes)
rpcuser=someuser
rpcpassword=somepassword
#datadir=~/.bitcoin
#datadir=~/.litecoin
host=127.0.0.1
port=9332
#port=19332
Expand Down
4 changes: 2 additions & 2 deletions doc/developer-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ A few guidelines for introducing and reviewing new RPC interfaces:
- Try not to overload methods on argument type. E.g. don't make `getblock(true)` and `getblock("hash")`
do different things.

- *Rationale*: This is impossible to use with `bitcoin-cli`, and can be surprising to users.
- *Rationale*: This is impossible to use with `litecoin-cli`, and can be surprising to users.

- *Exception*: Some RPC calls can take both an `int` and `bool`, most notably when a bool was switched
to a multi-value, or due to other historical reasons. **Always** have false map to 0 and
Expand All @@ -602,7 +602,7 @@ A few guidelines for introducing and reviewing new RPC interfaces:

- Add every non-string RPC argument `(method, idx, name)` to the table `vRPCConvertParams` in `rpc/client.cpp`.

- *Rationale*: `bitcoin-cli` and the GUI debug console use this table to determine how to
- *Rationale*: `litecoin-cli` and the GUI debug console use this table to determine how to
convert a plaintext command line to JSON. If the types don't match, the method can be unusable
from there.

Expand Down
13 changes: 7 additions & 6 deletions doc/man/litecoin-cli.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH LITECOIN-CLI "1" "September 2017" "litecoin-cli v0.15.0.1" "User Commands"
.TH LITECOIN-CLI "1" "February 2018" "litecoin-cli v0.15.1.0" "User Commands"
.SH NAME
litecoin-cli \- manual page for litecoin-cli v0.15.0.1
litecoin-cli \- manual page for litecoin-cli v0.15.1.0
.SH DESCRIPTION
Litecoin Core RPC client version v0.15.0.1\-dirty
Litecoin Core RPC client version v0.15.1.0\-dirty
.SS "Usage:"
.TP
litecoin\-cli [options] <command> [params]
Expand Down Expand Up @@ -78,12 +78,13 @@ Send RPC for non\-default wallet on RPC server (argument is wallet
filename in litecoind directory, required if litecoind/\-Qt runs
with multiple wallets)
.SH COPYRIGHT
Copyright (C) 2009-2017 The Bitcoin Core developers
Copyright (C) 2011-2017 The Litecoin Core developers
Copyright (C) 2011-2018 The Litecoin Core developers
Copyright (C) 2009-2018 The Bitcoin Core developers

Please contribute if you find Litecoin Core useful. Visit
<https://litecoin.org> for further information about the software.
The source code is available from <https://github.com/litecoin-project/litecoin>.
The source code is available from
<https://github.com/litecoin-project/litecoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Expand Down
38 changes: 20 additions & 18 deletions doc/man/litecoin-qt.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH LITECOIN-QT "1" "September 2017" "litecoin-qt v0.15.0.1" "User Commands"
.TH LITECOIN-QT "1" "February 2018" "litecoin-qt v0.15.1.0" "User Commands"
.SH NAME
litecoin-qt \- manual page for litecoin-qt v0.15.0.1
litecoin-qt \- manual page for litecoin-qt v0.15.1.0
.SH DESCRIPTION
Litecoin Core version v0.15.0.1\-dirty (64\-bit)
Litecoin Core version v0.15.1.0\-dirty (64\-bit)
Usage:
.IP
litecoin\-qt [command\-line options]
Expand Down Expand Up @@ -32,9 +32,9 @@ block hash)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
29c8c00e1a5f446a6364a29633d3f1ee16428d87c8d3851a1c570be8170b04c2,
59c9b9d3fec105bdc716d84caa7579503d5b05b73618d0bf2d5fa639f780a011,
testnet:
ad8ff6c2f5580d2b50bd881e11312425ea84fa99f322bf132beb722f97971bba)
a0afbded94d4be233e191525dc2d467af5c7eab3143c852c3cd549831022aad6)
.HP
\fB\-conf=\fR<file>
.IP
Expand All @@ -58,7 +58,7 @@ Keep at most <n> unconnectable transactions in memory (default: 100)
.HP
\fB\-maxmempool=\fR<n>
.IP
Keep the transaction memory pool below <n> megabytes (default: 5)
Keep the transaction memory pool below <n> megabytes (default: 300)
.HP
\fB\-mempoolexpiry=\fR<n>
.IP
Expand All @@ -76,12 +76,12 @@ Extra transactions to keep in memory for compact block reconstructions
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
.IP
Specify pid file (default: litecoind.pid)
Specify pid file (default: litecoin.pid)
.HP
\fB\-prune=\fR<n>
.IP
Expand Down Expand Up @@ -184,7 +184,7 @@ Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
.IP
Maximum allowed median peer time offset adjustment. Local perspective of
time may be influenced by peers forward or backward by this
amount. (default: 4200 seconds)
amount. (default: 2100 seconds)
.HP
\fB\-onion=\fR<ip:port>
.IP
Expand All @@ -206,7 +206,7 @@ Support filtering of blocks and transaction with bloom filters (default:
.HP
\fB\-port=\fR<port>
.IP
Listen for connections on <port> (default: 8333 or testnet: 18333)
Listen for connections on <port> (default: 9333 or testnet: 19335)
.HP
\fB\-proxy=\fR<ip:port>
.IP
Expand Down Expand Up @@ -269,7 +269,7 @@ Set key pool size to <n> (default: 1000)
\fB\-fallbackfee=\fR<amt>
.IP
A fee rate (in LTC/kB) that will be used when fee estimation has
insufficient data (default: 0.002)
insufficient data (default: 0.02)
.HP
\fB\-discardfee=\fR<amt>
.IP
Expand Down Expand Up @@ -427,12 +427,12 @@ Maximum size of data in data carrier transactions we relay and mine
.HP
\fB\-mempoolreplacement\fR
.IP
Enable transaction replacement in the memory pool (default: 1)
Enable transaction replacement in the memory pool (default: 0)
.HP
\fB\-minrelaytxfee=\fR<amt>
.IP
Fees (in LTC/kB) smaller than this are considered zero fee for relaying,
mining and transaction creation (default: 0.001)
mining and transaction creation (default: 0.00001)
.HP
\fB\-whitelistrelay\fR
.IP
Expand All @@ -448,11 +448,12 @@ Block creation options:
.HP
\fB\-blockmaxweight=\fR<n>
.IP
Set maximum BIP141 block weight (default: 3000000)
Set maximum BIP141 block weight (default: 3996000)
.HP
\fB\-blockmaxsize=\fR<n>
.IP
Set maximum block size in bytes (default: 750000)
Set maximum BIP141 block weight to this * 4. Deprecated, use
blockmaxweight
.HP
\fB\-blockmintxfee=\fR<amt>
.IP
Expand Down Expand Up @@ -546,12 +547,13 @@ Show splash screen on startup (default: 1)
.IP
Reset all settings changed in the GUI
.SH COPYRIGHT
Copyright (C) 2009-2017 The Bitcoin Core developers
Copyright (C) 2011-2017 The Litecoin Core developers
Copyright (C) 2011-2018 The Litecoin Core developers
Copyright (C) 2009-2018 The Bitcoin Core developers

Please contribute if you find Litecoin Core useful. Visit
<https://litecoin.org> for further information about the software.
The source code is available from <https://github.com/litecoin-project/litecoin>.
The source code is available from
<https://github.com/litecoin-project/litecoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Expand Down
13 changes: 7 additions & 6 deletions doc/man/litecoin-tx.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH LITECOIN-TX "1" "September 2017" "litecoin-tx v0.15.0.1" "User Commands"
.TH LITECOIN-TX "1" "February 2018" "litecoin-tx v0.15.1.0" "User Commands"
.SH NAME
litecoin-tx \- manual page for litecoin-tx v0.15.0.1
litecoin-tx \- manual page for litecoin-tx v0.15.1.0
.SH DESCRIPTION
Litecoin Core litecoin\-tx utility version v0.15.0.1\-dirty
Litecoin Core litecoin\-tx utility version v0.15.1.0\-dirty
.SS "Usage:"
.TP
litecoin\-tx [options] <hex\-tx> [commands]
Expand Down Expand Up @@ -112,12 +112,13 @@ set=NAME:JSON\-STRING
.IP
Set register NAME to given JSON\-STRING
.SH COPYRIGHT
Copyright (C) 2009-2017 The Bitcoin Core developers
Copyright (C) 2011-2017 The Litecoin Core developers
Copyright (C) 2011-2018 The Litecoin Core developers
Copyright (C) 2009-2018 The Bitcoin Core developers

Please contribute if you find Litecoin Core useful. Visit
<https://litecoin.org> for further information about the software.
The source code is available from <https://github.com/litecoin-project/litecoin>.
The source code is available from
<https://github.com/litecoin-project/litecoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Expand Down
Loading

0 comments on commit 0b47699

Please sign in to comment.