webmscore supporting MuseScore 4.3.2 test

Author: CarlGao4

.github/workflows/build.yml

@@ -3,6 +3,10 @@ name: Build webmscore
 on:
   workflow_dispatch:
     inputs: {}
+  push:
+    branches:
+      - 'webmscore'
+      - 'Xmader/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -99,16 +103,28 @@ jobs:
           name: npm-pack
           path: web-example
       - name: Test
+        id: run-test
         run: |
           cd web-example
           npm i
           npm i ./webmscore-*.tgz
-          npm start
+          npm start || echo "failed=1" >> "$GITHUB_OUTPUT"
 
       - uses: actions/upload-artifact@v4
         with:
           name: example-exports
           path: web-example/exported*
+      
+      - uses: actions/upload-artifact@v4
+        if: steps.run-test.outputs.failed == '1'
+        with:
+          name: test-log
+          path: .npm/_logs
+
+      - name: Make faile
+        if: steps.run-test.outputs.failed == '1'
+        run: |
+          exit 1
 
   publish:
     if: github.ref_name == 'webmscore' && startsWith(github.event.head_commit.message, 'release v')

SetupConfigure.cmake

@@ -19,7 +19,7 @@
 
 include(GetBuildType)
 include(GetPlatformInfo)
-include(version)
+include(${MU_ROOT}/version.cmake)
 
 if (NOT MUSESCORE_BUILD_CONFIGURATION)
     set(MUSESCORE_BUILD_CONFIGURATION "app")
@@ -248,38 +248,38 @@ function(def_opt name val)
 endfunction()
 
 # framework
-def_opt(MUE_BUILD_ACCESSIBILITY_MODULE ${MUE_BUILD_ACCESSIBILITY_MODULE})
-def_opt(MUE_BUILD_AUDIO_MODULE ${MUE_BUILD_AUDIO_MODULE})
-def_opt(MUE_ENABLE_AUDIO_EXPORT ${MUE_ENABLE_AUDIO_EXPORT})
-def_opt(MUE_BUILD_MIDI_MODULE ${MUE_BUILD_MIDI_MODULE})
-def_opt(MUE_BUILD_MPE_MODULE ${MUE_BUILD_MPE_MODULE})
-def_opt(MUE_BUILD_MUSESAMPLER_MODULE ${MUE_BUILD_MUSESAMPLER_MODULE})
-def_opt(MUE_BUILD_NETWORK_MODULE ${MUE_BUILD_NETWORK_MODULE})
-def_opt(MUE_BUILD_SHORTCUTS_MODULE ${MUE_BUILD_SHORTCUTS_MODULE})
-def_opt(MUE_BUILD_UI_MODULE ${MUE_BUILD_UI_MODULE})
-def_opt(MUE_BUILD_VST_MODULE ${MUE_BUILD_VST_MODULE})
+def_opt(MUE_BUILD_ACCESSIBILITY_MODULE ${MUE_BUILD_ACCESSIBILITY_MODULE} OFF)
+def_opt(MUE_BUILD_AUDIO_MODULE ${MUE_BUILD_AUDIO_MODULE} OFF)
+def_opt(MUE_ENABLE_AUDIO_EXPORT ${MUE_ENABLE_AUDIO_EXPORT} OFF)
+def_opt(MUE_BUILD_MIDI_MODULE ${MUE_BUILD_MIDI_MODULE} OFF)
+def_opt(MUE_BUILD_MPE_MODULE ${MUE_BUILD_MPE_MODULE} OFF)
+def_opt(MUE_BUILD_MUSESAMPLER_MODULE ${MUE_BUILD_MUSESAMPLER_MODULE} OFF)
+def_opt(MUE_BUILD_NETWORK_MODULE ${MUE_BUILD_NETWORK_MODULE} OFF)
+def_opt(MUE_BUILD_SHORTCUTS_MODULE ${MUE_BUILD_SHORTCUTS_MODULE} OFF)
+def_opt(MUE_BUILD_UI_MODULE ${MUE_BUILD_UI_MODULE} OFF)
+def_opt(MUE_BUILD_VST_MODULE ${MUE_BUILD_VST_MODULE} OFF)
 # modules
