Skip to content

Update projectGenerator and apothecary submodules to latest #8576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danoli3 merged 1 commit into from
Oct 11, 2026
Merged

Update projectGenerator and apothecary submodules to latest #8576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/projectGenerator
Open in desktop
Submodule projectGenerator updated 20 files
+1 −1 commandLine/src/defines.h
+1 −4 commandLine/src/main.cpp
+11 −0 commandLine/src/projects/baseProject.cpp
+5 −1 commandLine/src/projects/baseProject.h
+6 −0 commandLine/src/projects/visualStudioProject.h
+290 −10 frontend/app.js
+125 −6 frontend/index.html
+345 −2 frontend/index.js
+47 −4 frontend/locales/de.json
+47 −4 frontend/locales/en.json
+47 −4 frontend/locales/es.json
+47 −4 frontend/locales/fr.json
+47 −4 frontend/locales/ja.json
+47 −4 frontend/locales/ko.json
+47 −4 frontend/locales/pt.json
+47 −4 frontend/locales/ru.json
+47 −4 frontend/locales/zh-CN.json
+2 −2 frontend/npm-shrinkwrap.json
+1 −1 frontend/package.json
+3 −2 frontend/static/css/index.css
2 changes: 1 addition & 1 deletion scripts/apothecary
Open in desktop
Submodule apothecary updated 88 files
+67 −0 .github/actions/platform-artifacts/action.yml
+30 −115 .github/workflows/build-android.yml
+21 −21 .github/workflows/build-catos.yml
+8 −3 .github/workflows/build-emscripten.yml
+5 −3 .github/workflows/build-ios.yml
+4 −2 .github/workflows/build-linux-cross.yml
+3 −3 .github/workflows/build-linux-modular.yml
+4 −2 .github/workflows/build-linux-rpi.yml
+4 −2 .github/workflows/build-linux64.yml
+4 −2 .github/workflows/build-macos.yml
+169 −0 .github/workflows/build-modular-optional.yml
+26 −6 .github/workflows/build-msys2.yml
+4 −2 .github/workflows/build-tvos.yml
+6 −4 .github/workflows/build-vs2022-arm64.yml
+6 −4 .github/workflows/build-vs2022-arm64ec.yml
+6 −4 .github/workflows/build-vs2022-x64.yml
+6 −4 .github/workflows/build-vs2026-x64.yml
+2 −2 .github/workflows/build-watchos.yml
+21 −21 .github/workflows/build-xros.yml
+1 −1 .github/workflows/test-openframeworks-libraries.yml
+52 −0 .github/workflows/upstream-versions.yml
+39 −0 .github/workflows/validate-platform-artifacts.yml
+4 −0 .gitignore
+105 −0 AGENTS.md
+3 −2 CHANGELOG.md
+213 −172 FORMULA_VERSION_MATRIX.md
+1 −1 README.md
+15 −4 apothecary/apothecary
+19 −11 apothecary/configure/android_configure.sh
+72 −31 apothecary/formulas/FreeImage/FreeImage.sh
+126 −25 apothecary/formulas/angle/angle.sh
+5 −1 apothecary/formulas/cairo/CMakeLists.txt
+18 −0 apothecary/formulas/cairo/README.md
+20 −7 apothecary/formulas/cairo/cairo.sh
+51 −0 apothecary/formulas/cairo/emscripten-smoke.c
+5 −5 apothecary/formulas/curl/curl.sh
+1 −1 apothecary/formulas/libpng/CMakeLists.txt
+4 −4 apothecary/formulas/libpng/libpng.sh
+7 −9 apothecary/formulas/libxml2/libxml2.sh
+6 −0 apothecary/formulas/opencv5/OpenCV-tvOS.cmake
+6 −0 apothecary/formulas/opencv5/OpenCV-visionOS.cmake
+5 −0 apothecary/formulas/opencv5/OpenCV-watchOS.cmake
+39 −0 apothecary/formulas/opencv5/README.md
+58 −0 apothecary/formulas/opencv5/arm64ec-dnn-avx.patch
+69 −0 apothecary/formulas/opencv5/ios_conversions.mm
+1,131 −0 apothecary/formulas/opencv5/opencv5.sh
+15 −0 apothecary/formulas/opencv5/windows-mlas-fallback.patch
+0 −20 apothecary/formulas/openssl/disable-apps.patch
+9 −16 apothecary/formulas/openssl/openssl.sh
+4 −0 apothecary/formulas/pixman/CMakeLists.txt
+12 −3 apothecary/formulas/pixman/pixman.sh
+1 −1 apothecary/formulas/pixman/pixman/CMakeLists.txt
+3 −3 apothecary/formulas/poco/poco.sh
+19 −6 apothecary/formulas/svgtiny/svgtiny.sh
+ − apothecary/formulas/tess2/android-index-width-before.png
+1 −1 apothecary/formulas/tess2/tess2.patch
+1 −1 apothecary/formulas/tess2/tess2.sh
+5 −5 apothecary/formulas/utf8.sh
+17 −14 apothecary/toolchains/ios.toolchain.cmake
+5 −2 scripts/AGENTS.md
+86 −0 scripts/MODULAR_CACHE.md
+66 −0 scripts/PLATFORM_ARTIFACTS.md
+53 −0 scripts/UPSTREAM_VERSIONS.md
+8 −0 scripts/android/setup.sh
+28 −0 scripts/apple-install-tools.sh
+72 −0 scripts/build-modular-optional.sh
+18 −0 scripts/cache-toolchain.sh
+28 −3 scripts/calculate_formulas.sh
+5 −3 scripts/catos/install.sh
+174 −0 scripts/check-upstream-versions.sh
+1 −1 scripts/emscripten/setup.sh
+1 −1 scripts/emscripten/setup_env_unix.sh
+27 −0 scripts/emscripten/test_cairo.sh
+5 −3 scripts/ios/install.sh
+68 −0 scripts/modular-cache-key.sh
+3 −2 scripts/osx/install.sh
+29 −0 scripts/platform-artifact-manifest.sh
+80 −0 scripts/platform-artifacts.cjs
+40 −0 scripts/tests/test-apple-install-tools.sh
+96 −0 scripts/tests/test-modular-cache.sh
+84 −0 scripts/tests/test-platform-artifacts.cjs
+40 −0 scripts/tests/test-tess2-index-width.c
+108 −0 scripts/tests/test-upstream-versions.sh
+20 −0 scripts/tests/test-workflow-scheduling.rb
+5 −3 scripts/tvOS/install.sh
+25 −0 scripts/upstream-versions.jq
+272 −0 scripts/upstream-versions.json
+4 −3 scripts/xros/install.sh
Loading