Skip to content

Commit

Permalink
Migrate project naming from "Beta" to "Elements"
Browse files Browse the repository at this point in the history
Note: this also changes the CHAINPARAMS_ELEMENTS constant!  The new
network name is simply `elements`, and similarly regtest is now
`elementsregtest`
  • Loading branch information
martindale authored and instagibbs committed Jun 16, 2017
1 parent d4d6abb commit bdfe5e2
Show file tree
Hide file tree
Showing 50 changed files with 238 additions and 239 deletions.
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
*.tar.gz

*.exe
src/beta
src/betad
src/beta-cli
src/beta-tx
src/test/test_beta
src/test/test_beta_fuzzy
src/qt/test/test_beta-qt
src/elements
src/elementsd
src/elements-cli
src/elements-tx
src/test/test_elements
src/qt/test/test_elements-qt
src/test/test_elements_fuzzy

# autoreconf
Makefile.in
Expand Down Expand Up @@ -74,12 +74,12 @@ src/qt/test/moc*.cpp
# Compilation and Qt preprocessor part
*.qm
Makefile
beta-qt
Beta-Qt.app
elements-qt
Elements-Qt.app

# Unit-tests
Makefile.test
beta-qt_test
elements-qt_test
src/test/buildenv.py

# Resources cpp
Expand Down
8 changes: 4 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/Beta-Qt: $(BITCOIN_QT_BIN)
$(OSX_APP)/Contents/MacOS/Elements-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

Expand All @@ -105,7 +105,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:

OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/Beta-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/MacOS/Elements-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

osx_volname:
echo $(OSX_VOLNAME) >$@
Expand All @@ -130,7 +130,7 @@ $(APP_DIST_DIR)/Applications:
@rm -f $@
@cd $(@D); $(LN_S) /Applications $(@F)

$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Beta-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Elements-Qt

