added unity build

CMakeLists.txt

@@ -62,10 +62,11 @@ option(PACKAGE_FILE_ASSOCIATION "File types association" OFF)
 
 option(TRY_USE_CCACHE "Try use ccache" ON)
 option(BUILD_PCH "Build using precompiled headers." ON)
+option(BUILD_UNITY "Build using unity build." ON)
 option(BUILD_SHARED_LIB_IN_DEBUG "Build shared libs if possible in debug" ON)
 option(QML_LOAD_FROM_SOURCE "Load qml files from source (not resource)" OFF)
 
-option(USE_SYSTEM_FREETYPE "Use system FreeType"          OFF) # requires freetype >= 2.5.2, does not work on win
+option(USE_SYSTEM_FREETYPE "Use system FreeType" OFF) # requires freetype >= 2.5.2, does not work on win
 option(BUILD_WEBENGINE "Built in webengine support" ON)
 set(SCRIPT_INTERFACE  TRUE)
 

build/cmake/SetupBuildEnvironment.cmake

@@ -4,6 +4,9 @@ include(GetBuildType)
 
 set(BUILD_SHARED_LIBS OFF)
 set(SHARED_LIBS_INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+
+set(CMAKE_UNITY_BUILD_BATCH_SIZE 12)
+
 if (CC_IS_GCC)
     message(STATUS "Using Compiler GCC ${CMAKE_CXX_COMPILER_VERSION}")
 
@@ -14,8 +17,6 @@ if (CC_IS_GCC)
         set(BUILD_SHARED_LIBS ON)
     endif(BUILD_IS_DEBUG)
 
-    #add_compile_options(-H)
-
 elseif(CC_IS_MSVC)
     message(STATUS "Using Compiler MSVC ${CMAKE_CXX_COMPILER_VERSION}")
 

build/module.cmake

@@ -27,6 +27,7 @@
 # set(MODULE_UI ...)            - set ui headers
 # set(MODULE_QML_IMPORT ...)    - set Qml import for QtCreator (so that there is code highlighting, jump, etc.)
 # set(MODULE_USE_PCH_NONE ON)   - set for disable PCH for module
+# set(MODULE_USE_UNITY_NONE ON) - set for disable UNITY BUILD for module
 
 
 # After all the settings you need to do:
@@ -59,7 +60,7 @@ endif()
 
 if (BUILD_PCH)
     if (MODULE_USE_PCH_NONE)
-        # disables pch for current module
+        # disabled pch for current module
     else()
         if(NOT ${MODULE} MATCHES global)
             target_precompile_headers(${MODULE} REUSE_FROM global)
@@ -70,6 +71,14 @@ if (BUILD_PCH)
     endif()
 endif(BUILD_PCH)
 
+if (BUILD_UNITY)
+    if (MODULE_USE_UNITY_NONE)
+        # disabled unity build for current module
+    else()
+        set_target_properties(${MODULE} PROPERTIES UNITY_BUILD ON)
+    endif()
+endif(BUILD_UNITY)
+
 target_sources(${MODULE} PRIVATE
     ${ui_headers}
     ${RCC_SOURCES}

src/appshell/dockwindow/docktoolbar.cpp

@@ -25,7 +25,7 @@
 
 using namespace mu::dock;
 
-static const QString qss = QString("QToolBar { background: %1; border: 0; padding: 0; }");
+static const QString qtoolbarQss = QString("QToolBar { background: %1; border: 0; padding: 0; }");
 
 static const qreal MOVING_BUTTON_WIDTH(10);
 
@@ -57,7 +57,7 @@ DockToolBar::~DockToolBar()
 void DockToolBar::onComponentCompleted()
 {
     m_tool.bar->setObjectName("w_" + objectName());
-    m_tool.bar->setStyleSheet(qss.arg(color().name()));
+    m_tool.bar->setStyleSheet(qtoolbarQss.arg(color().name()));
 
     QWidget* w = view();
     w->setMinimumWidth(minimumWidth());
@@ -67,7 +67,7 @@ void DockToolBar::onComponentCompleted()
 
 void DockToolBar::updateStyle()
 {
-    m_tool.bar->setStyleSheet(qss.arg(color().name()));
+    m_tool.bar->setStyleSheet(qtoolbarQss.arg(color().name()));
 }
 
 void DockToolBar::onToolbarEvent(QEvent* e)

src/framework/audio/CMakeLists.txt

@@ -106,6 +106,7 @@ if(OS_IS_LIN)
 endif()
 
 set(MODULE_USE_PCH_NONE ON) # strange error
+set(MODULE_USE_UNITY_NONE ON) # soloud not compile
 include(${PROJECT_SOURCE_DIR}/build/module.cmake)
 
 # for soloud

src/framework/fonts/CMakeLists.txt

@@ -39,4 +39,5 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/fontsmodule.h
     )
 
+set(MODULE_USE_UNITY_NONE ON)
 include(${PROJECT_SOURCE_DIR}/build/module.cmake)

src/framework/global/settings.cpp

@@ -120,7 +120,7 @@ void Settings::setValue(const Key& key, const Val& value)
 
     auto it = m_channels.find(key);
     if (it != m_channels.end()) {
-        Channel<Val> channel = it->second;
+        async::Channel<Val> channel = it->second;
         channel.send(value);
     }
 }
@@ -154,7 +154,7 @@ Settings::Item& Settings::findItem(const Key& key) const
     return it->second;
 }
 
