ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-24 05:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Temporarily disable Bindings in CI, QMake Fixes

Browse Source
This commit is contained in:
Florian Märkl 2019-02-18 13:51:14 +01:00
parent f5fb9f364f
commit 70e7840e75
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -47,7 +47,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 ) - cmd: if defined QMAKE ( call prepare_r2.bat && call build.bat CUTTER_ENABLE_PYTHON=true CUTTER_ENABLE_PYTHON_BINDINGS=false CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=false CUTTER_APPVEYOR_R2DEC=true )
- cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter ) - cmd: if defined MESON ( python meson.py --release --dist=%ARTIFACT_PATH% --backend=%BACKEND% --jupyter )
after_build: after_build:

12
.travis.yml
View File

@ -60,16 +60,16 @@ script:
- cd build - cd build
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ "$BUILD_SYSTEM" == "qmake" ]]; then if [[ "$BUILD_SYSTEM" == "qmake" ]]; then
PKG_CONFIG_PATH="$CUSTOM_PYTHON_PREFIX/lib/pkgconfig" qmake CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=false PREFIX=/usr APPIMAGE=1 ../src && make -j4; PKG_CONFIG_PATH="$CUSTOM_PYTHON_PREFIX/lib/pkgconfig" qmake CUTTER_ENABLE_PYTHON=true CUTTER_ENABLE_PYTHON_BINDINGS=false CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=false PREFIX=/usr APPIMAGE=1 ../src && make -j4;
elif [[ "$BUILD_SYSTEM" == "qmake" ]]; then elif [[ "$BUILD_SYSTEM" == "cmake" ]]; then
cmake ../src && make -j4; cmake -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF -DCUTTER_ENABLE_JUPYTER=ON -DCUTTER_ENABLE_QTWEBENGINE=OFF ../src && make -j4;
fi fi
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if [[ "$BUILD_SYSTEM" == "qmake" ]]; then if [[ "$BUILD_SYSTEM" == "qmake" ]]; then
qmake CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=false CUTTER_BUNDLE_R2_APPBUNDLE=true PYTHON_FRAMEWORK_DIR=$PYTHON_FRAMEWORK_DIR ../src && qmake CUTTER_ENABLE_PYTHON=true CUTTER_ENABLE_PYTHON_BINDINGS=false CUTTER_ENABLE_JUPYTER=true CUTTER_ENABLE_QTWEBENGINE=false CUTTER_BUNDLE_R2_APPBUNDLE=true PYTHON_FRAMEWORK_DIR=$PYTHON_FRAMEWORK_DIR ../src &&
make -j4; make -j4;
elif [[ "$BUILD_SYSTEM" == "qmake" ]]; then elif [[ "$BUILD_SYSTEM" == "cmake" ]]; then
cmake ../src && make -j4; cmake -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF -DCUTTER_ENABLE_JUPYTER=ON -DCUTTER_ENABLE_QTWEBENGINE=OFF ../src && make -j4;
fi fi
fi fi

10
src/Cutter.pro
View File

@ -126,7 +126,7 @@ CUTTER_ENABLE_PYTHON {
pythonpath = $$clean_path($$dirname(pythonpath)) 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
BINDINGS_SRC_LIST_CMD = "${PYTHON_EXECUTABLE} bindings/src_list.py" BINDINGS_SRC_LIST_CMD = "$${PYTHON_EXECUTABLE} bindings/src_list.py"
} }
unix|macx|bsd { unix|macx|bsd {
@ -146,6 +146,12 @@ CUTTER_ENABLE_PYTHON {
} }
CUTTER_ENABLE_PYTHON_BINDINGS { CUTTER_ENABLE_PYTHON_BINDINGS {
!packagesExist(shiboken2) {
error("ERROR: Shiboken2, which is required to build the Python Bindings, could not be found. Make sure it is available to pkg-config.")
}
!packagesExist(pyside2) {
error("ERROR: PySide2, which is required to build the Python Bindings, could not be found. Make sure it is available to pkg-config.")
}
BINDINGS_SRC_DIR = "$${PWD}/bindings" BINDINGS_SRC_DIR = "$${PWD}/bindings"
BINDINGS_BUILD_DIR = "$${OUT_PWD}/bindings" BINDINGS_BUILD_DIR = "$${OUT_PWD}/bindings"
BINDINGS_SOURCE = $$system("$${BINDINGS_SRC_LIST_CMD} qmake \"$${BINDINGS_BUILD_DIR}\"") BINDINGS_SOURCE = $$system("$${BINDINGS_SRC_LIST_CMD} qmake \"$${BINDINGS_BUILD_DIR}\"")
@ -158,10 +164,10 @@ CUTTER_ENABLE_PYTHON {
BINDINGS_INCLUDE_DIRS += $$absolute_path("$$path") BINDINGS_INCLUDE_DIRS += $$absolute_path("$$path")
} }
BINDINGS_INCLUDE_DIRS = $$join(BINDINGS_INCLUDE_DIRS, ":") BINDINGS_INCLUDE_DIRS = $$join(BINDINGS_INCLUDE_DIRS, ":")
message("Joined: $$BINDINGS_INCLUDE_DIRS")
PYSIDE_TYPESYSTEMS = $$system("pkg-config --variable=typesystemdir pyside2") PYSIDE_TYPESYSTEMS = $$system("pkg-config --variable=typesystemdir pyside2")
PYSIDE_INCLUDEDIR = $$system("pkg-config --variable=includedir pyside2") PYSIDE_INCLUDEDIR = $$system("pkg-config --variable=includedir pyside2")
QMAKE_SUBSTITUTES += bindings/bindings.txt.in QMAKE_SUBSTITUTES += bindings/bindings.txt.in
#SHIBOKEN_EXECUTABLE = $$system("pkg-config --variable="
bindings.target = bindings_target bindings.target = bindings_target
bindings.commands = shiboken2 --project-file="$${BINDINGS_BUILD_DIR}/bindings.txt" bindings.commands = shiboken2 --project-file="$${BINDINGS_BUILD_DIR}/bindings.txt"
QMAKE_EXTRA_TARGETS += bindings QMAKE_EXTRA_TARGETS += bindings

0
src/bindings/src_list.py Normal file → Executable file
View File