diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a13ba4c..802d353 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -74,9 +74,9 @@ jobs: set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin mkdir dependencies_src echo ::group::===== exiv2 ===== - curl -fsSL -o exiv2_bin.zip https://github.com/Exiv2/exiv2/releases/download/v0.28.5/exiv2-0.28.5-2022msvc-AMD64.zip + curl -fsSL -o exiv2_bin.zip https://github.com/Exiv2/exiv2/releases/download/v0.28.7/exiv2-0.28.7-2022msvc-AMD64.zip 7z x exiv2_bin.zip -y - ren .\exiv2-0.28.5-2022msvc-AMD64 dependencies_bin + ren .\exiv2-0.28.7-2022msvc-AMD64 dependencies_bin echo ::endgroup:: echo ::group::===== zlib ===== curl -fsSL -o zlib_src.zip https://zlib.net/zlib131.zip @@ -125,6 +125,10 @@ jobs: cmake --build build --config Release cmake --install build --config Release --prefix "%PWD%\build" echo ::endgroup:: + echo ::group::===== passoc stuff ===== + curl -fsSL -o passoc-standalone.zip https://github.com/BLumia/pineapple-assoc-manager/releases/latest/download/pineapple-assoc-manager-qt${{ matrix.qt_ver }}-standalone.zip + 7z x passoc-standalone.zip passoc.exe -y -o"build/bin" + echo ::endgroup:: :: ------ pkg ------ windeployqt --verbose=2 --no-compiler-runtime --no-quick-import --no-translations --no-network --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation build\bin\ppic.exe robocopy ./dependencies_bin/bin build/bin *.dll diff --git a/appveyor.yml b/appveyor.yml index 3b3928f..2fcf741 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: QTDIR: C:\Qt\6.8\mingw_64 MINGW64: C:\Qt\mingw_64\Tools\mingw1310_64 KF_BRANCH: master - EXIV2_VERSION: "0.28.5" + EXIV2_VERSION: "0.28.7" EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF" PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=OFF" WINDEPLOYQT_ARGS: "--verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --skip-plugin-types tls,networkinformation" @@ -96,9 +96,9 @@ build_script: - cd %APPVEYOR_BUILD_FOLDER% # build libexpat for libexiv2 - cd %LIBEXPAT% - - curl -fsSL -o R_2_6_2.zip https://github.com/libexpat/libexpat/archive/R_2_6_2.zip - - 7z x R_2_6_2.zip -y - - cd libexpat-R_2_6_2/expat/ + - curl -fsSL -o R_2_7_3.zip https://github.com/libexpat/libexpat/archive/R_2_7_3.zip + - 7z x R_2_7_3.zip -y + - cd libexpat-R_2_7_3/expat/ - cmake -G "Ninja" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF - cmake --build . --target install/strip - cd %APPVEYOR_BUILD_FOLDER% @@ -143,7 +143,7 @@ build_script: - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\aom\LICENSE License.aom.txt - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\karchive\LICENSES\LGPL-2.0-or-later.txt License.KArchive.txt - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\kimageformats\LICENSES\LGPL-2.1-or-later.txt License.kimageformats.txt - - copy %LIBEXPAT%\libexpat-R_2_6_2\expat\COPYING License.expat.txt + - copy %LIBEXPAT%\libexpat-R_2_7_3\expat\COPYING License.expat.txt - copy %LIBAVIF%\libavif-1.3.0\LICENSE License.libavif.txt - copy %LIBEXIV2%\exiv2-%EXIV2_VERSION%\COPYING License.exiv2.txt # TODO: Qt, zlib diff --git a/dist/passoc/ppic.pacfg b/dist/passoc/ppic.pacfg index b62d57d..9c732e3 100644 --- a/dist/passoc/ppic.pacfg +++ b/dist/passoc/ppic.pacfg @@ -63,6 +63,10 @@ extensions=tif,tiff name=Bitmap name[zh_CN]=位图 +[ProgId/wbmp] +name=Wireless Bitmap +name[zh_CN]=无线位图 + [ProgId/dds] name=DirectDraw Surface