Skip to content
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.

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

Compilation under MSVC #3796

Merged
merged 5 commits into from Aug 4, 2018
Merged

Commits on Aug 3, 2018

  1. This commit contains all the changes to the CMake build system requir…

    …ed to generate a valid Visual Studio 2017 solution and projects for MuseScore.
    
    In detail, changes are as follows:
    - Changed .gitignore to ignore VS-specific files and directories.
    - VS uses a global settings file for the CMake build process: CMakeSettings.json. This is a text file, which is conceptually equivalent to the Makefile used to invoke CMake through Make. This file might need to be changed on an individual user basis, if dependencies are not installed in default paths.
    - New cmake macros to copy files in build\CopyFilesMacros.cmake. The code is from https://cmake.org/pipermail/cmake/2009-March/027892.html
    - Pre-compiled headers: Visual Studio requires to create pre-compiled headers per-project (a general per-solution PCH file, although possible, is extremely problematic and not recommended). Therefore, the  new macro vstudio_pch in CreatePrecompiledHeader.cmake was created to add the pre-compiled header creation step to an existing target (similar to what is done for XCode). The existing macro precompiled_header was modified to set the values for a group of variables. As part of this, the empty file all.cpp was added to the root of the source tree, as VS requires a source file to create pre-compiled headers (the header file alone can not be compiled).
    - all.h is not copied to binary dir for MSVC, as I could determine no need to do this. Because of this, and the differences in PCH handling, the pseudo-targets mops1 and mops2 are not created for MSVC.
    - Revised all steps conditional on toolchain, and added MSVC paths as needed. In many instances, the MSVC path is the same as the MINGW path, but not always.
    - The manual (genManual) target used the getopt() functionality defined in POSIX libraries, which is not available on Windows. An LGPL'd port of getopt() for Windows was added in manual\getopt. The original source is in GitHub: nanoporetech/getopt-win32, based on a CodeProject article: https://www.codeproject.com/KB/cpp/getopt4win.aspx?msg=3987371. The corresponding CMakeLists.txt file was modified to include this files when compiling with MSVC.
    - Changes in CMakeLists.txt files to create valid MSVC targets. The changes, always conditional on the MSVC toolchain, consist of:
         x Setting target properties for MSVC
         x Using all.h in source dir
         x Adding pre-compiled headers to target
         x Removing dependency from mops1 and mops2
    
    Notes:
    - The INSTALL target has NOT BEEN UPDATED for MSVC.
    afdeprado authored and handrok committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    188386b View commit details
    Browse the repository at this point in the history
  2. Solved all compilation errors on MSVC

    This commit contains changes required for MuseScore to compile under MSVC with no errors.
    
    There are several general categories of problems that resulted in errors with the compilation. Main issues:
    - Variable Length Arrays (VLA). This is a non-standard extension to C++, supported by clang toolchains, but not by MSVC. The initial workaround is to use std::vector<> instead of VLAs, eventually (if needed) with the original variable pointing to the beginning of the allocated array. More efficient alternatives are possible if profiling shows any code using VLAs to be timing-critical.
    - Floating-point constants not suffixed with "f" are doubles by default; in some instances, this leads to narrowing conversion errors (in other instances, just warnings).
    - MSVC does not support "or"/"and"/"not" in lieu of "||"/"&&"/"!". Changed unconditionally to use standard C++ symbols.
    - MSVC does not support the "__builtin_unreachable()" compiler hint. A similar, albeit not exactly equal, alternative is "__assume(0)", which is MSVC-specific.
    - MSVC does not support ranges in case statements. Replaced with list of cases instead of range (non-conditionally)
    
    Detailed changes, with per-file comments:
    
    - all.h: opt-in to deprecated features, include <io.h> and <process.h> instead of POSIX <unistd.h>, undefine "STRING_NONE" and "small", which Microsoft defines as macros, which result in compilation errors.
    - effects/compressor/zita.cpp: eliminated narrowing conversion error by appending "f" to float constants.
    - fluid/voice.cpp: appended "f" to float constants to eliminate narrowing conversion errors/warnings
    - libmscore/beam.cpp: conditionally replaced VLA
    - libmscore/edit.cpp: conditionally replaced VLA
    - libmscore/element.cpp: appended "f" to float constant
    - libmscore/fret.cpp: changed or -> ||
    - libmscore/layout.cpp: conditionally replaced VLA
    - libmscore/mscore.cpp: conditionally replaced "__builtin_unreachable()" with "__assume(0)" for MSVC
    - libmscore/scorefile.coo: use correct char representation conversion for MSVC
    - libmscore/stringdata.cpp: conditionally replaced VLA
    - libmscore/system.cpp: conditionally replaced VLA
    - libmscroe/text.cpp: replaced range in case statement.
    - manual/genManual.cpp: use getopt() replacement.
    - midi/midifile.cpp: conditionally replaced VLA. This does not use the default replacement.
    - mscore/bb.cpp: replaced range in case statement.
    - mscore/capella.cpp: conditionally replaced VLA. Changed and -> &&
    - mscore/driver:cpp: preclude errors due to macro redefinitions.
    - mscore/editstyle.cpp: conditionally replaced "__builtin_unreachable()" with "__assume(0)" for MSVC
    - mscore/importgtp-gp6.cpp: conditionally replaced VLA.
    - mscore/instrwidget.cpp: conditionally replaced VLA.
    - mscore/jackaudio.cpp: conditionally replaced VLA. Preclude errors due to macro redefinitions.
    - mscore/jackweakapi.cpp: Preclude errors due to macro redefinitions. Replacement for __atribute__((constructor)) through static object construction for MSVC. Force use of LoadLibraryA instead of LoadLibrary.
    - mscore/mididriver.h: Changed not -> !
    - mscore/musescore.cpp: Changed not -> !. Conditionally replaced VLA.
    - mscore/resourceManager.cpp: conditionally replaced VLA.
    - mscore/timeline.cpp: conditionally replaced VLA.
    - omr/omrpage.cpp: conditionally replaced VLA.
    - synthesizer/msynthesizer.cpp: replaced UNIX sleep(1) method with MSVC Sleep(1000) (equivalent, but in ms instead of seconds)
    - synthesizer/msynthsizer.h: appended "f" to float constant
    - thirdparty/poppler/config.h: set defines for MSVC to preclude the use of inexistent libraries.
    - thirdparty/poppler/poppler/poppler-config.h: set defines for MSVC to preclude the use of inexistent libraries. Eliminated #defines for fmin and fmax which where causing problems.
    - thirdparty/poppler/poppler/PSOutputDev.cc: added #include <algorithm> for  std::min() and std::max(). Note this is required per-C++ standard.
    - thirdparty/portmidi/pm_win/pmwinmm.c: undefined UNICODE to use char-based library functions.
    - thirdparty/qzip/qzip.cpp: changed or -> ||
    - thirdparty/rtf2html/rtf_keyword.h: file format changed from Apple to UNIX, as MSVC does not supported the former.
    
    (NOT error related, just improvement on previous commit; manual/getopt/README.md: added link to source article)
    afdeprado authored and handrok committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    3acc363 View commit details
    Browse the repository at this point in the history
  3. This commit contains changes required for MuseScore to compile under …

    …MSVC with no warnings.
    
    This commit contains changes required for MuseScore to compile under MSVC with no warnings.
    
    MuseScore is being compiled with the /W4 setting (warning level 4), which is similar to -wall -wextra on clang. This generates lots of warnings on MSVC, mainly for non-standard constructs and for constructs which might be bugs or might lead to bugs.
    
    Most warnings are in the following categories:
    - Name hiding: a variable hides a variable with the same name on a larger scope (or a field, or a function parameter). This can easily lead to bugs, and it is a best practice to avoid hiding variable names (see recommendation ES.12 in the C++ Core Guidelines by Stroustrop & Sutter (http://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Res-reuse : ES.12: Do not reuse names in nested scopes)
    - Narrowing conversion: a numeric conversion results in loss of significant digits (for example, double -> float). The general recommendation is to use a cast to indicate this is designed behaviour.
    - Unreachable code: in several instances, there is unreachable code. The unreachable code is commented out.
    - (Potentially) uninitialized local variable. Just initialized the vars.
    - foreach(,) -> for(:): this does not generate a warning per-se (only a few of these generate warnings due to name hiding), but changed in keeping with "MuseScore Coding Rules" (https://musescore.org/en/handbook/musescore-coding-rules#Loops), which tells explicitly "Use C++11's "for" instead of Qt's "foreach":" ... "If you happen to be fixing some code and see a "foreach", please change that loop into a "for"."
    
    Most changes are in the categories indicated above. The next listing shows detailed changes for files which are *not* of the aforementioned types.
    
    - all.h: Disable warning C4127 (conditional expression is constant - generated in Qt header file qvector.h)
    - awl/aslider.h: unreachable code.
    - awl/knob.cpp: name hiding
    - awl/mslider.cpp: name hiding
    - awl/slider.cpp: name hiding
    - bww2mxml/parser.cpp: name hiding
    - effects/compressor/compressor.cpp: narrowing conversion
    - effects/zita1/zitagui.cpp: name hiding
    - fluid/fluid.cpp: foreach replacement. Name hiding.
    - fluid/mod.cpp: name hiding.
    - fluid/sfont.cpp: foreach replacement. Name hiding. Initialize vars.
    - fluid/voice.cpp: Name hiding.
    - libmscore/accidental.cpp: Name hiding.
    - libmscore/ambitus.cpp: Initialize vars.
    - libmscore/barline.cpp: Name hiding. Unreachable code.
    - libmscore/beam.cpp: Name hiding.
    - libmscore/chordrest.cpp: Unreachable code.
    - libmscore/scorefile.cpp: Name hiding.
    - manual/genManual.cpp: Name hiding. foreach replacement.
    - midi/midifile.cpp: Name hiding. Unreachable code.
    - omr/importpdf.cpp: Name hiding. foreach replacement.
    - omr/omr.cpp: Name hiding. foreach replacement.
    - omr/omrpage.cpp: Name hiding. foreach replacement.
    - omr/omrview.cpp: Name hiding. foreach replacement.
    - synthesizer/event.cpp: Unreachable code.
    - zerberus\channel.cpp: Narrowing conversion.
    - zerberus\instrument.cpp: Name hiding.
    - zerberus\sfz.cpp: Name hiding.
    - zerberus\voice.h: Suppress warning C4201: "nonstandard extension used: nameless struct/union"
    - zerberus\zerberus.cpp: Name hiding. Unreferenced parameter.
    - zerberus\zerberusgui.cpp: Name hiding.
    afdeprado authored and handrok committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    33dff96 View commit details
    Browse the repository at this point in the history
  4. This commit contains changes to third-party code required to compile …

    …under MSVC with no warnings.
    
    This commit contains changes to third-party code required to compile under MSVC with no warnings.
    
    The changes in this commit are only for files in third-party code, which might be better to leave untouched for the time being.
    
    MuseScore is being compiled with the /W4 setting (warning level 4), which is similar to -wall -wextra on clang. This generates lots of warnings on MSVC, mainly for non-standard constructs and for constructs which might be bugs or might lead to bugs.
    
    Most warnings are in the following categories:
    - Name hiding: a variable hides a variable with the same name on a larger scope (or a field, or a function parameter). This can easily lead to bugs, and it is a best practice to avoid hiding variable names (see recommendation ES.12 in the C++ Core Guidelines by Stroustrop & Sutter (http://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Res-reuse : ES.12: Do not reuse names in nested scopes)
    - Narrowing conversion: a numeric conversion results in loss of significant digits (for example, double -> float). The general recommendation is to use a cast to indicate this is designed behaviour.
    - Unreachable code: in several instances, there is unreachable code. The unreachable code is commented out.
    - (Potentially) uninitialized local variable. Just initialized the vars.
    - foreach(,) -> for(:): this does not generate a warning per-se (only a few of these generate warnings due to name hiding), but changed in keeping with "MuseScore Coding Rules" (https://musescore.org/en/handbook/musescore-coding-rules#Loops), which tells explicitly "Use C++11's "for" instead of Qt's "foreach":" ... "If you happen to be fixing some code and see a "foreach", please change that loop into a "for"."
    
    Most changes are in the categories indicated above. The next listing shows detailed changes for files which are *not* of the aforementioned types.
    
    - thirdparty/diff/diff_match_patch.cpp: foreach replacement. Unreachable code.
    - thirdparty/freetype/src/base/ftobjs.c: Unreachable code.
    - thirdparty/freetype/src/base/ftoutln.c: Initialize vars.
    - thirdparty/freetype/src/truetype/ttgload.c: Initialize vars.
    - thirdparty/kQOAuth/kqoauthrequest.cpp: Unreachable code.
    - thirdparty\ofqf\qoscserver.cpp: Name hiding.
    - thirdparty\portmidi\pm_common\portmidi.c: Name hiding. Unreferenced parameters.
    - thirdparty\portmidi\pm_win\pmwin.c: Unreachable code.
    - thirdparty\portmidi\pm_win\pmwinmm.c: Unreferenced locals. Unreferenced parameters. Assignment within conditional.
    - thirdparty\portmidi\porttime\porttime.c: Suppress warning C4206: "nonstandard extension used: translation unit is empty"
    - thirdparty\portmidi\porttime\ptwinmm.c: Unreferenced parameters.
    - thirdparty\qzip\qzip.cpp: Name hiding.
    - thirdparty\rtf2html\rtf2html.cpp: Name hiding.
    afdeprado authored and handrok committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    7475b86 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2018

  1. Compile under MSVC: this commit caontais all changes to run MSVC build

    1) fix some bugs which appear in runtime:  replace QString::tostdstring() to Foo.toUtf8().constData().
    
    2) Enable start center online community. To use it you need download webengine in your QT lib. see instruction https://musescore.org/en/handbook/developers-handbook/compilation/compile-instructions-windows-visual-studio-2017-wip
    
    3) update install steps. Add additional dlls for webEngine. Add copying dlls and musescore.exe to /msvc.install/bin folder. Run project will work with the "$(ProjectDir)\..\..\msvc.install\bin\MuseScore.exe" specified in Debugging field in mscore project
    
    4) Moving AppVeyor from MinGW to MSVC. Exclude ALL MSVC project from INSTALL project. Exclude ALL from PACKAGE. Remove migw-cmake in script build, add .bat instead. Remove xcopy from 7z archive step
    
    5) Fix warning : Warning C4703 potentially uninitialized local pointer variable '' used; Warning C4456 declaration of '' hides previous local declaration; Warning C4458 declaration of '' hides class member
    
    6) Change path to 11 version wix toolset which created .msi installer package
    handrok committed Aug 4, 2018
    6 Configuration menu
    Copy the full SHA
    df114f1 View commit details
    Browse the repository at this point in the history