Update master

.appveyor.yml

@@ -19,5 +19,9 @@ build_script:
   - cmake -DUSE_COMPILE_CACHE=ON -DCACHE_TOOL=%APPVEYOR_BUILD_FOLDER%/clcache.4.1.0/clcache-4.1.0/clcache.exe -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=c:/Qt/5.12/msvc2017%QT_SUFFIX%;c:/tools/vcpkg/installed/%PLATFORM%-windows -DCMAKE_GENERATOR_PLATFORM="%CMAKE_PLATFORM%" ..
   - cmake --build . -- /maxcpucount:4
   - cmake --build . --target tests
+  - cmake --build . --target package
+artifacts:
+  - path: 'build\lmms-*.exe'
+    name: Installer
 cache:
   - c:/tools/vcpkg/installed

.circleci/config.yml

@@ -12,6 +12,18 @@ shared:
       key: ccache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}-{{ .BuildNum }}
       paths:
         - ~/.ccache
+  restore_homebrew_cache: &restore_homebrew_cache
+    restore_cache:
+      keys:
+        - homebrew-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}
+        - homebrew-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
+        - homebrew-{{ arch }}
+  save_homebrew_cache: &save_homebrew_cache
+    save_cache:
+      key: homebrew-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}-{{ .BuildNum }}
+      paths:
+        - ~/Library/Caches/Homebrew
+        - /usr/local/Homebrew
 
   ccache_stats: &ccache_stats
     run:
@@ -30,6 +42,14 @@ shared:
         mkdir -p /tmp/artifacts
         # Workaround for failing submodule fetching
         git config --global --unset url."ssh://git@github.com".insteadOf || true
+        if [[ -n "${CIRCLE_PR_NUMBER}" ]]
+        then
+            echo "Fetching out merged pull request"
+            git fetch -u origin refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/merge
+            git checkout pr/merge
+        else
+            echo "Not a pull request"
+        fi
 
   # Commmon environment variables
   common_environment: &common_environment
@@ -59,6 +79,15 @@ jobs:
       - run:
           name: Build tests
           command: cd build && make tests
+      - run:
+          name: Build installer
+          command: |
+            cd build
+            make package
+            cp ./lmms-*.exe /tmp/artifacts/
+      - store_artifacts:
+          path: /tmp/artifacts/
+          destination: /
       - *ccache_stats
       - *save_cache
   mingw64:
@@ -79,11 +108,20 @@ jobs:
       - run:
           name: Build tests
           command: cd build && make tests
+      - run:
+          name: Build installer
+          command: |
+            cd build
+            make package
+            cp ./lmms-*.exe /tmp/artifacts/
+      - store_artifacts:
+          path: /tmp/artifacts/
+          destination: /
       - *ccache_stats
       - *save_cache
   linux.gcc:
     docker:
-      - image: lmmsci/linux.gcc:18.04
+      - image: lmmsci/linux.gcc:16.04
     environment:
       <<: *common_environment
     steps:
@@ -92,7 +130,10 @@ jobs:
       - *restore_cache
       - run:
           name: Configure
-          command: mkdir build && cd build && cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
+          command: |
+            source /opt/qt5*/bin/qt5*-env.sh || true
+            mkdir build && cd build
+            cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
       - run:
           name: Build
           command: cd build && make
@@ -125,10 +166,53 @@ jobs:
       - run:
           name: Shellcheck
           command: shellcheck $(find "./cmake/" -type f -name '*.sh' -o -name "*.sh.in")
+  macos:
+    environment:
+      <<: *common_environment
+    macos:
+      xcode: "9.3.1"
+    steps:
+      - checkout
+      - *init
+      - *restore_homebrew_cache
+      - *restore_cache
+      - run:
+          name: Install Homebrew dependencies
+          command: brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla
+      - run:
+          name: Install nodejs dependencies
+          command: npm install -g appdmg
+      - run:
+          name: Building
+          command: |
+            mkdir build && cd build
+            cmake .. -DCMAKE_INSTALL_PREFIX="../target" -DCMAKE_PREFIX_PATH="$(brew --prefix qt5)" $CMAKE_OPTS -DUSE_WERROR=OFF
+            make
+      - run:
+          name: Build tests
+          command: cd build && make tests
+      - run:
+          name: Run tests
+          command: build/tests/tests
+      - run:
+          name: Build DMG
+          command: |
+            cd build
+            make install
+            make dmg
+            cp ./lmms-*.dmg /tmp/artifacts/
+      - store_artifacts:
+          path: /tmp/artifacts/
+          destination: /
+      - *save_cache
+      - *save_homebrew_cache
+
+
 workflows:
   version: 2
   build-and-test:
     jobs:
+      - macos
       - mingw32
       - mingw64
       - linux.gcc

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+# Please search the issue tracker for existing bug reports before submitting your own. Delete this line to confirm no similar report has been posted yet.
+
+### Bug Summary
+
+#### Steps to reproduce
+
+#### Expected behavior
+
+#### Actual behavior
+
+#### Screenshot
+
+#### LMMS version used
+
+#### Logs
+<details>
+  <summary>Click to expand</summary>
+<pre>
+<!-- paste logs here -->
+</pre>
+</details>

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+- name: Get help on Discord
+  url: https://lmms.io/chat/
+  about: Need help? Have a question? Reach out to other LMMS users on our Discord server!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+# Please search the issue tracker for existing feature requests before submitting your own. Delete this line to confirm no similar request has been posted yet.
+
+### Enhancement Summary
+
+#### Justification
+
+#### Mockup
+
+<!-- If your request encompasses changes to the user interface, provide a mockup of your proposal here -->

.mailmap

@@ -29,3 +29,5 @@ grejppi <grejppi@gmail.com>
 Johannes Lorenz <j.git@lorenz-ho.me> <johannes89@mailueberfall.de>
 Johannes Lorenz <j.git@lorenz-ho.me> <1042576+JohannesLorenz@users.noreply.github.com>
 Noah Brecht <noahb2713@gmail.com>
+Olivier Humbert <trebmuh@tuxfamily.org> <trebmuh@users.noreply.github.com>
+Hussam al-Homsi <sawuare@gmail.com> Hussam Eddin Alhomsi <hussameddin.alhomsi@gmail.com>

.travis.yml

@@ -11,8 +11,6 @@ matrix:
     include:
         - env: TYPE=style
         - os: linux
-        - env: TARGET_OS=win32
-        - env: TARGET_OS=win64
         - env: TARGET_OS=debian-sid TARGET_DEPLOY=True
           git:
               depth: false
@@ -24,7 +22,7 @@ matrix:
           git:
               depth: false
         - os: osx
-          osx_image: xcode8.3
+          osx_image: xcode9.4
 before_install:
     # appdmg doesn't work with old Node.js
     - if [ "$TRAVIS_OS_NAME" = osx ]; then nvm install 10; fi

.travis/script.sh

@@ -42,5 +42,7 @@ else
 	fi
 
 	echo "Uploading $PACKAGE to transfer.sh..."
-	curl --upload-file "$PACKAGE" "https://transfer.sh/$PACKAGE" || true
+	# Limit the connection time to 3 minutes and total upload time to 5 minutes
+	# Otherwise the build may hang
+	curl --connect-timeout 180 --max-time 300 --upload-file "$PACKAGE" "https://transfer.sh/$PACKAGE" || true
 fi

CMakeLists.txt