-def_opt(MUE_BUILD_APPSHELL_MODULE ${MUE_BUILD_APPSHELL_MODULE})
-def_opt(MUE_BUILD_AUTOBOT_MODULE ${MUE_BUILD_AUTOBOT_MODULE})
-def_opt(MUE_BUILD_BRAILLE_MODULE ${MUE_BUILD_BRAILLE_MODULE})
-def_opt(MUE_BUILD_CLOUD_MODULE ${MUE_BUILD_CLOUD_MODULE})
-def_opt(MUE_BUILD_CONVERTER_MODULE ${MUE_BUILD_CONVERTER_MODULE})
-def_opt(MUE_BUILD_DIAGNOSTICS_MODULE ${MUE_BUILD_DIAGNOSTICS_MODULE})
-def_opt(MUE_BUILD_INSPECTOR_MODULE ${MUE_BUILD_INSPECTOR_MODULE})
-def_opt(MUE_BUILD_INSTRUMENTSSCENE_MODULE ${MUE_BUILD_INSTRUMENTSSCENE_MODULE})
-def_opt(MUE_BUILD_LANGUAGES_MODULE ${MUE_BUILD_LANGUAGES_MODULE})
-def_opt(MUE_BUILD_LEARN_MODULE ${MUE_BUILD_LEARN_MODULE})
-def_opt(MUE_BUILD_MULTIINSTANCES_MODULE ${MUE_BUILD_MULTIINSTANCES_MODULE})
-def_opt(MUE_BUILD_NOTATION_MODULE ${MUE_BUILD_NOTATION_MODULE})
-def_opt(MUE_BUILD_PALETTE_MODULE ${MUE_BUILD_PALETTE_MODULE})
-def_opt(MUE_BUILD_PLAYBACK_MODULE ${MUE_BUILD_PLAYBACK_MODULE})
-def_opt(MUE_BUILD_PLUGINS_MODULE ${MUE_BUILD_PLUGINS_MODULE})
-def_opt(MUE_BUILD_PROJECT_MODULE ${MUE_BUILD_PROJECT_MODULE})
-def_opt(MUE_BUILD_UPDATE_MODULE ${MUE_BUILD_UPDATE_MODULE})
-def_opt(MUE_BUILD_WORKSPACE_MODULE ${MUE_BUILD_WORKSPACE_MODULE})
-def_opt(MUE_BUILD_IMPORTEXPORT_MODULE ${MUE_BUILD_IMPORTEXPORT_MODULE})
-def_opt(MUE_BUILD_VIDEOEXPORT_MODULE ${MUE_BUILD_VIDEOEXPORT_MODULE})
-def_opt(MUE_BUILD_IMAGESEXPORT_MODULE ${MUE_BUILD_IMAGESEXPORT_MODULE})
+def_opt(MUE_BUILD_APPSHELL_MODULE ${MUE_BUILD_APPSHELL_MODULE} OFF)
+def_opt(MUE_BUILD_AUTOBOT_MODULE ${MUE_BUILD_AUTOBOT_MODULE} OFF)
+def_opt(MUE_BUILD_BRAILLE_MODULE ${MUE_BUILD_BRAILLE_MODULE} OFF)
+def_opt(MUE_BUILD_CLOUD_MODULE ${MUE_BUILD_CLOUD_MODULE} OFF)
+def_opt(MUE_BUILD_CONVERTER_MODULE ${MUE_BUILD_CONVERTER_MODULE} OFF)
+def_opt(MUE_BUILD_DIAGNOSTICS_MODULE ${MUE_BUILD_DIAGNOSTICS_MODULE} OFF)
+def_opt(MUE_BUILD_INSPECTOR_MODULE ${MUE_BUILD_INSPECTOR_MODULE} OFF)
+def_opt(MUE_BUILD_INSTRUMENTSSCENE_MODULE ${MUE_BUILD_INSTRUMENTSSCENE_MODULE} OFF)
+def_opt(MUE_BUILD_LANGUAGES_MODULE ${MUE_BUILD_LANGUAGES_MODULE} OFF)
+def_opt(MUE_BUILD_LEARN_MODULE ${MUE_BUILD_LEARN_MODULE} OFF)
+def_opt(MUE_BUILD_MULTIINSTANCES_MODULE ${MUE_BUILD_MULTIINSTANCES_MODULE} OFF)
+def_opt(MUE_BUILD_NOTATION_MODULE ${MUE_BUILD_NOTATION_MODULE} OFF)
+def_opt(MUE_BUILD_PALETTE_MODULE ${MUE_BUILD_PALETTE_MODULE} OFF)
+def_opt(MUE_BUILD_PLAYBACK_MODULE ${MUE_BUILD_PLAYBACK_MODULE} OFF)
+def_opt(MUE_BUILD_PLUGINS_MODULE ${MUE_BUILD_PLUGINS_MODULE} OFF)
+def_opt(MUE_BUILD_PROJECT_MODULE ${MUE_BUILD_PROJECT_MODULE} OFF)
+def_opt(MUE_BUILD_UPDATE_MODULE ${MUE_BUILD_UPDATE_MODULE} OFF)
+def_opt(MUE_BUILD_WORKSPACE_MODULE ${MUE_BUILD_WORKSPACE_MODULE} OFF)
+def_opt(MUE_BUILD_IMPORTEXPORT_MODULE ${MUE_BUILD_IMPORTEXPORT_MODULE} OFF)
+def_opt(MUE_BUILD_VIDEOEXPORT_MODULE ${MUE_BUILD_VIDEOEXPORT_MODULE} OFF)
+def_opt(MUE_BUILD_IMAGESEXPORT_MODULE ${MUE_BUILD_IMAGESEXPORT_MODULE} OFF)
 
 
 if (QT_SUPPORT)

