From 33368bd9d05ce42a0cf5af1594b996548ecf12c3 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sat, 21 Apr 2018 13:31:14 +0200 Subject: [PATCH 1/2] Revert CONTRIBUTOR file removal This reverts commit 30f1e52be35ed35f8e0e40f876620ce49007be62. # Conflicts: # CMakeLists.txt --- CMakeLists.txt | 16 ++++++++++++++++ doc/CONTRIBUTORS | 0 src/CMakeLists.txt | 5 +---- 3 files changed, 17 insertions(+), 4 deletions(-) delete mode 100644 doc/CONTRIBUTORS diff --git a/CMakeLists.txt b/CMakeLists.txt index 858e310c178..f22e2dfa31c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,6 +497,22 @@ FILE(REMOVE include/lmmsconfig.h) FILE(GLOB LMMS_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h") LIST(SORT LMMS_INCLUDES) +# Get list of all committers from git history, ordered by number of commits. +# The CONTRIBUTORS file is used by AboutDialog. This information can be provided +# with -DCONTRIBUTORS=/path/to/CONTRIBUTORS instead. For instance, to generate +# this file for version 1.1.3, the command is: +# git shortlog -sne v1.1.3 | cut -c8- +FIND_PACKAGE(Git) +IF(GIT_FOUND AND NOT CONTRIBUTORS) + SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS") + EXECUTE_PROCESS( + COMMAND "${GIT_EXECUTABLE}" shortlog -sne + COMMAND cut -c8- + OUTPUT_FILE "${CONTRIBUTORS}" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + TIMEOUT 1) +ENDIF() + # embedded resources stuff IF(WIN32 OR WIN64) # compile buildtools native diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 718a6fc1d13..17695b5a051 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,10 +43,7 @@ IF(WIN32) DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc") ENDIF() -SET(lmms_EMBEDDED_RESOURCES - "${CMAKE_SOURCE_DIR}/doc/AUTHORS" - "${CMAKE_SOURCE_DIR}/LICENSE.txt" - "${CMAKE_SOURCE_DIR}/doc/CONTRIBUTORS") +SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/doc/AUTHORS" "${CMAKE_SOURCE_DIR}/LICENSE.txt" "${CONTRIBUTORS}") SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h") ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "${LMMS_ER_H}" DEPENDS bin2res) From 50eada6b2b846f419509b40feef8702a24c349fe Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sat, 21 Apr 2018 13:33:35 +0200 Subject: [PATCH 2/2] Update project year --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f22e2dfa31c..8f269ee64d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,7 @@ INCLUDE(FindPkgConfig) STRING(TOUPPER "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE) -# Updated by maintenance tasks -SET(PROJECT_YEAR 2017) +SET(PROJECT_YEAR 2018) SET(PROJECT_AUTHOR "LMMS Developers") SET(PROJECT_URL "https://lmms.io")