Skip to content

Commit

Permalink
Remove Qt wallet references (#783)
Browse files Browse the repository at this point in the history
Remove remaining references in docs and other files to the Qt
wallet. This includes removing the icons used by the wallet and
the script to optimize the icons.

Also remove the macdeploy references and related files as we
don't build the DMG anymore but use the same kind of tarball as
we use on Linux.

There still are some references in the translation handling but
these are unadapted documents anyway right now and the references
will go away once the translation process is adapted to unit-e.

Removes adding qt directory to PATH in the test_framework.

Signed-off-by: Mateusz Morusiewicz <mateusz@thirdhash.com>
Signed-off-by: Cornelius Schumacher <cornelius@thirdhash.com>
  • Loading branch information
cornelius authored Mar 14, 2019
1 parent 53d55ef commit 5549140
Show file tree
Hide file tree
Showing 66 changed files with 134 additions and 4,666 deletions.
24 changes: 1 addition & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ src/unite-cli
src/unite-tx
src/test/test_unite
src/test/test_unite_fuzzy
src/qt/test/test_unite-qt

# autoreconf
Makefile.in
Expand All @@ -34,22 +33,9 @@ src/config/unite-config.h
src/config/unite-config.h.in
src/config/stamp-h1
share/setup.nsi
share/qt/Info.plist

src/univalue/gen

src/qt/*.moc
src/qt/moc_*.cpp
src/qt/forms/ui_*.h

src/qt/test/moc*.cpp

src/qt/unite-qt.config
src/qt/unite-qt.creator
src/qt/unite-qt.creator.user
src/qt/unite-qt.files
src/qt/unite-qt.includes

.deps
.dirstamp
.libs
Expand Down Expand Up @@ -77,19 +63,11 @@ src/qt/unite-qt.includes
*.lo
*.la

# Compilation and Qt preprocessor part
*.qm
# Compilation
Makefile
unite-qt
UnitE-Qt.app
background.tiff*

# Unit-tests
Makefile.test
unite-qt_test

# Resources cpp
qrc_*.cpp

# Mac specific
.DS_Store
Expand Down
26 changes: 11 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,20 @@ jobs:
env: >-
HOST=arm-linux-gnueabihf
PACKAGES="g++-arm-linux-gnueabihf python3-pip"
DEP_OPTS="NO_QT=1 NO_USB=1"
DEP_OPTS="NO_USB=1"
CHECK_DOC=1
GOAL="install"
UNITE_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --with-gui=no"
UNITE_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
- stage: test
name: "Win32 (unit tests)"
env: >-
HOST=i686-w64-mingw32
DPKG_ADD_ARCH="i386"
DEP_OPTS="NO_QT=1"
PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6"
RUN_TESTS=true
GOAL="install"
UNITE_CONFIG="--enable-reduce-exports --with-gui=no --enable-usbdevice"
UNITE_CONFIG="--enable-reduce-exports --enable-usbdevice"
- stage: test
name: "System libs (unit and functional tests)"
Expand All @@ -92,18 +91,17 @@ jobs:
NEED_XVFB=1
RUN_TESTS=true
GOAL="install"
UNITE_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER --with-gui=no --enable-usbdevice"
UNITE_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER --enable-usbdevice"
- stage: test
name: "32-bit + dash (unit and functional tests)"
env: >-
HOST=i686-pc-linux-gnu
DPKG_ADD_ARCH="i386"
PACKAGES="g++-multilib python3-zmq libudev-dev:i386"
DEP_OPTS="NO_QT=1"
RUN_TESTS=true
GOAL="install"
UNITE_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++ --with-gui=no --enable-usbdevice"
UNITE_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++ --enable-usbdevice"
USE_SHELL="/bin/dash"
- stage: test
Expand All @@ -112,38 +110,36 @@ jobs:
env: >-
HOST=x86_64-w64-mingw32
DPKG_ADD_ARCH="i386"
DEP_OPTS="NO_QT=1"
PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6"
RUN_TESTS=true
GOAL="install"
UNITE_CONFIG="--enable-reduce-exports --with-gui=no --enable-usbdevice"
UNITE_CONFIG="--enable-reduce-exports --enable-usbdevice"
- stage: test
name: "x86_64 Linux (unit and functional tests)"
env: >-
HOST=x86_64-unknown-linux-gnu
PACKAGES="python3-zmq protobuf-compiler libdbus-1-dev libharfbuzz-dev libudev-dev"
DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1"
DEP_OPTS="NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1"
RUN_TESTS=true
GOAL="install"
UNITE_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER --with-gui=no --enable-usbdevice"
UNITE_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER --enable-usbdevice"
- stage: test
name: "x86_64 Linux, No wallet (unit tests)"
env: >-
HOST=x86_64-unknown-linux-gnu
PACKAGES="python3"
DEP_OPTS="NO_WALLET=1 NO_QT=1 NO_USB=1"
DEP_OPTS="NO_WALLET=1 NO_USB=1"
RUN_TESTS=true
GOAL="install"
UNITE_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --with-gui=no"
UNITE_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
- stage: test
name: "Cross-Mac"
env: >-
HOST=x86_64-apple-darwin11
PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev"
DEP_OPTS="NO_QT=1"
UNITE_CONFIG="--enable-reduce-exports --enable-werror --with-gui=no --enable-usbdevice"
UNITE_CONFIG="--enable-reduce-exports --enable-werror --enable-usbdevice"
OSX_SDK=10.11
GOAL="install"
7 changes: 0 additions & 7 deletions .tx/config

This file was deleted.

6 changes: 0 additions & 6 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/unite.ico \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
$(top_srcdir)/doc/README_windows.txt

OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
$(OSX_DSSTORE_GEN) \
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

COVERAGE_INFO = baseline.info \
test_unite_filtered.info total_coverage.info \
baseline_filtered.info functional_test.info functional_test_filtered.info \
Expand Down
3 changes: 1 addition & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ case $host in
dnl in expected paths because they may conflict with system files. Ask
dnl Homebrew where each one is located, then adjust paths accordingly.
dnl It's safe to add these paths even if the functionality is disabled by
dnl the user (--without-wallet or --without-gui for example).
dnl the user (--without-wallet for example).

openssl_prefix=`$BREW --prefix openssl 2>/dev/null`
bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null`
Expand Down Expand Up @@ -1211,7 +1211,6 @@ AC_SUBST(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS")
AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")
AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
AC_SUBST(UNITE_DAEMON_NAME)
AC_SUBST(UNITE_GUI_NAME)
AC_SUBST(UNITE_CLI_NAME)
AC_SUBST(UNITE_TX_NAME)

Expand Down
5 changes: 1 addition & 4 deletions contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain.

### [Qos](/contrib/qos) ###

A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Unit-e network. This means one can have an always-on united instance running, and another local united/unite-qt instance which connects to this node and receives blocks from it.
A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Unit-e network. This means one can have an always-on united instance running, and another local united instance which connects to this node and receives blocks from it.

### [Seeds](/contrib/seeds) ###
Utility to generate the pnSeed[] array that is compiled into the client.
Expand All @@ -28,9 +28,6 @@ see the [Gitian building instructions](/doc/gitian-building.md).
### [Gitian-keys](/contrib/gitian-keys)
PGP keys used for signing unit-e [Gitian release](/doc/release-process.md) results.

### [MacDeploy](/contrib/macdeploy) ###
Scripts and notes for Mac builds.

### [Gitian-build](/contrib/gitian-build.py) ###
Script for running full Gitian builds.

Expand Down
4 changes: 2 additions & 2 deletions contrib/cmake/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ the autotools, but CMake. This directory contains scripts to assist with creatin
suitable for these IDEs.

Currently, the script has been tested on macOS 10.13 using cmake 3.11 in CLion 2018.2 and on Ubuntu
18.04 in CLion 2018.2 and 2018.3 with bundled CMake. On macOS, it assumes that dependencies like
Qt have been installed using homebrew.
18.04 in CLion 2018.2 and 2018.3 with bundled CMake. On macOS, it assumes that dependencies
have been installed using homebrew.

usage
-----
Expand Down
3 changes: 0 additions & 3 deletions contrib/devtools/copyright_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

EXCLUDE = [
# auto generated:
'src/qt/unitestrings.cpp',
'src/chainparamsseeds.h',
# other external copyrights:
'src/tinyformat.h',
Expand All @@ -37,8 +36,6 @@
"src/secp256k1/",
"src/univalue/",
"src/leveldb/",
# translation files for Qt client
"src/qt/locale/"
]

def applies_to_file(filename):
Expand Down
5 changes: 2 additions & 3 deletions contrib/devtools/gen-manpages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ MANDIR=${MANDIR:-$TOPDIR/doc/man}
UNITED=${UNITED:-$SRCDIR/united}
UNITECLI=${UNITECLI:-$SRCDIR/unite-cli}
UNITETX=${UNITETX:-$SRCDIR/unite-tx}
UNITEQT=${UNITEQT:-$SRCDIR/qt/unite-qt}

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

Expand All @@ -16,11 +15,11 @@ BTCVER=($($UNITECLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }'))

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

for cmd in $UNITED $UNITECLI $UNITETX $UNITEQT; do
for cmd in $UNITED $UNITECLI $UNITETX; 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
Expand Down
78 changes: 0 additions & 78 deletions contrib/devtools/optimize-pngs.py

This file was deleted.

9 changes: 1 addition & 8 deletions contrib/devtools/symbol-check.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')
# Allowed NEEDED libraries
ALLOWED_LIBRARIES = {
# united and unite-qt
# united
b'libgcc_s.so.1', # GCC base support
b'libc.so.6', # C library
b'libpthread.so.0', # threading
Expand All @@ -62,13 +62,6 @@
b'librt.so.1', # real-time (clock)
b'ld-linux-x86-64.so.2', # 64-bit dynamic linker
b'ld-linux.so.2', # 32-bit dynamic linker
# unite-qt only
b'libX11-xcb.so.1', # part of X11
b'libX11.so.6', # part of X11
b'libxcb.so.1', # part of X11
b'libfontconfig.so.1', # font support
b'libfreetype.so.6', # font parsing
b'libdl.so.2' # programming interface to dynamic linker
}

class CPPFilt(object):
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion contrib/linearize/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ standalone hash lists but safe to use with linearize-data.py, which will output
the same data no matter which byte format is chosen.

The `linearize-hashes` script requires a connection, local or remote, to a
JSON-RPC server. Running `united` or `unite-qt -server` will be sufficient.
JSON-RPC server. Running `united` will be sufficient.

## Step 2: Copy local block data

Expand Down
Loading

0 comments on commit 5549140

Please sign in to comment.