From e96f0504c0ae69eaf9ac6befe1cc81857db60f48 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 21 Jan 2020 23:53:28 +0100 Subject: [PATCH] Move related stuff into Rpm/Deb Cmake files --- cmake/Deb.cmake | 5 +++++ cmake/Rpm.cmake | 4 +++- dist/CMakeLists.txt | 21 ++++++++++----------- dist/rpm/strawberry.spec.in | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/cmake/Deb.cmake b/cmake/Deb.cmake index 7d50b4353..9b8c85e8e 100644 --- a/cmake/Deb.cmake +++ b/cmake/Deb.cmake @@ -2,14 +2,19 @@ find_program(LSB_RELEASE_EXEC lsb_release) find_program(DPKG_BUILDPACKAGE dpkg-buildpackage) if (LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE) + execute_process(COMMAND env LC_ALL=C date "+%a, %-d %b %Y %H:%M:%S %z" OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -cs" OUTPUT_VARIABLE DEB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE ) + if (DEB_CODENAME) + configure_file(${CMAKE_SOURCE_DIR}/debian/changelog.in ${CMAKE_SOURCE_DIR}/debian/changelog) add_custom_target(deb WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${DPKG_BUILDPACKAGE} -b -d -uc -us ) endif() + endif() diff --git a/cmake/Rpm.cmake b/cmake/Rpm.cmake index 66dd3f2dd..4ddc9b989 100644 --- a/cmake/Rpm.cmake +++ b/cmake/Rpm.cmake @@ -2,6 +2,8 @@ find_program(LSB_RELEASE_EXEC lsb_release) find_program(RPMBUILD_EXEC rpmbuild) if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC) + execute_process(COMMAND env LC_ALL="en_US.utf8" date "+%a %b %d %Y" OUTPUT_VARIABLE RPM_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -is | tr '[:upper:]' '[:lower:]' | cut -d' ' -f1" OUTPUT_VARIABLE DIST_NAME OUTPUT_STRIP_TRAILING_WHITESPACE @@ -22,7 +24,6 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC) if (DIST_VERSION) message(STATUS "Distro Version: ${DIST_VERSION}") endif() - set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file") set(RPMBUILD_DIR ~/rpmbuild CACHE STRING "Rpmbuild directory, for the rpm target") if (${DIST_NAME} STREQUAL "opensuse") if (DIST_RELEASE) @@ -56,6 +57,7 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC) set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file") endif() message(STATUS "RPM Suffix: ${RPM_DISTRO}") + configure_file(${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec.in ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec @ONLY) add_custom_target(rpm COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/ diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt index a2366cbd7..83e78350b 100644 --- a/dist/CMakeLists.txt +++ b/dist/CMakeLists.txt @@ -1,15 +1,14 @@ -execute_process(COMMAND env LC_ALL="en_US.utf8" date "+%a %b %d %Y" OUTPUT_VARIABLE RPM_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND env LC_ALL=C date "+%a, %-d %b %Y %H:%M:%S %z" OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh @ONLY) -if (RPM_DISTRO) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rpm/strawberry.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/rpm/strawberry.spec @ONLY) -endif() -configure_file(${CMAKE_SOURCE_DIR}/debian/changelog.in ${CMAKE_SOURCE_DIR}/debian/changelog) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY) + +if (APPLE) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh) +endif (APPLE) + +if (WIN32) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi.in ${CMAKE_CURRENT_SOURCE_DIR}/windows/strawberry.nsi @ONLY) +endif (WIN32) if (UNIX AND NOT APPLE) install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/) @@ -18,7 +17,7 @@ if (UNIX AND NOT APPLE) install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications) install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo) install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1) -endif() +endif (UNIX AND NOT APPLE) if (APPLE) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../dist/macos/Info.plist" DESTINATION "${CMAKE_BINARY_DIR}/strawberry.app/Contents") diff --git a/dist/rpm/strawberry.spec.in b/dist/rpm/strawberry.spec.in index ca33b1fdf..5420f03f1 100644 --- a/dist/rpm/strawberry.spec.in +++ b/dist/rpm/strawberry.spec.in @@ -194,5 +194,5 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicpl %{_mandir}/man1/%{name}-tagreader.1.* %changelog -* @RPM_DATE@ Jonas Kvinge - @STRAWBERRY_VERSION_RPM_V@ +* @RPM_DATE@ Jonas Kvinge - @STRAWBERRY_VERSION_RPM_V@ - Version @STRAWBERRY_VERSION_PACKAGE@