build/cmake/SetupFreetypeBrotli.cmake

@@ -1,7 +1,7 @@
 ##
 ## FreeType v2.10.2
 ##
-set(USE_SYSTEM_FREETYPE ON)
+set(USE_SYSTEM_FREETYPE OFF)
 
 set(BROTLIDEC_FOUND TRUE)
 set(BROTLIDEC_LIBRARIES brotlidec-static brotlicommon-static)
@@ -10,9 +10,9 @@ set(SKIP_INSTALL_ALL TRUE)
 
 add_compile_definitions(FT_CONFIG_OPTION_USE_BROTLI)
 
-include_directories(${MU_ROOT}/thirdparty/freetype-2-10/include)
+include_directories(${MU_ROOT}/src/framework/draw/thirdparty/freetype)
 
 subdirs(
     ${MU_ROOT}/thirdparty/brotli
-    ${MU_ROOT}/thirdparty/freetype-2-10
+    ${MU_ROOT}/src/framework/draw/thirdparty/freetype
 )

src/engraving/dom/engravingitem.cpp

@@ -94,6 +94,7 @@ EngravingItem::EngravingItem(const ElementType& type, EngravingObject* parent, E
 EngravingItem::EngravingItem(const EngravingItem& e)
     : EngravingObject(e)
 {
+    m_bbox       = e.m_bbox;
     m_offset     = e.m_offset;
     m_track      = e.m_track;
     m_flags      = e.m_flags;

src/engraving/dom/engravingitem.h

@@ -146,6 +146,7 @@ class EngravingItem : public EngravingObject
 {
     INJECT_STATIC(IEngravingConfiguration, engravingConfiguration)
     INJECT_STATIC(rendering::IScoreRenderer, renderer)
+    mutable mu::RectF m_bbox;  ///< Bounding box relative to _pos + _offset
 
     M_PROPERTY2(bool, isPositionLinkedToMaster, setPositionLinkedToMaster, true)
     M_PROPERTY2(bool, isAppearanceLinkedToMaster, setAppearanceLinkedToMaster, true)
@@ -248,6 +249,9 @@ class EngravingItem : public EngravingObject
 
     bool isNudged() const { return !m_offset.isNull(); }
 
+    virtual const mu::RectF& bbox() const { return m_bbox; }
+    virtual mu::RectF& bbox() { return m_bbox; }
+
     bool contains(const PointF& p) const;
     bool intersects(const mu::RectF& r) const;
 

src/engraving/internal/engravingconfiguration.cpp

@@ -210,7 +210,7 @@ Color EngravingConfiguration::noteBackgroundColor() const
 
 Color EngravingConfiguration::fontPrimaryColor() const
 {
-    return Color(uiConfiguration()->currentTheme().values[ui::ThemeStyleKey::FONT_PRIMARY_COLOR].toString());
+    // return Color(uiConfiguration()->currentTheme().values[ui::ThemeStyleKey::FONT_PRIMARY_COLOR].toString());
 }
 
 double EngravingConfiguration::guiScaling() const

src/engraving/playback/playbackmodel.h

@@ -140,8 +140,6 @@ class PlaybackModel : public async::Asyncable
 
     mpe::ArticulationsProfilePtr defaultActiculationProfile(const InstrumentTrackId& trackId) const;
 
-    mpe::ArticulationsProfilePtr defaultActiculationProfile(const InstrumentTrackId& trackId) const;
-
     Score* m_score = nullptr;
     bool m_expandRepeats = true;
     bool m_playChordSymbols = true;

src/framework/audio/audiomodule.cpp

@@ -133,7 +133,8 @@ void AudioModule::registerExports()
 #endif
 
 #ifdef Q_OS_WASM
-    m_audioDriver = std::shared_ptr<IAudioDriver>(new WebAudioDriver());
+    // m_audioDriver = std::shared_ptr<IAudioDriver>(new WebAudioDriver());
+    m_audioDriver = std::shared_ptr<IAudioDriver>(nullptr);
 #endif
 
 #endif // JACK_AUDIO
@@ -230,7 +231,7 @@ void AudioModule::onInit(const framework::IApplication::RunMode& mode)
         for (const io::path_t& p : paths) {
             pr->reg("soundfonts", p);
         }
-        pr->reg("known_audio_plugins", m_configuration->knownAudioPluginsFilePath());
+        // pr->reg("known_audio_plugins", m_configuration->knownAudioPluginsFilePath());
     }
 }
 

src/framework/audio/iaudiopluginsscanner.h

@@ -19,39 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-<<<<<<<< HEAD:src/project/qml/MuseScore/Project/UploadProgressDialog.qml
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
 
-import MuseScore.UiComponents 1.0
-import MuseScore.Project 1.0
-
-StyledDialogView {
-    id: root
-
-    contentWidth: 314
-    contentHeight: 52
-    margins: 12
-
-    modal: true
-    frameless: true
-    closeOnEscape: false
-
-    ColumnLayout {
-        anchors.fill: parent
-
-        spacing: 8
-
-        StyledTextLabel {
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignHCenter
-
-            text: qsTrc("project", "Saving online…")
-            font: ui.theme.largeBodyBoldFont
-        }
-    }
-}
-========
 #ifndef MU_AUDIO_IAUDIOPLUGINSSCANNER_H
 #define MU_AUDIO_IAUDIOPLUGINSSCANNER_H
 
@@ -72,4 +40,3 @@ using IAudioPluginsScannerPtr = std::shared_ptr<IAudioPluginsScanner>;
 }
 
 #endif // MU_AUDIO_IAUDIOPLUGINSSCANNER_H
->>>>>>>> v4.3.2:src/framework/audio/iaudiopluginsscanner.h

src/framework/audio/internal/audioconfiguration.cpp

@@ -219,5 +219,7 @@ async::Channel<io::paths_t> AudioConfiguration::soundFontDirectoriesChanged() co
 
 io::path_t AudioConfiguration::knownAudioPluginsFilePath() const
 {
-    return globalConfiguration()->userAppDataPath() + "/known_audio_plugins.json";
+    NOT_IMPLEMENTED;
+    return {}; // HACK: return empty path for now
+    // return globalConfiguration()->userAppDataPath() + "/known_audio_plugins.json";
 }