Skip to content

Commit e1cd00c

Browse files
stevenroosestevenroose
committed
Change branding from bitcoin to elements
1 parent ade539c commit e1cd00c

39 files changed

+220
-215
lines changed

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
*.tar.gz
22

33
*.exe
4-
src/bitcoin
5-
src/bitcoind
6-
src/bitcoin-cli
7-
src/bitcoin-tx
4+
src/elements
5+
src/elementsd
6+
src/elements-cli
7+
src/elements-tx
88
src/test/test_bitcoin
99
src/test/test_bitcoin_fuzzy
1010
src/qt/test/test_bitcoin-qt

‎.travis/lint_06_script.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test/lint/check-doc.py
1818
test/lint/check-rpc-mappings.py .
1919
test/lint/lint-all.sh
2020

21-
if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
21+
if [ "$TRAVIS_REPO_SLUG" = "ElementsProject/elements" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
2222
while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
2323
travis_wait 50 contrib/verify-commits/verify-commits.py;
2424
fi

‎.travis/test_05_before_script.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
DOCKER_EXEC echo \> \$HOME/.bitcoin # Make sure default datadir does not exist and is never read by creating a dummy file
9+
DOCKER_EXEC echo \> \$HOME/.elements # Make sure default datadir does not exist and is never read by creating a dummy file
1010

1111
mkdir -p depends/SDKs depends/sdk-sources
1212

‎.travis/test_06_script.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BEGIN_FOLD distdir
3434
DOCKER_EXEC make distdir VERSION=$HOST
3535
END_FOLD
3636

37-
cd "bitcoin-$HOST" || (echo "could not enter distdir bitcoin-$HOST"; exit 1)
37+
cd "elements-$HOST" || (echo "could not enter distdir elemenst-$HOST"; exit 1)
3838

3939
BEGIN_FOLD configure
4040
DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)

‎configure.ac‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2018)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])
10-
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
11-
AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
10+
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Elements Project]])
11+
AC_INIT([Elements Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/ElementsProject/elements/issues],[elements],[https://elementsproject.org/])
1212
AC_CONFIG_SRCDIR([src/validation.cpp])
1313
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
1414
AC_CONFIG_AUX_DIR([build-aux])
1515
AC_CONFIG_MACRO_DIR([build-aux/m4])
1616

17-
BITCOIN_DAEMON_NAME=bitcoind
17+
BITCOIN_DAEMON_NAME=elementsd
1818
BITCOIN_GUI_NAME=bitcoin-qt
19-
BITCOIN_CLI_NAME=bitcoin-cli
20-
BITCOIN_TX_NAME=bitcoin-tx
19+
BITCOIN_CLI_NAME=elements-cli
20+
BITCOIN_TX_NAME=elements-tx
2121

2222
dnl Unless the user specified ARFLAGS, force it to be cr
2323
AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])

‎contrib/bitcoin-cli.bash-completion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ _bitcoin_cli() {
143143
;;
144144
esac
145145
} &&
146-
complete -F _bitcoin_cli bitcoin-cli
146+
complete -F _bitcoin_cli elements-cli
147147

148148
# Local variables:
149149
# mode: shell-script

‎contrib/bitcoin-tx.bash-completion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ _bitcoin_tx() {
4646

4747
return 0
4848
} &&
49-
complete -F _bitcoin_tx bitcoin-tx
49+
complete -F _bitcoin_tx elements-tx
5050

5151
# Local variables:
5252
# mode: shell-script

‎contrib/bitcoind.bash-completion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ _bitcoind() {
4545
;;
4646
esac
4747
} &&
48-
complete -F _bitcoind bitcoind bitcoin-qt
48+
complete -F _bitcoind elementsd bitcoin-qt
4949

5050
# Local variables:
5151
# mode: shell-script

‎contrib/devtools/gen-manpages.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ BUILDDIR=${BUILDDIR:-$TOPDIR}
77
BINDIR=${BINDIR:-$BUILDDIR/src}
88
MANDIR=${MANDIR:-$TOPDIR/doc/man}
99

10-
BITCOIND=${BITCOIND:-$BINDIR/bitcoind}
11-
BITCOINCLI=${BITCOINCLI:-$BINDIR/bitcoin-cli}
12-
BITCOINTX=${BITCOINTX:-$BINDIR/bitcoin-tx}
10+
BITCOIND=${BITCOIND:-$BINDIR/elementsd}
11+
BITCOINCLI=${BITCOINCLI:-$BINDIR/elements-cli}
12+
BITCOINTX=${BITCOINTX:-$BINDIR/elements-tx}
1313
BITCOINQT=${BITCOINQT:-$BINDIR/qt/bitcoin-qt}
1414

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

‎contrib/gitian-descriptors/gitian-linux.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-linux-0.18"
2+
name: "elements-linux-0.18"
33
enable_cache: true
44
suites:
55
- "bionic"
@@ -32,8 +32,8 @@ packages:
3232
- "ca-certificates"
3333
- "python"
3434
remotes:
35-
- "url": "https://github.com/bitcoin/bitcoin.git"
36-
"dir": "bitcoin"
35+
- "url": "https://github.com/ElementsProject/elements.git"
36+
"dir": "elements"
3737
files: []
3838
script: |
3939
@@ -121,7 +121,7 @@ script: |
121121
chmod +x ${WRAP_DIR}/${prog}
122122
done
123123
124-
cd bitcoin
124+
cd elements
125125
BASEPREFIX=`pwd`/depends
126126
# Build dependencies for each host
127127
for i in $HOSTS; do
@@ -143,13 +143,13 @@ script: |
143143
./autogen.sh
144144
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
145145
make dist
146-
SOURCEDIST=`echo bitcoin-*.tar.gz`
146+
SOURCEDIST=`echo elements-*.tar.gz`
147147
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
148148
# Correct tar file order
149149
mkdir -p temp
150150
pushd temp
151151
tar xf ../$SOURCEDIST
152-
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
152+
find elements-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
153153
popd
154154
155155
# Workaround for tarball not building with the bare tag version (prep)

0 commit comments

Comments
 (0)