@@ -3,6 +3,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 PROJECT(lmms)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+SET(LMMS_BINARY_DIR ${CMAKE_BINARY_DIR})
+SET(LMMS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 IF(COMMAND CMAKE_POLICY)
 	CMAKE_POLICY(SET CMP0005 NEW)
@@ -13,8 +15,10 @@ IF(COMMAND CMAKE_POLICY)
 		CMAKE_POLICY(SET CMP0050 OLD)
 	ENDIF()
 	CMAKE_POLICY(SET CMP0020 NEW)
+	CMAKE_POLICY(SET CMP0057 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
 
+INCLUDE(PluginList)
 INCLUDE(CheckSubmodules)
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFiles)
@@ -32,7 +36,7 @@ SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software"
 SET(PROJECT_COPYRIGHT   "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
 SET(VERSION_MAJOR       "1")
 SET(VERSION_MINOR       "2")
-SET(VERSION_RELEASE     "0")
+SET(VERSION_RELEASE     "1")
 SET(VERSION_STAGE       "")
 SET(VERSION_BUILD       "0")
 SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
@@ -140,7 +144,7 @@ CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
-FIND_PACKAGE(Qt5 COMPONENTS Core Gui Widgets Xml REQUIRED)
+FIND_PACKAGE(Qt5 5.6.0 COMPONENTS Core Gui Widgets Xml REQUIRED)
 FIND_PACKAGE(Qt5 COMPONENTS LinguistTools QUIET)
 
 INCLUDE_DIRECTORIES(
@@ -434,9 +438,9 @@ If(WANT_GIG)
 ENDIF(WANT_GIG)
 
 # check for pthreads
-IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 	FIND_PACKAGE(Threads)
-ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 
 # check for sndio (roaraudio won't work yet)
 IF(WANT_SNDIO)
@@ -565,8 +569,8 @@ ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)
 
-# post-install tasks
-ADD_SUBDIRECTORY(cmake/postinstall)
+# install tasks
+ADD_SUBDIRECTORY(cmake/install)
 
 ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
 				COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
@@ -706,4 +710,9 @@ MESSAGE(
 "\n\n")
 
 SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${BIN_DIR}")
+if(MSVC)
+	# We can't set this on the install time according to the configuration
+	SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
+	SET(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+endif()
 INCLUDE(InstallRequiredSystemLibraries)

cmake/install/CMakeLists.txt

@@ -0,0 +1,41 @@
+SET(PLUGIN_FILES "")
+IF(LMMS_BUILD_WIN32)
+	INSTALL(FILES $<TARGET_FILE:Qt5::QWindowsIntegrationPlugin> DESTINATION platforms)
+ENDIF()
+
+IF(LMMS_BUILD_WIN32 OR LMMS_INSTALL_DEPENDENCIES)
+	include(InstallTargetDependencies)
+
+	# Collect directories to search for DLLs
+	GET_FILENAME_COMPONENT(QTBIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
+	set(LIB_DIRS "${QTBIN_DIR}")
+
+	GET_PROPERTY(PLUGINS_BUILT GLOBAL PROPERTY PLUGINS_BUILT)
+
+	IF(LMMS_BUILD_WIN32)
+		SET(LMMS_DEP_DESTINATION ${BIN_DIR})
+		SET(PLUGIN_DEP_DESTINATION ${BIN_DIR})
+	ELSE()
+		SET(LMMS_DEP_DESTINATION ${LIB_DIR})
+		SET(PLUGIN_DEP_DESTINATION ${LIB_DIR})
+	ENDIF()
+
+	INSTALL_TARGET_DEPENDENCIES(
+			NAME "main_binary"
+			TARGETS lmms
+			DESTINATION "${LMMS_DEP_DESTINATION}"
+			LIB_DIRS  ${LIB_DIRS}
+	)
+
+	INSTALL_TARGET_DEPENDENCIES(
+			NAME "plugins"
+			TARGETS ${PLUGINS_BUILT}
+			DESTINATION ${PLUGIN_DEP_DESTINATION}
+			LIB_DIRS ${LIB_DIRS} "${PLUGIN_DIR}"
+	)
+ENDIF()
+
+IF(LMMS_BUILD_APPLE)
+	INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/install_apple.sh)")
+	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_BINARY_DIR}/install_apple.sh)")
+ENDIF()

cmake/install/excludelist-win

@@ -0,0 +1,23 @@
+# List of DLLs considered to be system libraries.
+# This is needed when cross-compiling for Windows.
+ADVAPI32.dll
+COMCTL32.dll
+comdlg32.dll
+dwmapi.dll
+GDI32.dll
+IMM32.dll
+KERNEL32.dll
+MPR.DLL
+msvcrt.dll
+ole32.dll
+OLEAUT32.dll
+OPENGL32.DLL
+SHELL32.dll
+USER32.dll
+UxTheme.dll
+VERSION.dll
+WINMM.DLL
+WS2_32.dll
+RPCRT4.dll
+dsound.dll
+SETUPAPI.dll

cmake/linux/lmms.desktop

@@ -3,11 +3,11 @@ Name=LMMS
 GenericName=Music production suite
 GenericName[ca]=Programari de producció musical
 GenericName[de]=Software zur Musik-Produktion
-GenericName[fr]=Ensemble pour la production musicale
+GenericName[fr]=Suite de production musicale
 GenericName[pl]=Narzędzia do produkcji muzyki
 Comment=Music sequencer and synthesizer
 Comment[ca]=Producció fàcil de música per a tothom!
-Comment[fr]=Production facile de musique pour tout le monde !
+Comment[fr]=Séquenceur et synthétiseur de musique
 Comment[pl]=Prosta produkcja muzyki dla każdego!
 Icon=lmms
 Exec=lmms %f