Start to modularize platform specific build logic

LMMS · Aug 7, 2015 · 4a1cd1d · 4a1cd1d
1 parent 41fe59e
commit 4a1cd1d
Show file tree

Hide file tree

Showing 26 changed files with 128 additions and 104 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -361,12 +361,6 @@ ENDIF(LMMS_BUILD_WIN32)
 # check for libsamplerate
 PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
 
-
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/lmmsconfig.h.in" "${CMAKE_BINARY_DIR}/lmmsconfig.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/lmmsversion.h.in" "${CMAKE_BINARY_DIR}/lmmsversion.h")
-CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/data/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)
@@ -424,26 +418,14 @@ 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)
@@ -494,7 +476,7 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND make clean
 			COMMAND rm -rf "${TMP}"
 			COMMAND mkdir -p "${TMP}"
-			COMMAND cp CMakeLists.txt LICENSE.txt INSTALL README.md "${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}"
@@ -562,51 +544,4 @@ MESSAGE(
 "\n\n")
 
 INCLUDE(InstallRequiredSystemLibraries)
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LMMS - easy music production for everyone!")
-SET(CPACK_PACKAGE_VENDOR "LMMS Developers")
-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}")
-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)
 
diff --git a/INSTALL → INSTALL.txt b/INSTALL → INSTALL.txt
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -0,0 +1,26 @@
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY 		"LMMS - easy music production for everyone!")
+SET(CPACK_PACKAGE_VENDOR                        "LMMS Developers")
+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             "LMMS")
+SET(CPACK_SOURCE_GENERATOR                      "TBZ2")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME              "lmms-${VERSION}")
+IF(VERSION_SUFFIX)
+	SET(CPACK_PACKAGE_VERSION_PATCH         "${VERSION_PATCH}-${VERSION_SUFFIX}")
+ENDIF()
+IF(NOT DEFINED WIN32)
+	SET(CPACK_STRIP_FILES                   "bin/lmms;${PLUGIN_DIR}/*.so")
+	SET(CPACK_PACKAGE_EXECUTABLES           "lmms" "LMMS binary")
+ENDIF()
+INCLUDE(CPack)
+
+IF(LMMS_BUILD_WIN32)
+	ADD_SUBDIRECTORY(nsis)
+ELSEIF(LMMS_BUILD_APPLE)
+	ADD_SUBDIRECTORY(apple)
+ELSE()
+	ADD_SUBDIRECTORY(linux)
+ENDIF()
diff --git a/cmake/apple/CMakeLists.txt b/cmake/apple/CMakeLists.txt
@@ -0,0 +1,26 @@
+STRING(TIMESTAMP LMMS_YEAR "%Y")
+
+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 		"LMMS Developers, 2008-${LMMS_YEAR}")
+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 		"http://lmms.io")
+
+CONFIGURE_FILE("lmms.plist.in"		"${CMAKE_BINARY_DIR}/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_dmg.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
+
+
+
diff --git a/data/dmg_branding.png → cmake/apple/dmg_branding.png b/data/dmg_branding.png → cmake/apple/dmg_branding.png
diff --git a/data/scripts/create_apple_bundle.sh.in → cmake/apple/install_apple.sh.in b/data/scripts/create_apple_bundle.sh.in → cmake/apple/install_apple.sh.in
@@ -1,5 +1,5 @@
 #!/bin/bash
-#title         :create_applet_installer.sh
+#title         :install_apple.sh
 #description   :Creates Apple ".app" bundle for LMMS
 #author        :Tres Finocchiaro
 #date          :20140504
@@ -11,7 +11,6 @@
 #=========================================================================================
 
 # MacPorts Location
-MACPORTS=/opt/local
 
  # LMMS project root directory (extracted source)
 CMAKE_SRC=@CMAKE_SOURCE_DIR@
@@ -32,8 +31,8 @@ APP=${HOME}/Desktop/LMMS.app
 LIBREADLINE=${MACPORTS}/lib/libreadline.6.2.dylib
 
 # The DMG packager script location
-DMG_SCRIPT_SRC=${CMAKE_BUILD}/create_apple_dmg.sh
-DMG_SCRIPT_DST=${HOME}/Desktop/create_apple_dmg.sh
+DMG_SCRIPT_SRC=${CMAKE_BUILD}/package_mac.sh
+DMG_SCRIPT_DST=${HOME}/Desktop/package_mac.sh
 
 #=========================================================================================
 
@@ -111,7 +110,7 @@ _executables="${_executables} -executable=${APP}/Contents/Frameworks/libZynAddSu
 macdeployqt ${APP} $_executables
 
 # OS X Specific Artwork
-cp ${CMAKE_SRC}/data/*.icns ${APP}/Contents/Resources/
+cp ${CMAKE_SRC}/cmake/mac/*.icns ${APP}/Contents/Resources/
 
 # Done.  Ready to build DMG
 echo -e "\nFinished.\n\nYou may run LMMS from the Desktop."

diff --git a/data/lmms.icns → cmake/apple/lmms.icns b/data/lmms.icns → cmake/apple/lmms.icns
diff --git a/data/lmms.plist.in → cmake/apple/lmms.plist.in b/data/lmms.plist.in → cmake/apple/lmms.plist.in
diff --git a/data/scripts/create_apple_dmg.sh.in → cmake/apple/package_apple.sh.in b/data/scripts/create_apple_dmg.sh.in → cmake/apple/package_apple.sh.in
@@ -13,7 +13,7 @@ fi
 APP_NAME="@MACOSX_BUNDLE_BUNDLE_NAME@"
 VERSION="@MACOSX_BUNDLE_LONG_VERSION_STRING@"
 DMG_BACKGROUND_IMG="dmg_branding.png"
-cp "@CMAKE_SOURCE_DIR@/data/${DMG_BACKGROUND_IMG}" .
+cp "@CMAKE_SOURCE_DIR@/cmake/apple/${DMG_BACKGROUND_IMG}" .
 
 # you should not need to change these
 OS_VER=`sw_vers -productVersion|cut -d"." -f1-2`

diff --git a/data/project.icns → cmake/apple/project.icns b/data/project.icns → cmake/apple/project.icns
diff --git a/buildtools/build_mingw32 → cmake/build_mingw32.sh b/buildtools/build_mingw32 → cmake/build_mingw32.sh
diff --git a/buildtools/build_mingw64 → cmake/build_mingw64.sh b/buildtools/build_mingw64 → cmake/build_mingw64.sh
diff --git a/cmake/linux/CMakeLists.txt b/cmake/linux/CMakeLists.txt
@@ -0,0 +1,4 @@
+INSTALL(FILES lmms.png                  DESTINATION "${DATA_DIR}/pixmaps")
+INSTALL(FILES lmms                      DESTINATION "${DATA_DIR}/menu")
+INSTALL(FILES lmms.desktop              DESTINATION "${DATA_DIR}/applications")
+INSTALL(FILES lmms.xml                  DESTINATION "${DATA_DIR}/mime/packages")
diff --git a/data/lmms → cmake/linux/lmms b/data/lmms → cmake/linux/lmms
diff --git a/data/lmms.desktop → cmake/linux/lmms.desktop b/data/lmms.desktop → cmake/linux/lmms.desktop
diff --git a/data/lmms.png → cmake/linux/lmms.png b/data/lmms.png → cmake/linux/lmms.png
diff --git a/data/lmms.spec.in → cmake/linux/lmms.spec.in b/data/lmms.spec.in → cmake/linux/lmms.spec.in
diff --git a/data/lmms.xml → cmake/linux/lmms.xml b/data/lmms.xml → cmake/linux/lmms.xml
diff --git a/cmake/nsis/CMakeLists.txt b/cmake/nsis/CMakeLists.txt
@@ -0,0 +1,35 @@
+SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_branding.bmp")
+SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/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)\\\"
+  ")
+
+IF(WIN64)
+	SET(CPACK_PACKAGE_FILE_NAME      "lmms-${VERSION}-win64")
+	SET(CPACK_NSIS_DEFINES           "${CPACK_NSIS_DEFINES}
+		InstallDir \\\"\\\$PROGRAMFILES64\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\"")
+ENDIF()
+
+# Windows resource compilers
+CONFIGURE_FILE("lmms.rc.in"             "${CMAKE_BINARY_DIR}/lmms.rc")
+CONFIGURE_FILE("zynaddsubfx.rc.in"	"${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
+
+FILE(GLOB RAWWAVES "${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw")
+INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
+
diff --git a/data/lmms.ico → cmake/nsis/lmms.ico b/data/lmms.ico → cmake/nsis/lmms.ico
diff --git a/data/lmms.rc.in → cmake/nsis/lmms.rc.in b/data/lmms.rc.in → cmake/nsis/lmms.rc.in
@@ -1,4 +1,4 @@
-lmmsicon ICON data/lmms.ico
+lmmsicon ICON cmake/nsis/lmms.ico
 #include <windows.h>
 
 VS_VERSION_INFO	VERSIONINFO

diff --git a/data/nsis_branding.bmp → cmake/nsis/nsis_branding.bmp b/data/nsis_branding.bmp → cmake/nsis/nsis_branding.bmp
diff --git a/cmake/nsis/zynaddsubfx.rc.in b/cmake/nsis/zynaddsubfx.rc.in
@@ -0,0 +1,26 @@
+zynaddsubfx_icon ICON zynaddsubfx/zynaddsubfx.ico
+#include <windows.h>
+
+VS_VERSION_INFO	VERSIONINFO
+  FILEVERSION	0,2,3,0
+  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+  FILEOS	VOS_NT_WINDOWS32
+  FILETYPE	VFT_APP
+  FILESUBTYPE	VFT2_UNKNOWN
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, charset = Windows, Multilingual
+    BEGIN
+      VALUE "Comments",		"ZynAddSubFX Plugin - LMMS (http://lmms.sf.net)\0"
+      VALUE "CompanyName",	"LMMS Developers\0"
+      VALUE "FileDescription",	"ZynAddSubFX LMMS Plugin\0"
+      VALUE "FileVersion",	"2.3.0/@VERSION@\0"
+      VALUE "LegalCopyright",	"Copyright (c) Nasca Octavian Paul, Mark McCurry, Harald Hvaal, Tobias Doerffel\0"
+      VALUE "OriginalFilename",	"RemoteZynAddSubFx.exe\0"
+      VALUE "ProductName",	"ZynAddSubFX/LMMS\0"
+      VALUE "ProductVersion",	"2.3.0/@VERSION@\0"
+    END
+  END
+END
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -5,20 +5,3 @@ ADD_SUBDIRECTORY(projects)
 ADD_SUBDIRECTORY(samples)
 ADD_SUBDIRECTORY(themes)
 ADD_SUBDIRECTORY(wavetables)
-ADD_SUBDIRECTORY(scripts)
-
-IF(LMMS_BUILD_LINUX)
-   INSTALL(FILES themes/default/icon.png DESTINATION "${DATA_DIR}/pixmaps" RENAME lmms.png)
-   INSTALL(FILES lmms DESTINATION "${DATA_DIR}/menu")
-   INSTALL(FILES lmms.desktop DESTINATION "${DATA_DIR}/applications")
-   INSTALL(FILES lmms.xml DESTINATION "${DATA_DIR}/mime/packages")
-ENDIF(LMMS_BUILD_LINUX)
-
-IF(LMMS_BUILD_WIN32)
-   FILE(GLOB RAWWAVES "${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw")
-   INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
-ENDIF(LMMS_BUILD_WIN32)
-
-IF(LMMS_BUILD_APPLE)
-	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/data/lmms.plist.in" "${CMAKE_INSTALL_PREFIX}/Info.plist")
-ENDIF(LMMS_BUILD_APPLE)
diff --git a/data/scripts/CMakeLists.txt b/data/scripts/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,3 +1,6 @@
+CONFIGURE_FILE("lmmsconfig.h.in"        "${CMAKE_BINARY_DIR}/lmmsconfig.h")
+CONFIGURE_FILE("lmmsversion.h.in"       "${CMAKE_BINARY_DIR}/lmmsversion.h")
+
 SET(LMMS_SRCS "")
 SET(LMMS_UIS "")