Merge pull request #2210 from tresf/2201-root-refactor

Cleanup root directory

.travis/linux.win32.script.sh

@@ -1,2 +1,2 @@
 export CMAKE_OPTS="-DUSE_WERROR=ON"
-../build_mingw32 || ../build_mingw32
+../cmake/build_mingw32.sh || ../cmake/build_mingw32.sh

.travis/linux.win64.script.sh

@@ -1,2 +1,2 @@
 export CMAKE_OPTS="-DUSE_WERROR=ON"
-../build_mingw64 || ../build_mingw64
+../cmake/build_mingw64.sh || ../cmake/build_mingw64.sh

CMakeLists.txt

@@ -13,13 +13,27 @@ INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFiles)
 INCLUDE(FindPkgConfig)
 
-SET(VERSION_MAJOR "1")
-SET(VERSION_MINOR "1")
-SET(VERSION_PATCH "3")
-#SET(VERSION_SUFFIX "")
-SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+STRING(TOUPPER          "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)
+
+# Timestamp available since cmake 2.8.11
+IF(CMAKE_VERSION VERSION_LESS "2.8.11")
+	SET(PROJECT_YEAR        "2015")
+ELSE()
+	STRING(TIMESTAMP        PROJECT_YEAR "%Y")
+ENDIF()
+
+SET(PROJECT_AUTHOR      "LMMS Developers")
+SET(PROJECT_URL         "http://lmms.io")
+SET(PROJECT_EMAIL       "[email protected]")
+SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software")
+SET(PROJECT_COPYRIGHT   "${PROJECT_AUTHOR}, 2008-${PROJECT_YEAR}")
+SET(VERSION_MAJOR       "1")
+SET(VERSION_MINOR       "1")
+SET(VERSION_PATCH       "3")
+#SET(VERSION_SUFFIX     "")
+SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
-	SET(VERSION "${VERSION}-${VERSION_SUFFIX}")
+	SET(VERSION     "${VERSION}-${VERSION_SUFFIX}")
 ENDIF(VERSION_SUFFIX)
 
 INCLUDE(DetectMachine)
@@ -363,12 +377,6 @@ ENDIF(LMMS_BUILD_WIN32)
 # check for libsamplerate
 PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
 
-
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
-
 # set compiler flags
 SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
 OPTION(USE_WERROR "Add -werror to the build flags. Stops the build on warnings" OFF)
@@ -426,35 +434,23 @@ ENDIF(WIN32 OR WIN64)
 # we somehow have to make LMMS-binary depend on MOC-files
 ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h")
 
-# set up apple vars before traversing into data/scripts
-SET(MACOSX_BUNDLE_ICON_FILE "lmms.icns")
-SET(MACOSX_BUNDLE_GUI_IDENTIFIER "LMMS")
-SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
-SET(MACOSX_BUNDLE_BUNDLE_NAME "LMMS")
-SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}")
-SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}")
-SET(MACOSX_BUNDLE_COPYRIGHT "Tobias Doerffel, 2008-2010")
-SET(MACOSX_BUNDLE_MIMETYPE "application/x-lmms-project")
-SET(MACOSX_BUNDLE_MIMETYPE_ICON "project.icns")
-SET(MACOSX_BUNDLE_MIMETYPE_ID "net.sourceforge.lmms")
-SET(MACOSX_BUNDLE_PROJECT_URL "http://lmms.io")
-
 IF(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
 ELSE(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
 ENDIF(WIN32)
 
 # make sub-directories
+ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(plugins)
 ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)
 
 ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
-				COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\""
-				DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1"
+				COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/doc/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\""
+				DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
 				COMMENT "Generating lmms.1.gz")
 
 ADD_CUSTOM_TARGET(manpage ALL
@@ -496,7 +492,7 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND make clean
 			COMMAND rm -rf "${TMP}"
 			COMMAND mkdir -p "${TMP}"
-			COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO "${TMP}"
+			COMMAND cp CMakeLists.txt LICENSE.txt INSTALL.txt README.md "${TMP}"
 			COMMAND cp -r buildtools cmake data doc include plugins src "${TMP}"
 			COMMAND rm -rf `find "${TMP}" -name cmake_install.cmake` `find "${TMP}" -name Makefile` `find "${TMP}" -type d -name CMakeFiles` "${TMP}/CMakeCache.txt"
 			COMMAND tar cjf lmms-${VERSION}-src.tar.bz2 "${TMP}"
@@ -565,59 +561,4 @@ MESSAGE(
 "\n\n")
 
 INCLUDE(InstallRequiredSystemLibraries)
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LMMS - easy music production for everyone!")
-SET(CPACK_PACKAGE_VENDOR "LMMS Developers")
-IF(LMMS_BUILD_APPLE)
-	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/README" "${CMAKE_BINARY_DIR}/README.txt" COPYONLY)
-	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_BINARY_DIR}/COPYING.txt" COPYONLY)
-	SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/README.txt")
-	SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt")
-ELSE(LMMS_BUILD_APPLE)
-	SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
-	SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
-ENDIF(LMMS_BUILD_APPLE)
-
-SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
-IF(VERSION_SUFFIX)
-	SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}-${VERSION_SUFFIX}")
-ENDIF(VERSION_SUFFIX)
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LMMS")
-IF(WIN32)
-	SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/nsis_branding.bmp")
-	SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/data/lmms.ico")
-	SET(CPACK_NSIS_INSTALLED_ICON_NAME "lmms.exe")
-	SET(CPACK_NSIS_DISPLAY_NAME "LMMS ${VERSION}")
-	SET(CPACK_NSIS_HELP_LINK "http://lmms.io")
-	SET(CPACK_NSIS_URL_INFO_ABOUT "http://lmms.io")
-	SET(CPACK_NSIS_CONTACT "[email protected]")
-	SET(CPACK_PACKAGE_EXECUTABLES "lmms.exe;LMMS")
-	SET(CPACK_NSIS_MENU_LINKS "lmms.exe;LMMS")
-	SET(CPACK_NSIS_DEFINES "!include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh")
-	SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win32")
-	SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-	  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmp\\\" \\\"LMMS Project\\\"
-	  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
-	  ")
-	SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-	  \\\${unregisterExtension} \\\".mmp\\\" \\\"LMMS Project\\\"
-	  \\\${unregisterExtension} \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
-	  DeleteRegKey HKCR \\\"LMMS Project\\\"
-	  DeleteRegKey HKCR \\\"LMMS Project (compressed)\\\"
-	  ")
-ELSE(WIN32)
-	SET(CPACK_STRIP_FILES "bin/lmms;${PLUGIN_DIR}/*.so")
-	SET(CPACK_PACKAGE_EXECUTABLES "lmms" "LMMS binary")
-ENDIF(WIN32)
-
-IF(WIN64)
-	SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win64")
-	SET(CPACK_NSIS_DEFINES "${CPACK_NSIS_DEFINES}
-		InstallDir \\\"\\\$PROGRAMFILES64\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\"")
-ENDIF(WIN64)
-
-SET(CPACK_SOURCE_GENERATOR "TBZ2")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lmms-${VERSION}")
-INCLUDE(CPack)
 

