Skip to content

Commit

Permalink
Merge pull request #72 from cakedefi/fix/remove_qt
Browse files Browse the repository at this point in the history
Remove QT related code from the codebase
  • Loading branch information
monstrobishi authored Aug 20, 2020
2 parents 0b43f58 + 16beb16 commit 231d70c
Show file tree
Hide file tree
Showing 360 changed files with 7 additions and 217,736 deletions.
16 changes: 0 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ src/defi-tx
src/defi-wallet
src/test/test_defi
src/test/test_defi_fuzzy
src/qt/test/test_defi-qt

# autoreconf
Makefile.in
Expand Down Expand Up @@ -45,18 +44,6 @@ 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/defi-qt.config
src/qt/defi-qt.creator
src/qt/defi-qt.creator.user
src/qt/defi-qt.files
src/qt/defi-qt.includes

.deps
.dirstamp
.libs
Expand Down Expand Up @@ -92,16 +79,13 @@ src/qt/defi-qt.includes
*.qm
Makefile
!depends/Makefile
defi-qt
Defi-Qt.app
background.tiff*

# Qt Creator
Makefile.am.user

# Unit-tests
Makefile.test
defi-qt_test

# Resources cpp
qrc_*.cpp
Expand Down
16 changes: 1 addition & 15 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ pkgconfig_DATA = libdeficonsensus.pc
endif

DEFID_BIN=$(top_builddir)/src/$(DEFI_DAEMON_NAME)$(EXEEXT)
DEFI_QT_BIN=$(top_builddir)/src/qt/$(DEFI_GUI_NAME)$(EXEEXT)
DEFI_CLI_BIN=$(top_builddir)/src/$(DEFI_CLI_NAME)$(EXEEXT)
DEFI_TX_BIN=$(top_builddir)/src/$(DEFI_TX_NAME)$(EXEEXT)
DEFI_WALLET_BIN=$(top_builddir)/src/$(DEFI_WALLET_TOOL_NAME)$(EXEEXT)
Expand Down Expand Up @@ -55,7 +54,6 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/defi.icns
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

Expand All @@ -78,7 +76,7 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/defi.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) \
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) \
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
$(OSX_DSSTORE_GEN) \
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
Expand All @@ -95,7 +93,6 @@ dist-hook:
$(DEFI_WIN_INSTALLER): all-recursive
$(MKDIR_P) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFID_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_QT_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_CLI_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_TX_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_WALLET_BIN) $(top_builddir)/release
Expand All @@ -115,14 +112,6 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/Resources/defi.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/Defi-Qt: all-recursive
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(DEFI_QT_BIN) $@

$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
$(MKDIR_P) $(@D)
echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@
Expand Down Expand Up @@ -183,9 +172,6 @@ if TARGET_WINDOWS
deploy: $(DEFI_WIN_INSTALLER)
endif

$(DEFI_QT_BIN): FORCE
$(MAKE) -C src qt/$(@F)

$(DEFID_BIN): FORCE
$(MAKE) -C src $(@F)

Expand Down
Loading

0 comments on commit 231d70c

Please sign in to comment.