$(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
Expand All @@ -145,7 +145,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
$(PYTHON) $< "$@" "$(OSX_VOLNAME)"

$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Beta-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Elements-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2

deploydir: $(APP_DIST_EXTRAS)
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2017)
AC_INIT([Elements Beta],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION._CLIENT_VERSION_BUILD],[https://github.com/ElementsProject/elements/issues],[beta])
AC_INIT([Elements Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION._CLIENT_VERSION_BUILD],[https://github.com/ElementsProject/elements/issues],[elements])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/watch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Run the "uscan" command to check for upstream updates and more.
version=3
# use qa.debian.org redirector; see man uscan
opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
opts=uversionmangle=s/(\d)(alpha|beta|core|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
http://githubredir.debian.net/github/bitcoin/bitcoin v(.*).tar.gz
8 changes: 4 additions & 4 deletions contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ packages:
- "python"
remotes:
- "url": "https://github.com/ElementsProject/elements.git"
"dir": "beta"
"dir": "elements"
files: []
script: |
Expand Down Expand Up @@ -83,7 +83,7 @@ script: |
create_global_faketime_wrappers "2000-01-01 12:00:00"
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
cd beta
cd elements
EXTRA_INCLUDES_BASE=$WRAP_DIR/extra_includes
mkdir -p $EXTRA_INCLUDES_BASE
Expand Down Expand Up @@ -135,13 +135,13 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo beta-*.tar.gz`
SOURCEDIST=`echo elements-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find beta-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find elements-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
Expand Down
10 changes: 5 additions & 5 deletions contrib/gitian-descriptors/gitian-osx-signer.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "beta-dmg-signer"
name: "elements-dmg-signer"
suites:
- "trusty"
architectures:
Expand All @@ -11,7 +11,7 @@ remotes:
- "url": "https://github.com/ElementsProject/gitian.sigs.ep.git"
"dir": "signature"
files:
- "beta-osx-unsigned.tar.gz"
- "elements-osx-unsigned.tar.gz"
script: |
WRAP_DIR=$HOME/wrapped
mkdir -p ${WRAP_DIR}
Expand All @@ -28,11 +28,11 @@ script: |
chmod +x ${WRAP_DIR}/${prog}
done
UNSIGNED=beta-osx-unsigned.tar.gz
SIGNED=beta-osx-signed.dmg
UNSIGNED=elements-osx-unsigned.tar.gz
SIGNED=elements-osx-signed.dmg
tar -xf ${UNSIGNED}
OSX_VOLNAME="$(cat osx_volname)"
./detached-sig-apply.sh ${UNSIGNED} signature/osx
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Beta-Sidechain" -no-pad -r -apple -o uncompressed.dmg signed-app
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Elements-Sidechain" -no-pad -r -apple -o uncompressed.dmg signed-app
${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}
8 changes: 4 additions & 4 deletions contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ packages:
- "fonts-tuffy"
remotes:
- "url": "https://github.com/ElementsProject/elements.git"
"dir": "beta"
"dir": "elements"
files:
- "MacOSX10.11.sdk.tar.gz"
script: |
Expand Down Expand Up @@ -83,7 +83,7 @@ script: |
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
cd beta
cd elements
BASEPREFIX=`pwd`/depends
mkdir -p ${BASEPREFIX}/SDKs
Expand All @@ -104,14 +104,14 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo beta-*.tar.gz`
SOURCEDIST=`echo elements-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find beta-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find elements-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
Expand Down
6 changes: 3 additions & 3 deletions contrib/gitian-descriptors/gitian-win-signer.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "beta-win-signer"
name: "elements-win-signer"
suites:
- "trusty"
architectures:
Expand All @@ -14,7 +14,7 @@ remotes:
files:
- "osslsigncode-1.7.1.tar.gz"
- "osslsigncode-Backports-to-1.7.1.patch"
- "beta-win-unsigned.tar.gz"
- "elements-win-unsigned.tar.gz"
script: |
BUILD_DIR=`pwd`
SIGDIR=${BUILD_DIR}/signature/win
Expand All @@ -24,7 +24,7 @@ script: |
echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c
mkdir -p ${UNSIGNED_DIR}
tar -C ${UNSIGNED_DIR} -xf beta-win-unsigned.tar.gz
tar -C ${UNSIGNED_DIR} -xf elements-win-unsigned.tar.gz
tar xf osslsigncode-1.7.1.tar.gz
cd osslsigncode-1.7.1
Expand Down
10 changes: 5 additions & 5 deletions contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ packages:
- "python"
remotes:
- "url": "https://github.com/ElementsProject/elements.git"
"dir": "beta"
"dir": "elements"
files: []
script: |
WRAP_DIR=$HOME/wrapped
Expand Down Expand Up @@ -101,7 +101,7 @@ script: |
create_per-host_linker_wrapper "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
cd beta
cd elements
BASEPREFIX=`pwd`/depends
# Build dependencies for each host
for i in $HOSTS; do
Expand All @@ -119,14 +119,14 @@ script: |
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo beta-*.tar.gz`
SOURCEDIST=`echo elements-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find beta-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find elements-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
mkdir -p $OUTDIR/src
cp ../$SOURCEDIST $OUTDIR/src
popd
Expand All @@ -146,7 +146,7 @@ script: |
make ${MAKEOPTS} -C src check-security
make deploy
make install DESTDIR=${INSTALLPATH}
cp -f beta-*setup*.exe $OUTDIR/
cp -f elements-*setup*.exe $OUTDIR/
cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete
Expand Down
3 changes: 1 addition & 2 deletions contrib/macdeploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ This script should not be run manually, instead, after building as usual:
During the process, the disk image window will pop up briefly where the fancy
settings are applied. This is normal, please do not interfere.

When finished, it will produce `Beta-Sidechain.dmg`.

When finished, it will produce `Elements-Sidechain.dmg`.
2 changes: 1 addition & 1 deletion contrib/macdeploy/detached-sig-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
set -e

ROOTDIR=dist
BUNDLE="${ROOTDIR}/Beta-Qt.app"
BUNDLE="${ROOTDIR}/Elements-Qt.app"
CODESIGN=codesign
TEMPDIR=sign.temp
TEMPLIST=${TEMPDIR}/signatures.txt
Expand Down
2 changes: 1 addition & 1 deletion contrib/macdeploy/fancy.plist
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<integer>370</integer>
<integer>156</integer>
</array>
<key>Beta-Qt.app</key>
<key>Elements-Qt.app</key>
<array>
<integer>128</integer>
<integer>156</integer>
Expand Down
4 changes: 2 additions & 2 deletions contrib/macdeploy/macdeployqtplus
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class FrameworkInfo(object):
class ApplicationBundleInfo(object):
def __init__(self, path):
self.path = path
appName = "Beta-Qt"
appName = "Elements-Qt"
self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
if not os.path.exists(self.binaryPath):
raise RuntimeError("Could not find bundle binary for " + path)
Expand Down Expand Up @@ -604,7 +604,7 @@ else:

# ------------------------------------------------

target = os.path.join("dist", "Beta-Qt.app")
target = os.path.join("dist", "Elements-Qt.app")

if verbose >= 2:
print("+ Copying source bundle +")
Expand Down
8 changes: 4 additions & 4 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ The following are some helpful notes on how to run Bitcoin on your native platfo

Unpack the files into a directory and run:

- `bin/beta-qt` (GUI) or
- `bin/betad` (headless)
- `bin/elements-qt` (GUI) or
- `bin/elementsd` (headless)

### Windows

Unpack the files into a directory, and then run beta-qt.exe.
Unpack the files into a directory, and then run elements-qt.exe.

### OS X

Drag Beta-Sidechain to your applications folder, and then run Beta-Sidechain.
Drag Elements to your applications folder, and then run Elements.

### Need Help?

Expand Down
2 changes: 1 addition & 1 deletion doc/README_windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ with each other, with the help of a P2P network to check for double-spending.

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

Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
However, it downloads and stores the entire history of Bitcoin transactions;
Expand Down
16 changes: 8 additions & 8 deletions doc/build-osx.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ In case you want to build the disk image with `make deploy` (.dmg / optional), y

NOTE: Building with Qt4 is still supported, however, could result in a broken UI. Building with Qt5 is recommended.

Build `Beta`
Build `Element`
------------------------

1. Clone the beta source code and cd into `beta`
1. Clone the elements source code and cd into `elements`

git clone https://github.com/ElementsProject/elements.git
cd elements
Expand All @@ -53,26 +53,26 @@ Build `Beta`
Running
-------

Beta is now available at `./src/beta`
Element is now available at `./src/elements`

Before running, it's recommended you create an RPC configuration file.

echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"

chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"

The first time you run betad, it will start downloading the blockchain. This process could take several hours.
The first time you run elementsd, it will start downloading the blockchain. This process could take several hours.

You can monitor the download process by looking at the debug.log file:

tail -f $HOME/Library/Application\ Support/beta/debug.log
tail -f $HOME/Library/Application\ Support/elements/debug.log

Other commands:
-------

./src/betad -daemon # Starts the bitcoin daemon.
./src/beta-cli --help # Outputs a list of command-line options.
./src/beta-cli help # Outputs a list of RPC commands when the daemon is running.
./src/elementsd -daemon # Starts the bitcoin daemon.
./src/elements-cli --help # Outputs a list of command-line options.
./src/elements-cli help # Outputs a list of RPC commands when the daemon is running.

Using Qt Creator as IDE
------------------------
Expand Down
Loading

0 comments on commit bdfe5e2

Please sign in to comment.