From 0753147930f274db5905883445c5f0aa0bc618f8 Mon Sep 17 00:00:00 2001 From: karliss Date: Tue, 7 Apr 2020 23:24:25 +0300 Subject: [PATCH] Update cutter-deps to include qt 5.14.2 (#1868) * Use the qt from cutter-deps on windows. * Adjust shiboken lib name to match cutter-deps --- .appveyor.yml | 16 ++++++++++------ .github/workflows/ccpp.yml | 2 +- .travis.yml | 5 +++++ scripts/fetch_deps.sh | 12 ++++++------ src/Cutter.pro | 4 ++-- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 56b79d26..7c2959b8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,15 +9,17 @@ configuration: # Environment environment: NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip - QT32PATH: 'C:\Qt\5.12\msvc2017' - QT64PATH: 'C:\Qt\5.12\msvc2017_64' VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat' + QTPATH: 'cutter-deps\qt' + USE_APPVEYOR_QT: 'false' matrix: # Build: qmake vs2017 x86 shared #- ARCH: x86 # PYTHON: 'C:\Python36' # QMAKE: 1 # DEPLOY: true + # QTPATH: 'C:\Qt\5.12\msvc2017' + # USE_APPVEYOR_QT: true # Build: qmake vs2017 x64 shared - ARCH: x64 PYTHON: 'C:\Python36-x64' @@ -37,7 +39,9 @@ install: - cmd: set "CUTTER_DEPS_DIR=%APPVEYOR_BUILD_FOLDER%\cutter-deps" - cmd: set "PATH=%CD%;%PYTHON%;%PATH%" - cmd: call "%VSVARSALLPATH%" %ARCH% - - cmd: if "%ARCH%" == "x64" ( set "PATH=%QT64PATH%\bin;%PATH%" ) else ( set "PATH=%QT32PATH%\bin;%PATH%" ) + - cmd: if "%USE_APPVEYOR_QT%" == "false" ( set "QTPATH=%APPVEYOR_BUILD_FOLDER%\%QTPATH%" ) + - cmd: set "PATH=%QTPATH%\bin;%PATH%" + - cmd: echo %PATH% - cmd: python -m pip install meson - cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ." # Artifacts @@ -56,11 +60,11 @@ build_script: after_build: - cmd: if defined QMAKE ( set "PATH=%CD%\r2_dist_%ARCH%\bin;%PATH%" && powershell scripts\bundle_r2dec.ps1 "%CD%\%ARTIFACT_PATH%" ) - cmd: if defined QMAKE ( C:\msys64\usr\bin\bash -lc "export PATH=\"/c/msys64/usr/bin:$PATH\" && cd \"$APPVEYOR_BUILD_FOLDER\" && scripts/appveyor_r2ghidra.sh" ) - - cmd: powershell scripts\bundle_openssl.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%" + #- cmd: powershell scripts\bundle_openssl.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%" - cmd: powershell scripts\bundle_python.ps1 %ARCH% "%CD%\%ARTIFACT_PATH%" - cmd: xcopy "%CUTTER_DEPS_DIR%\pyside\lib\site-packages" "%ARTIFACT_PATH%\python36\site-packages" /e /i /h - - cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\shiboken2.dll" "%ARTIFACT_PATH%\" - - cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\pyside2.dll" "%ARTIFACT_PATH%\" + - cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\shiboken2.abi3.dll" "%ARTIFACT_PATH%\" + - cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\pyside2.abi3.dll" "%ARTIFACT_PATH%\" # Tests test: off diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ff81b523..6b2fd54f 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -28,7 +28,7 @@ jobs: - name: apt dependencies if: contains(matrix.os, 'ubuntu') run: | - sudo apt-get install libgraphviz-dev + sudo apt-get install libgraphviz-dev mesa-common-dev if [[ "${{ matrix.os }}" = "ubuntu-16.04" ]] then sudo apt-get install ninja-build/xenial-backports diff --git a/.travis.yml b/.travis.yml index db01f60b..be0958b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,10 @@ matrix: addons: apt: packages: + - mesa-common-dev + - libgl1-mesa-glx + - libgl1-mesa-dev + - libxkbcommon-x11-dev - ninja-build before_install: - pyenv global 3.7 @@ -28,6 +32,7 @@ matrix: addons: apt: packages: + - mesa-common-dev - ninja-build - libgraphviz-dev before_install: diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index 0d31df11..895eee95 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -4,16 +4,16 @@ cd $(dirname "${BASH_SOURCE[0]}")/.. mkdir -p cutter-deps && cd cutter-deps LINUX_FILE="cutter-deps-linux.tar.gz" -LINUX_MD5=0d20ec9217bed56098b78e9031b544ab -LINUX_URL=https://github.com/radareorg/cutter-deps/releases/download/v8/cutter-deps-linux.tar.gz +LINUX_MD5=a964be5ab3bc78815c69a1c2e60ccfef +LINUX_URL=https://github.com/radareorg/cutter-deps/releases/download/v11/cutter-deps-linux.tar.gz MACOS_FILE="cutter-deps-macos.tar.gz" -MACOS_MD5=2763c59a9917a0f7c88995d4b77ec209 -MACOS_URL=https://github.com/radareorg/cutter-deps/releases/download/v8/cutter-deps-macos.tar.gz +MACOS_MD5=7c60f5e226916b1889350d29b1c627f1 +MACOS_URL=https://github.com/radareorg/cutter-deps/releases/download/v11/cutter-deps-macos.tar.gz WIN_FILE="cutter-deps-win.tar.gz" -WIN_MD5=20b3ab878c5f38e5d746774dd2f7e803 -WIN_URL=https://github.com/radareorg/cutter-deps/releases/download/v9/cutter-deps-win.tar.gz +WIN_MD5=36360faf85ef1754f1b3af004eeaa010 +WIN_URL=https://github.com/radareorg/cutter-deps/releases/download/v11/cutter-deps-win.tar.gz if [ "$OS" == "Windows_NT" ]; then FILE="${WIN_FILE}" diff --git a/src/Cutter.pro b/src/Cutter.pro index 8478b299..ff5b6d86 100644 --- a/src/Cutter.pro +++ b/src/Cutter.pro @@ -81,9 +81,9 @@ CUTTER_ENABLE_PYTHON_BINDINGS { win32:defined(CUTTER_DEPS_DIR, var) { !defined(SHIBOKEN_EXECUTABLE, var) SHIBOKEN_EXECUTABLE="$${CUTTER_DEPS_DIR}/pyside/bin/shiboken2.exe" !defined(SHIBOKEN_INCLUDEDIR, var) SHIBOKEN_INCLUDEDIR="$${CUTTER_DEPS_DIR}/pyside/include/shiboken2" - !defined(SHIBOKEN_LIBRARY, var) SHIBOKEN_LIBRARY="$${CUTTER_DEPS_DIR}/pyside/lib/shiboken2.lib" + !defined(SHIBOKEN_LIBRARY, var) SHIBOKEN_LIBRARY="$${CUTTER_DEPS_DIR}/pyside/lib/shiboken2.abi3.lib" !defined(PYSIDE_INCLUDEDIR, var) PYSIDE_INCLUDEDIR="$${CUTTER_DEPS_DIR}/pyside/include/PySide2" - !defined(PYSIDE_LIBRARY, var) PYSIDE_LIBRARY="$${CUTTER_DEPS_DIR}/pyside/lib/pyside2.lib" + !defined(PYSIDE_LIBRARY, var) PYSIDE_LIBRARY="$${CUTTER_DEPS_DIR}/pyside/lib/pyside2.abi3.lib" !defined(PYSIDE_TYPESYSTEMS, var) PYSIDE_TYPESYSTEMS="$${CUTTER_DEPS_DIR}/pyside/share/PySide2/typesystems" }