-Channel<Val> Settings::valueChanged(const Key& key) const
+async::Channel<Val> Settings::valueChanged(const Key& key) const
 {
     return m_channels[key];
 }

src/framework/global/uri.cpp

@@ -27,8 +27,10 @@ const Uri::Scheme Uri::MuseScore("musescore");
 const Uri::Scheme Uri::Http("http");
 const Uri::Scheme Uri::Https("https");
 
+namespace uri_prv {
 static const std::string VAL_TRUE("true");
 static const std::string VAL_FALSE("false");
+}
 
 // musescore://module/target/name
 
@@ -120,8 +122,8 @@ void UriQuery::parceParams(const std::string& uri, Params& out) const
         std::string val = param.at(1);
 
         //! NOTE Val is bool?
-        if (VAL_TRUE == val || VAL_FALSE == val) {
-            out[key] = Val(val == VAL_TRUE);
+        if (uri_prv::VAL_TRUE == val || uri_prv::VAL_FALSE == val) {
+            out[key] = Val(val == uri_prv::VAL_TRUE);
             continue;
         }
 

src/framework/midi/internal/zerberussynth.cpp

@@ -28,11 +28,13 @@
 using namespace mu;
 using namespace mu::midi;
 
+namespace zerb_prv {
 template<class T>
 static const T& clamp(const T& v, const T& lo, const T& hi)
 {
     return (v < lo) ? lo : (hi < v) ? hi : v;
 }
+}
 
 ZerberusSynth::ZerberusSynth()
 {
@@ -200,7 +202,7 @@ void ZerberusSynth::channelSoundsOff(channel_t chan)
 bool ZerberusSynth::channelVolume(channel_t chan, float volume)
 {
     int val = static_cast<int>(volume * 100.f);
-    val = clamp(val, 0, 127);
+    val = zerb_prv::clamp(val, 0, 127);
 
     m_zerb->controller(chan, zerberus::CTRL_VOLUME, val);
     return false;

src/framework/vst/CMakeLists.txt

@@ -103,4 +103,5 @@ if (build_mode STREQUAL "debug")
     set(MODULE_DEF -D_DEBUG)
 endif()
 
+set(MODULE_USE_UNITY_NONE ON) # not linking
 include(${PROJECT_SOURCE_DIR}/build/module.cmake)

src/importexport/CMakeLists.txt

@@ -98,5 +98,6 @@ set(MODULE_LINK
     notation
     )
 
+set(MODULE_USE_UNITBUILD ON)
 include(${PROJECT_SOURCE_DIR}/build/module.cmake)
 

src/importexport/internal/bww/importbww.cpp

@@ -47,6 +47,12 @@
 #include "libmscore/volta.h"
 #include "libmscore/segment.h"
 
+
+namespace Bww {
+/**
+ The writer that imports into MuseScore.
+ */
+
 //---------------------------------------------------------
 //   addText
 //   copied from importxml.cpp
@@ -121,11 +127,6 @@ static void setTempo(Ms::Score* score, int tempo)
     segment->add(tt);
 }
 
-namespace Bww {
-/**
- The writer that imports into MuseScore.
- */
-
 class MsScWriter : public Writer
 {
 public:
@@ -439,9 +440,9 @@ void MsScWriter::header(const QString title, const QString type,
 
     //  score->setWorkTitle(title);
     Ms::VBox* vbox  = 0;
-    addText(vbox, score, title, Ms::Tid::TITLE);
-    addText(vbox, score, type, Ms::Tid::SUBTITLE);
-    addText(vbox, score, composer, Ms::Tid::COMPOSER);
+    Bww::addText(vbox, score, title, Ms::Tid::TITLE);
+    Bww::addText(vbox, score, type, Ms::Tid::SUBTITLE);
+    Bww::addText(vbox, score, composer, Ms::Tid::COMPOSER);
     // addText(vbox, score, strPoet, Ms::Tid::POET);
     // addText(vbox, score, strTranslator, Ms::Tid::TRANSLATOR);
     if (vbox) {

src/importexport/internal/musicxml/importmxmllogger.cpp

@@ -32,7 +32,9 @@ static QString xmlLocation(const QXmlStreamReader* const xmlreader)
 //   logDebugTrace
 //---------------------------------------------------------
 
-static void log(MxmlLogger::Level level, const QString& text, const QXmlStreamReader* const xmlreader)
+namespace ixl_prv {
+
+static void to_log(MxmlLogger::Level level, const QString& text, const QXmlStreamReader* const xmlreader)
 {
     QString str;
     switch (level) {
@@ -52,6 +54,7 @@ static void log(MxmlLogger::Level level, const QString& text, const QXmlStreamRe
 
     qDebug("%s", qPrintable(str));
 }
+}
 
 //---------------------------------------------------------
 //   logDebugTrace
@@ -64,7 +67,7 @@ static void log(MxmlLogger::Level level, const QString& text, const QXmlStreamRe
 void MxmlLogger::logDebugTrace(const QString& trace, const QXmlStreamReader* const xmlreader)
 {
     if (_level <= Level::MXML_TRACE) {
-        log(Level::MXML_TRACE, trace, xmlreader);
+        ixl_prv::to_log(Level::MXML_TRACE, trace, xmlreader);
     }
 }
 
@@ -79,7 +82,7 @@ void MxmlLogger::logDebugTrace(const QString& trace, const QXmlStreamReader* con
 void MxmlLogger::logDebugInfo(const QString& info, const QXmlStreamReader* const xmlreader)
 {
     if (_level <= Level::MXML_INFO) {
-        log(Level::MXML_INFO, info, xmlreader);
+        ixl_prv::to_log(Level::MXML_INFO, info, xmlreader);
     }
 }
 
@@ -94,7 +97,7 @@ void MxmlLogger::logDebugInfo(const QString& info, const QXmlStreamReader* const
 void MxmlLogger::logError(const QString& error, const QXmlStreamReader* const xmlreader)
 {
     if (_level <= Level::MXML_ERROR) {
-        log(Level::MXML_ERROR, error, xmlreader);
+        ixl_prv::to_log(Level::MXML_ERROR, error, xmlreader);
     }
 }
 }

src/importexport/internal/musicxml/importmxmlpass2.cpp

@@ -580,6 +580,7 @@ static void setPartInstruments(MxmlLogger* logger, const QXmlStreamReader* const
 /**
  Convert SMuFL code points to MuseScore <sym>...</sym>
  */
+namespace xmlpass2 {
 
 static QString text2syms(const QString& t)
 {
@@ -640,6 +641,7 @@ static QString text2syms(const QString& t)
     //qDebug("text2syms total time elapsed: %d ms, res '%s'", time.elapsed(), qPrintable(res));
     return res;
 }
+}
 
 //---------------------------------------------------------
 //   decodeEntities
@@ -649,6 +651,8 @@ static QString text2syms(const QString& t)
  Decode &#...; in string \a src into UNICODE (utf8) character.
  */
 
+namespace xmlpass2 {
+
 static QString decodeEntities(const QString& src)
 {
     QString ret(src);
@@ -663,6 +667,8 @@ static QString decodeEntities(const QString& src)
     return ret;
 }
 
+}
+
 //---------------------------------------------------------
 //   nextPartOfFormattedString
 //---------------------------------------------------------
@@ -673,6 +679,8 @@ static QString decodeEntities(const QString& src)
  Read the next part of a MusicXML formatted string and convert to MuseScore internal encoding.
  */
 
+namespace xmlpass2 {
+
 static QString nextPartOfFormattedString(QXmlStreamReader& e)
 {
     //QString lang       = e.attribute(QString("xml:lang"), "it");
@@ -685,8 +693,8 @@ static QString nextPartOfFormattedString(QXmlStreamReader& e)
 
     QString txt        = e.readElementText();
     // replace HTML entities
-    txt = decodeEntities(txt);
-    QString syms       = text2syms(txt);
+    txt = xmlpass2::decodeEntities(txt);
+    QString syms       = xmlpass2::text2syms(txt);
 
     QString importedtext;
 
@@ -736,6 +744,8 @@ static QString nextPartOfFormattedString(QXmlStreamReader& e)
     return importedtext;
 }
 
+}
+
 //---------------------------------------------------------
 //   addLyric
 //---------------------------------------------------------
@@ -2647,13 +2657,13 @@ void MusicXMLParserDirection::directionType(QList<MusicXmlSpannerDesc>& starts,
             _metroText = metronome(_tpoMetro);
         } else if (_e.name() == "words") {
             _enclosure      = _e.attributes().value("enclosure").toString();
-            _wordsText += nextPartOfFormattedString(_e);
+            _wordsText += xmlpass2::nextPartOfFormattedString(_e);
         } else if (_e.name() == "rehearsal") {
             _enclosure      = _e.attributes().value("enclosure").toString();
             if (_enclosure == "") {
                 _enclosure = "square";          // note different default
             }
-            _rehearsalText += nextPartOfFormattedString(_e);
+            _rehearsalText += xmlpass2::nextPartOfFormattedString(_e);
         } else if (_e.name() == "pedal") {
             pedal(type, n, starts, stops);
         } else if (_e.name() == "octave-shift") {
@@ -5408,7 +5418,7 @@ void MusicXMLParserLyric::parse()
              formattedText += " ";
              else
              */
-            formattedText += nextPartOfFormattedString(_e);
+            formattedText += xmlpass2::nextPartOfFormattedString(_e);
         } else if (_e.name() == "extend") {
             hasExtend = true;
             extendType = _e.attributes().value("type").toString();
@@ -5427,7 +5437,7 @@ void MusicXMLParserLyric::parse()
                 qDebug("unknown syllabic %s", qPrintable(syll));                      // TODO
             }
         } else if (_e.name() == "text") {
-            formattedText += nextPartOfFormattedString(_e);
+            formattedText += xmlpass2::nextPartOfFormattedString(_e);
         } else {
             skipLogCurrElem();
         }