Better branding replacement

LMMS · Aug 12, 2015 · 6bd14a8 · 6bd14a8
1 parent 78822fa
commit 6bd14a8
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 71 deletions.
diff --git a/CMakeLists.txt b/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)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,19 +1,19 @@
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY           "LMMS - easy music production for everyone!")
-SET(CPACK_PACKAGE_VENDOR                        "LMMS Developers")
+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             "LMMS")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY             "${PROJECT_NAME_UCASE}")
 SET(CPACK_SOURCE_GENERATOR                      "TBZ2")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME              "lmms-${VERSION}")
+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/lmms;${PLUGIN_DIR}/*.so")
-	SET(CPACK_PACKAGE_EXECUTABLES           "lmms" "LMMS binary")
+	SET(CPACK_STRIP_FILES                   "bin/${CMAKE_PROJECT_NAME};${PLUGIN_DIR}/*.so")
+	SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}" "${PROJECT_NAME_UCASE} binary")
 ENDIF()
 INCLUDE(CPack)
 

diff --git a/cmake/apple/CMakeLists.txt b/cmake/apple/CMakeLists.txt
@@ -1,20 +1,18 @@
-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_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 		"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")
+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_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)
+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)

diff --git a/cmake/apple/install_apple.sh.in b/cmake/apple/install_apple.sh.in
@@ -32,8 +32,8 @@ APP=${HOME}/Desktop/LMMS.app
 LIBREADLINE=${MACPORTS}/lib/libreadline.6.2.dylib
 
 # The DMG packager script location
-DMG_SCRIPT_SRC=${CMAKE_BUILD}/package_mac.sh
-DMG_SCRIPT_DST=${HOME}/Desktop/package_mac.sh
+DMG_SCRIPT_SRC=${CMAKE_BUILD}/package_apple.sh
+DMG_SCRIPT_DST=${HOME}/Desktop/package_apple.sh
 
 #=========================================================================================
 
@@ -111,7 +111,7 @@ _executables="${_executables} -executable=${APP}/Contents/Frameworks/libZynAddSu
 macdeployqt ${APP} $_executables
 
 # OS X Specific Artwork
-cp ${CMAKE_SRC}/cmake/mac/*.icns ${APP}/Contents/Resources/
+cp ${CMAKE_SRC}/cmake/apple/*.icns ${APP}/Contents/Resources/
 
 # Done.  Ready to build DMG
 echo -e "\nFinished.\n\nYou may run LMMS from the Desktop."

diff --git a/cmake/nsis/CMakeLists.txt b/cmake/nsis/CMakeLists.txt
@@ -1,34 +1,34 @@
 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_INSTALLED_ICON_NAME      "${CMAKE_PROJECT_NAME}.exe")
+SET(CPACK_NSIS_DISPLAY_NAME             "${PROJECT_NAME_UCASE} ${VERSION}")
+SET(CPACK_NSIS_HELP_LINK                "${PROJECT_URL}")
+SET(CPACK_NSIS_URL_INFO_ABOUT           "${PROJECT_URL}")
+SET(CPACK_NSIS_CONTACT                  "${PROJECT_EMAIL}")
+SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}")
+SET(CPACK_NSIS_MENU_LINKS               "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}")
 SET(CPACK_NSIS_DEFINES                  "!include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh")
-SET(CPACK_PACKAGE_FILE_NAME             "lmms-${VERSION}-win32")
+SET(CPACK_PACKAGE_FILE_NAME             "${CMAKE_PROJECT_NAME}-${VERSION}-win32")
 SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmp\\\" \\\"LMMS Project\\\"
-  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
+  \\\${registerExtension} \\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
+  \\\${registerExtension} \\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} 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)\\\"
+  \\\${unregisterExtension} \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
+  \\\${unregisterExtension} \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
+  DeleteRegKey HKCR \\\"${PROJECT_NAME_UCASE} Project\\\"
+  DeleteRegKey HKCR \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
   ")
 
 IF(WIN64)
-	SET(CPACK_PACKAGE_FILE_NAME      "lmms-${VERSION}-win64")
+	SET(CPACK_PACKAGE_FILE_NAME      "${CMAKE_PROJECT_NAME}-${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")
+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/cmake/nsis/lmms.rc.in b/cmake/nsis/lmms.rc.in
@@ -1,26 +1,26 @@
 lmmsicon ICON cmake/nsis/lmms.ico
 #include <windows.h>
 
-VS_VERSION_INFO	VERSIONINFO
-  FILEVERSION	@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION   @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-  FILEOS	VOS_NT_WINDOWS32
-  FILETYPE	VFT_APP
-  FILESUBTYPE	VFT2_UNKNOWN
+  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",		"https://lmms.io\0"
-      VALUE "CompanyName",	"LMMS Developers\0"
-      VALUE "FileDescription",	"LMMS\0"
-      VALUE "FileVersion",	"@VERSION@\0"
-      VALUE "LegalCopyright",	"Copyright (c) 2004-2015 LMMS Developers\0"
-      VALUE "OriginalFilename",	"lmms.exe\0"
-      VALUE "ProductName",	"LMMS\0"
-      VALUE "ProductVersion",	"@VERSION@\0"
+      VALUE "Comments",         "${PROJECT_URL}\0"
+      VALUE "CompanyName",      "${PROJECT_AUTHOR}\0"
+      VALUE "FileDescription",  "${PROJECT_NAME_UCASE}\0"
+      VALUE "FileVersion",      "@VERSION@\0"
+      VALUE "LegalCopyright",   "Copyright (c) ${PROJECT_COPYRIGHT}\0"
+      VALUE "OriginalFilename", "${CMAKE_PROJECT_NAME}.exe\0"
+      VALUE "ProductName",      "${PROJECT_NAME_UCASE}\0"
+      VALUE "ProductVersion",   "@VERSION@\0"
     END
   END
 END
diff --git a/cmake/nsis/zynaddsubfx.rc.in b/cmake/nsis/zynaddsubfx.rc.in
@@ -2,25 +2,25 @@ zynaddsubfx_icon ICON zynaddsubfx/zynaddsubfx.ico
 #include <windows.h>
 
 VS_VERSION_INFO	VERSIONINFO
-  FILEVERSION	0,2,3,0
+  FILEVERSION   0,2,3,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-  FILEOS	VOS_NT_WINDOWS32
-  FILETYPE	VFT_APP
-  FILESUBTYPE	VFT2_UNKNOWN
+  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"
+      VALUE "Comments",         "ZynAddSubFX Plugin - ${PROJECT_NAME_UCASE} (${PROJECT_URL})\0"
+      VALUE "CompanyName",      "${PROJECT_AUTHOR}\0"
+      VALUE "FileDescription",  "ZynAddSubFX ${PROJECT_NAME_UCASE} 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/${PROJECT_NAME_UCASE}\0"
+      VALUE "ProductVersion",   "2.3.0/@VERSION@\0"
     END
   END
 END