INSTALL → INSTALL.txt

@@ -31,3 +31,18 @@ If you want to supply an install prefix to cmake, add the flag:
 
 Where <prefix> can be /usr, /usr/local, /opt, etc. The default is /usr/local.
 
+
+
+Building with QT5
+
+First of all please note that CMake >= 2.8.11 is required for building with
+Qt5 support. In order to build LMMS with Qt5, add the following flag when
+invoking cmake:
+
+-DWANT_QT5=ON
+
+If your Qt5 installation does not reside in standard installation paths,
+additionally pass e.g.
+
+-DCMAKE_PREFIX_PATH=/opt/qt53/
+

cmake/CMakeLists.txt

@@ -0,0 +1,27 @@
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY           "${PROJECT_DESCRIPTION}")
+SET(CPACK_PACKAGE_VENDOR                        "${PROJECT_AUTHOR}")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE              "${CMAKE_SOURCE_DIR}/README.md")
+SET(CPACK_RESOURCE_FILE_LICENSE                 "${CMAKE_SOURCE_DIR}/LICENSE.txt")
+SET(CPACK_PACKAGE_VERSION_MAJOR                 "${VERSION_MAJOR}")
+SET(CPACK_PACKAGE_VERSION_MINOR                 "${VERSION_MINOR}")
+SET(CPACK_PACKAGE_VERSION_PATCH                 "${VERSION_PATCH}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY             "${PROJECT_NAME_UCASE}")
+SET(CPACK_SOURCE_GENERATOR                      "TBZ2")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME              "${CMAKE_PROJECT_NAME}-${VERSION}")
+IF(VERSION_SUFFIX)
+	SET(CPACK_PACKAGE_VERSION_PATCH         "${VERSION_PATCH}-${VERSION_SUFFIX}")
+ENDIF()
+IF(NOT DEFINED WIN32)
+	SET(CPACK_STRIP_FILES                   "bin/${CMAKE_PROJECT_NAME};${PLUGIN_DIR}/*.so")
+	SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}" "${PROJECT_NAME_UCASE} binary")
+ENDIF()
+
+IF(LMMS_BUILD_WIN32)
+	ADD_SUBDIRECTORY(nsis)
+ELSEIF(LMMS_BUILD_APPLE)
+	ADD_SUBDIRECTORY(apple)
+ELSE()
+	ADD_SUBDIRECTORY(linux)
+ENDIF()
+
+INCLUDE(CPack)

cmake/apple/CMakeLists.txt

@@ -0,0 +1,24 @@
+SET(MACOSX_BUNDLE_ICON_FILE             "lmms.icns")
+SET(MACOSX_BUNDLE_GUI_IDENTIFIER        "${PROJECT_NAME_UCASE}")
+SET(MACOSX_BUNDLE_LONG_VERSION_STRING   "${VERSION}")
+SET(MACOSX_BUNDLE_BUNDLE_NAME           "${PROJECT_NAME_UCASE}")
+SET(MACOSX_BUNDLE_SHORT_VERSION_STRING  "${VERSION}")
+SET(MACOSX_BUNDLE_BUNDLE_VERSION        "${VERSION}")
+SET(MACOSX_BUNDLE_COPYRIGHT             "${PROJECT_COPYRIGHT}")
+SET(MACOSX_BUNDLE_MIMETYPE              "application/x-lmms-project")
+SET(MACOSX_BUNDLE_MIMETYPE_ICON         "project.icns")
+SET(MACOSX_BUNDLE_MIMETYPE_ID           "io.lmms")
+SET(MACOSX_BUNDLE_PROJECT_URL           "${PROJECT_URL}")
+
+CONFIGURE_FILE("lmms.plist.in"          "${CMAKE_INSTALL_PREFIX}/Info.plist")
+CONFIGURE_FILE("install_apple.sh.in"    "${CMAKE_BINARY_DIR}/install_apple.sh" @ONLY)
+CONFIGURE_FILE("package_apple.sh.in"    "${CMAKE_BINARY_DIR}/package_apple.sh" @ONLY)
+
+# Add execute permissions to install script
+EXECUTE_PROCESS(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/install_apple.sh)
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_BINARY_DIR}/install_apple.sh)")
+
+# TODO: Add PACKAGE target using package_apple_dmg.sh
+
+
+