mirror of
https://github.com/rizinorg/cutter.git
synced 2024-12-22 12:56:11 +00:00
Appveyor: use new cutter-deps package (#1403)
This commit is contained in:
parent
f514a1c3c7
commit
c50b19df90
@ -49,7 +49,7 @@ before_build:
|
|||||||
|
|
||||||
# Build config
|
# Build config
|
||||||
build_script:
|
build_script:
|
||||||
- cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat CUTTER_APPVEYOR_R2DEC=true CUTTER_ENABLE_PYTHON=true CUTTER_ENABLE_PYTHON_BINDINGS=true SHIBOKEN_EXECUTABLE="%CUTTER_DEPS_DIR%\pyside\bin\shiboken2.exe" SHIBOKEN_INCLUDEDIR="%CUTTER_DEPS_DIR%/pyside/include/shiboken2" SHIBOKEN_LIBRARY="%CUTTER_DEPS_DIR%/pyside/lib/shiboken2.cp36-win_amd64.lib" PYSIDE_INCLUDEDIR="%CUTTER_DEPS_DIR%/pyside/include/PySide2" PYSIDE_LIBRARY="%CUTTER_DEPS_DIR%/pyside/lib/pyside2.cp36-win_amd64.lib" PYSIDE_TYPESYSTEMS="%CUTTER_DEPS_DIR%/pyside/share/PySide2/typesystems")
|
- cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat CUTTER_APPVEYOR_R2DEC=true CUTTER_ENABLE_PYTHON=true CUTTER_ENABLE_PYTHON_BINDINGS=true SHIBOKEN_EXECUTABLE="%CUTTER_DEPS_DIR%\pyside\bin\shiboken2.exe" SHIBOKEN_INCLUDEDIR="%CUTTER_DEPS_DIR%/pyside/include/shiboken2" SHIBOKEN_LIBRARY="%CUTTER_DEPS_DIR%/pyside/lib/shiboken2.lib" PYSIDE_INCLUDEDIR="%CUTTER_DEPS_DIR%/pyside/include/PySide2" PYSIDE_LIBRARY="%CUTTER_DEPS_DIR%/pyside/lib/pyside2.lib" PYSIDE_TYPESYSTEMS="%CUTTER_DEPS_DIR%/pyside/share/PySide2/typesystems")
|
||||||
- cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --python )
|
- cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --python )
|
||||||
|
|
||||||
after_build:
|
after_build:
|
||||||
@ -57,8 +57,8 @@ after_build:
|
|||||||
- 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: 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: xcopy "%CUTTER_DEPS_DIR%\pyside\lib\site-packages" "%ARTIFACT_PATH%\python36\site-packages" /e /i /h
|
||||||
- cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\shiboken2.cp36-win_amd64.dll" "%ARTIFACT_PATH%\"
|
- cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\shiboken2.dll" "%ARTIFACT_PATH%\"
|
||||||
- cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\pyside2.cp36-win_amd64.dll" "%ARTIFACT_PATH%\"
|
- cmd: copy "%CUTTER_DEPS_DIR%\pyside\bin\pyside2.dll" "%ARTIFACT_PATH%\"
|
||||||
|
|
||||||
# Tests
|
# Tests
|
||||||
test: off
|
test: off
|
||||||
|
@ -12,8 +12,8 @@ MACOS_MD5=2763c59a9917a0f7c88995d4b77ec209
|
|||||||
MACOS_URL=https://github.com/radareorg/cutter-deps/releases/download/v8/cutter-deps-macos.tar.gz
|
MACOS_URL=https://github.com/radareorg/cutter-deps/releases/download/v8/cutter-deps-macos.tar.gz
|
||||||
|
|
||||||
WIN_FILE="cutter-deps-win.tar.gz"
|
WIN_FILE="cutter-deps-win.tar.gz"
|
||||||
WIN_MD5=74aa2b35a2c87ceba81c8049d702f63d
|
WIN_MD5=20b3ab878c5f38e5d746774dd2f7e803
|
||||||
WIN_URL=https://github.com/radareorg/cutter-deps/releases/download/v8/cutter-deps-win.tar.gz
|
WIN_URL=https://github.com/radareorg/cutter-deps/releases/download/v9/cutter-deps-win.tar.gz
|
||||||
|
|
||||||
if [ "$OS" == "Windows_NT" ]; then
|
if [ "$OS" == "Windows_NT" ]; then
|
||||||
FILE="${WIN_FILE}"
|
FILE="${WIN_FILE}"
|
||||||
|
@ -101,9 +101,7 @@ CUTTER_ENABLE_PYTHON {
|
|||||||
win32 {
|
win32 {
|
||||||
PYTHON_EXECUTABLE = $$system("where python", lines)
|
PYTHON_EXECUTABLE = $$system("where python", lines)
|
||||||
PYTHON_EXECUTABLE = $$first(PYTHON_EXECUTABLE)
|
PYTHON_EXECUTABLE = $$first(PYTHON_EXECUTABLE)
|
||||||
pythonpath = $$replace(PYTHON_EXECUTABLE, ".exe ", ".exe;")
|
pythonpath = $$clean_path($$dirname(PYTHON_EXECUTABLE))
|
||||||
pythonpath = $$section(pythonpath, ";", 0, 0)
|
|
||||||
pythonpath = $$clean_path($$dirname(pythonpath))
|
|
||||||
LIBS += -L$${pythonpath} -L$${pythonpath}/libs -lpython3
|
LIBS += -L$${pythonpath} -L$${pythonpath}/libs -lpython3
|
||||||
INCLUDEPATH += $${pythonpath}/include
|
INCLUDEPATH += $${pythonpath}/include
|
||||||
}
|
}
|
||||||
@ -130,7 +128,7 @@ CUTTER_ENABLE_PYTHON {
|
|||||||
error("ERROR: PySide2, which is required to build the Python Bindings, could not be found. Make sure it is available to pkg-config.")
|
error("ERROR: PySide2, which is required to build the Python Bindings, could not be found. Make sure it is available to pkg-config.")
|
||||||
}
|
}
|
||||||
win32 {
|
win32 {
|
||||||
BINDINGS_SRC_LIST_CMD = "$${PYTHON_EXECUTABLE} bindings/src_list.py"
|
BINDINGS_SRC_LIST_CMD = "\"$${PYTHON_EXECUTABLE}\" bindings/src_list.py"
|
||||||
} else {
|
} else {
|
||||||
BINDINGS_SRC_LIST_CMD = "python3 bindings/src_list.py"
|
BINDINGS_SRC_LIST_CMD = "python3 bindings/src_list.py"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user