Windows CMD doesn't treat single quotes as anything but a regular character.

Remove cd.
The token '||' is not a valid statement separator in this version.
2024-09-19 23:34:04 +02:00 · 2024-01-24 18:29:45 +02:00 · 2024-01-24 17:06:06 +02:00 · 2024-01-24 16:46:44 +02:00 · 2024-01-24 16:38:37 +02:00 · 2024-01-24 16:15:26 +02:00
1 changed files with 8 additions and 4 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@ -351,15 +351,19 @@ for:
    - (python -m pip install --upgrade pip)
    - if "%DEPLOY%" == "true" (python -m pip install dropbox)
    - python -m pip install conan==1.61.0
-    # Trick qmake to not work through MSYS
-    - del /F "C:\Program Files\Git\usr\bin\sh.exe"
-    - del /F "C:\Program Files\Git\bin\sh.exe"
    - dir "C:\"
    - dir "C:\Qt"
    - dir "C:\Qt\Tools"
    - dir %QTDIR%
    - dir "%QTDIR%\bin"
    - qbs --version
+    # Patch Qbs. Remove after Qbs 2.2.1+.
+    - ps: |
+        Invoke-WebRequest -Uri "https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch" -OutFile "$env:USERPROFILE\qbs-pkg-config-probe.patch"
+        $qbsInstallationDir = "C:\ProgramData\chocolatey\lib\qbs\tools"
+        cmd.exe /c "patch -p1 -N -d $qbsInstallationDir -i $env:USERPROFILE\qbs-pkg-config-probe.patch"
+        Remove-Item -Path "$qbsInstallationDir\share\qbs\imports\qbs\Probes\qbs-pkg-config-probe.js.rej" -ErrorAction SilentlyContinue
+        Remove-Item -Path "$env:USERPROFILE\qbs-pkg-config-probe.patch" -ErrorAction SilentlyContinue

  before_build:
    - cd %APPVEYOR_BUILD_FOLDER%
@ -409,7 +413,7 @@ for:
    - if "%RUN_TESTS%" == "true" (qbs -p autotest-runner -d %APPVEYOR_BUILD_FOLDER%\build profile:qt6 config:release)

  deploy_script:
-    - if "%DEPLOY%" == "true" (qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build -p 'ValentinaSetup' --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%)
+    - if "%DEPLOY%" == "true" (qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build -p ValentinaSetup --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%)
    - ps: scripts/appveyor-deploy.ps1

  on_finish:
Author	SHA1	Message	Date
Roman Telezhynskyi	c26d913ab6	Windows CMD doesn't treat single quotes as anything but a regular character.	2024-01-24 18:29:45 +02:00
Roman Telezhynskyi	64512c822e	Remove cd.	2024-01-24 17:06:06 +02:00
Roman Telezhynskyi	3d0fbfee8d	The token '\|\|' is not a valid statement separator in this version.	2024-01-24 16:46:44 +02:00
Roman Telezhynskyi	28de72ff0d	Switch to patch.	2024-01-24 16:38:37 +02:00
Roman Telezhynskyi	e538dec3f3	Patch Qbs.	2024-01-24 16:15:26 +02:00