diff --git a/.github/workflows/gui-testnet.yml b/.github/workflows/gui-testnet.yml deleted file mode 100644 index 2880c6ad..00000000 --- a/.github/workflows/gui-testnet.yml +++ /dev/null @@ -1,170 +0,0 @@ -name: "gui-testnet" -on: - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - push: - paths-ignore: - - '**.md' - pull_request: - paths-ignore: - - '**.md' - -env: - CCACHE_SETTINGS: | - ccache --max-size=150M - ccache --set-config=compression=true - -jobs: - linux-amd64: - runs-on: ubuntu-20.04 - env: - CCACHE_TEMPDIR: ${{ github.workspace }}/ccache - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - submodules: recursive - - uses: actions/cache@v3 - with: - path: ${{ github.workspace }}/ccache - key: ccache-${{ runner.os }}-build-testnet-gui - restore-keys: ccache-${{ runner.os }}-build-testnet-gui - - name: update apt - run: sudo apt update - - name: install dependencies - run: sudo apt-get install -y qt5-default qtwebengine5-dev libqt5websockets5-dev python-dev autotools-dev libboost-all-dev libicu-dev libbz2-dev git screen checkinstall zlib1g-dev ccache miniupnpc - - name: build server - env: - QT_PREFIX_PATH: /usr/lib/qt5 - run: | - ${{env.CCACHE_SETTINGS}} - ./utils/build/testnet_linux_gui.sh - - uses: actions/upload-artifact@v3 - with: - name: lethean-gui-bundle-linux-testnet-x86_64 - if-no-files-found: error - path: lethean-gui-bundle-linux-testnet-x86_64.tar.bz2 - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: ${{ github.workspace }}/lethean-gui-bundle-linux-testnet-x86_64.tar.bz2 - macos-amd64: - runs-on: macos-latest - env: - CCACHE_TEMPDIR: ${{ github.workspace }}/ccache - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - submodules: recursive - - uses: actions/cache@v3 - with: - path: ${{ github.workspace }}/ccache - key: ccache-${{ runner.os }}-build-testnet-gui - restore-keys: ccache-${{ runner.os }}-build-testnet-gui - - name: install dependencies - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl boost icu4c ccache miniupnpc qt@5 - - name: build server - env: - PKG_CONFIG_PATH: "/usr/local/opt/openssl@3/lib/pkgconfig" - OPENSSL_ROOT_DIR: "/usr/local/opt/openssl@3" - ZANO_BOOST_ROOT: "/usr/local/opt/boost" - ZANO_BOOST_LIBS_PATH: "/usr/local/opt/boost/lib" - ZANO_QT_PATH: "/usr/local/opt/qt@5" - CMAKE_OSX_SYSROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk" - run: | - ${{env.CCACHE_SETTINGS}} - export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/icu4c/lib - ./utils/build/testnet_mac_osx_gui.sh - - uses: actions/upload-artifact@v3 - with: - name: lethean-gui-bundle-macos-testnet-i386 - if-no-files-found: error - path: lethean-gui-bundle-macos-testnet-i386.tar.bz2 - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: ${{ github.workspace }}/lethean-gui-bundle-macos-testnet-i386.tar.bz2 - windows-amd64: - runs-on: windows-latest - env: - CCACHE_TEMPDIR: ${{ github.workspace }}/ccache - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - submodules: recursive - - name: cCache Cache - uses: actions/cache@v3 - with: - path: ${{ github.workspace }}/ccache - key: ccache-${{ runner.os }}-build-testnet-gui - restore-keys: ccache-${{ runner.os }}-build-testnet-gui - - name: Eat the Choco - run: | - choco install openssl --version 1.1.1.1500 -y - choco install ccache -y - choco install zip -y - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: '5.15.2' - host: 'windows' - target: 'desktop' - arch: 'win64_msvc2019_64' - dir: '${{ github.workspace }}/example/' - modules: 'qtcharts qtwebengine' - tools: 'tools_cmake tools_vcredist' - cache: true - - name: install msvc toolset - uses: ilammy/msvc-dev-cmd@v1 - - name: Install boost - uses: MarkusJx/install-boost@v2.4.1 - id: install-boost - with: - # REQUIRED: Specify the required boost version - # A list of supported versions can be found here: - # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json - boost_version: 1.80.0 - platform_version: 2022 - toolset: msvc - link: static - - name: Set up Visual Studio shell - uses: egor-tensin/vs-shell@v2 - with: - arch: x64 - - name: build server - env: - QT_PREFIX_PATH: ${{ github.workspace }}/example/Qt/5.15.2/win64_msvc2019_64 - BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} - LOCAL_BOOST_PATH: ${{ steps.install-boost.outputs.BOOST_ROOT }} - OPENSSL_ROOT_DIR: "C:\\Program Files\\OpenSSL-Win64" - CCACHE_TEMPDIR: ${{ github.workspace }}/ccache - run: | - ${{env.CCACHE_SETTINGS}} - .\utils\build\testnet_windows_gui.bat - - uses: actions/upload-artifact@v3 - with: - name: lethean-gui-bundle-win-testnet-x64 - if-no-files-found: error - path: ${{ github.workspace }}\lethean-gui-bundle-win-testnet-x64.zip - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: | - lethean-gui-bundle-win-testnet-* diff --git a/Makefile b/Makefile index 320914f3..c8185763 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,6 @@ cmake = cmake $(cmake_gen) cmake_debug = $(cmake) -D CMAKE_BUILD_TYPE=Debug -D MUTE_ERRORS=FALSE cmake_release = $(cmake) -D CMAKE_BUILD_TYPE=Release -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=contrib/cmake/conan_provider.cmake -cmake_gui = -D BUILD_GUI=ON cmake_testnet = -D TESTNET=ON -D BUILD_TESTS=OFF cmake_static = -D STATIC=ON cmake_tests = -D BUILD_TESTS=ON -D TESTNET=ON @@ -120,30 +119,6 @@ ci-macos-arm64-testnet: static-release-testnet ci-package-linux ## Build testnet conan: @conan config install contrib/cmake/settings_user.yml -# -# GUI -# - -gui: gui-release -gui-release: - $(eval command += $(cmake_release) $(cmake_gui)) - $(call CMAKE,$(dir_release),$(command)) && $(MAKE) -gui-release-testnet: - $(eval command += $(cmake_release) $(cmake_gui) $(cmake_testnet)) - $(call CMAKE,$(dir_release),$(command)) && $(MAKE) - -gui-debug: - $(eval command += $(cmake_debug) $(cmake_gui)) - $(call CMAKE,$(dir_debug),$(command)) && $(MAKE) - -gui-static: gui-release-static -gui-release-static: - $(eval command += $(cmake_release) $(cmake_gui) $(cmake_static)) - $(call CMAKE,$(dir_release),$(command)) && $(MAKE) - -gui-release-static-testnet: - $(eval command += $(cmake_release) $(cmake_gui) $(cmake_static) $(cmake_testnet)) - $(call CMAKE,$(dir_release),$(command)) && $(MAKE) # # Tests diff --git a/contrib/cmake/conanfile.py b/contrib/cmake/conanfile.py index ef7b7078..897cfd05 100644 --- a/contrib/cmake/conanfile.py +++ b/contrib/cmake/conanfile.py @@ -21,6 +21,5 @@ class ConanApplication(ConanFile): def requirements(self): requirements = self.conan_data.get('requirements', []) - #self.requires("qt/5.15.13", options={"shared":True, "qtwebengine":True, "gui": True, "qtwebchannel": True, "qtlocation": True, "qtdeclarative": True}) for requirement in requirements: self.requires(requirement) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 20837688..54cc1124 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,9 +50,6 @@ MACRO(ENABLE_SHARED_PCH_EXECUTABLE target) ENDMACRO(ENABLE_SHARED_PCH_EXECUTABLE) ##### End of Precompiled Headers macros ###### - - - file(GLOB_RECURSE PCH pch/*) file(GLOB_RECURSE COMMON common/*) file(GLOB_RECURSE CRYPTO crypto/*) @@ -68,23 +65,6 @@ file(GLOB_RECURSE CONN_TOOL connectivity_tool/*) file(GLOB_RECURSE WALLET wallet/*) file(GLOB_RECURSE MINER miner/*) -if(BUILD_GUI) - if(MSVC) - file(GLOB_RECURSE QTDAEMON gui/qt-daemon/*.cpp gui/qt-daemon/*.h gui/qt-daemon/app.rc) - elseif(APPLE) - file(GLOB_RECURSE QTDAEMON gui/qt-daemon/*.cpp gui/qt-daemon/*.h gui/qt-daemon/*.mm) - else() - file(GLOB_RECURSE QTDAEMON gui/qt-daemon/*.cpp gui/qt-daemon/*.h) - endif() - list(FILTER QTDAEMON EXCLUDE REGEX "node_modules") -endif() -# if(BUILD_GUI) -# if(APPLE) -# file(GLOB_RECURSE QTSERVER gui/*.cpp gui/*.h gui/*.mm) -# else() -# file(GLOB_RECURSE QTSERVER gui/*.cpp gui/*.h) -# endif() -#endif() source_group(pch FILES ${PCH}) source_group(common FILES ${COMMON}) @@ -99,11 +79,6 @@ source_group(lethean-cli-wallet FILES ${SIMPLEWALLET}) source_group(connectivity-tool FILES ${CONN_TOOL}) source_group(wallet FILES ${WALLET}) -if(BUILD_GUI) - source_group(qtserver FILES ${QTSERVER}) -endif() - - INIT_SHARED_PCH() add_library(common ${COMMON}) @@ -140,11 +115,6 @@ if(NOT DISABLE_TOR) target_link_libraries(wallet tor-connect) endif() - - - - - if(CMAKE_SYSTEM_NAME STREQUAL "iOS") install(TARGETS wallet currency_core crypto common DESTINATION lib) message("Generating install for iOS") @@ -188,42 +158,3 @@ ENABLE_SHARED_PCH_EXECUTABLE(lethean-cli-wallet) set_property(TARGET common crypto currency_core rpc stratum wallet PROPERTY FOLDER "libs") set_property(TARGET daemon lethean-cli-wallet connectivity_tool PROPERTY FOLDER "prog") set_property(TARGET daemon PROPERTY OUTPUT_NAME "letheand") - - -if(BUILD_GUI) - - if(APPLE) - FIND_LIBRARY(COCOA_LIBRARY Cocoa) - endif() - - set(AUTORCC ON) - set(CMAKE_AUTOMOC ON) - set(CMAKE_INCLUDE_CURRENT_DIR ON) -# SET(MACOSX_BUNDLE_ICON_FILE app.icns) - qt5_add_resources (RCC_SOURCES gui/resources/files.qrc) - add_executable(Lethean WIN32 MACOSX_BUNDLE ${QTSERVER} ${RCC_SOURCES} ) - ENABLE_SHARED_PCH(Lethean QTSERVER) - ENABLE_SHARED_PCH_EXECUTABLE(Lethean) - set_property(TARGET Lethean PROPERTY OUTPUT_NAME "lethean-gui-server") - - QT5_USE_MODULES(Lethean WebEngineWidgets WebChannel WebSockets) - find_package(Qt5PrintSupport REQUIRED) - - target_link_libraries(Lethean wallet rpc currency_core crypto common zlibstatic ethash Qt5::WebSockets Qt5::WebEngineWidgets Qt5::PrintSupport ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto) - if (UNIX AND NOT APPLE) - target_link_libraries(Lethean rt) - endif() - - if(APPLE) - target_link_libraries(Lethean ${COCOA_LIBRARY}) - set_property(TARGET Lethean PROPERTY XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES) - endif() - if(MSVC) - target_link_libraries(Lethean shlwapi.lib) - endif() - - set_property(TARGET Lethean PROPERTY FOLDER "prog") - - set(CMAKE_AUTOMOC OFF) - -endif()