From d5b6703056fbad60855273ed7466711d064866b1 Mon Sep 17 00:00:00 2001 From: Karliss Date: Sun, 21 Jul 2024 23:16:41 +0300 Subject: [PATCH] Cleanup. --- .appveyor.yml | 31 ------------------------ .github/workflows/package-build.yml | 6 +---- patch/pyside-5.12.1/CMakeLists.txt.patch | 22 ----------------- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 patch/pyside-5.12.1/CMakeLists.txt.patch diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 57480be..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,31 +0,0 @@ -image: 'Visual Studio 2017' - -configuration: - - Release - -environment: - ARTIFACT_PATH: cutter-deps-win-x86_64.tar.gz - ARTIFACT_NAME: cutter-deps-win-x86_64.tar.gz - -build_script: - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 - - C:\msys64\usr\bin\bash -lc " - wget https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe && - 7z x -oLLVM LLVM-10.0.0-win64.exe && - export LLVM_INSTALL_DIR=\"$PWD/LLVM\" && - cd \"%APPVEYOR_BUILD_FOLDER%\" && - export PATH=\"$PWD/qt/bin:$LLVM_INSTALL_DIR/bin:$PATH\" && - make PYTHON_WINDOWS=\"C:\Python36-x64\"" - -artifacts: - - path: "%ARTIFACT_PATH%" - name: "%ARTIFACT_NAME%" - -deploy: - description: "cutter-deps" - provider: GitHub - auth_token: - secure: 5oG4ryjEAOgFTJVsJJE54wcLnM/Djlzgi7I667/Xr1TtPX0/qGVVRruaFhBmYAV5 - artifact: "%ARTIFACT_PATH%" - on: - APPVEYOR_REPO_TAG: true diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml index 5b70bff..5230c66 100644 --- a/.github/workflows/package-build.yml +++ b/.github/workflows/package-build.yml @@ -61,11 +61,6 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v3 - #- name: msys setup - # shell: 'C:/shells/msys2bash.cmd {0}' - # run: | - # set -euo pipefail - # pwd - name: Set up Python uses: actions/setup-python@v5 with: @@ -140,6 +135,7 @@ jobs: echo "$BUILD_SDK_PATH" echo "###### xcode-select Info ######" xcode-select -print-path + echo "###### LLVM Info ######" which clang brew info llvm echo "###### Make ######" diff --git a/patch/pyside-5.12.1/CMakeLists.txt.patch b/patch/pyside-5.12.1/CMakeLists.txt.patch deleted file mode 100644 index 5987bea..0000000 --- a/patch/pyside-5.12.1/CMakeLists.txt.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- pyside-setup-everywhere-src-5.12.1/sources/pyside2/CMakeLists.txt 2019-01-31 15:05:01.000000000 +0100 -+++ patch/CMakeLists.txt 2019-02-17 17:31:41.045272590 +0100 -@@ -354,7 +354,8 @@ - - # Collect all optional modules. - set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Positioning Location Qml Quick QuickWidgets Scxml Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) --find_package(Qt5UiTools) -+#find_package(Qt5UiTools) -+set(Qt5UiTools_FOUND FALSE) - if(Qt5UiTools_FOUND) - list(APPEND ALL_OPTIONAL_MODULES UiTools) - else() -@@ -497,7 +498,8 @@ - endif() - - add_subdirectory(libpyside) --find_package(Qt5Designer) -+#find_package(Qt5Designer) -+set(Qt5Designer_FOUND FALSE) - if(Qt5UiTools_FOUND AND Qt5Designer_FOUND) - add_subdirectory(plugins) - endif()