Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-18 19:42:53 +01:00
Code Issues Releases Wiki Activity

Move some files

Browse Source
This commit is contained in:
Jonas Kvinge 2020-04-25 01:59:21 +02:00
parent 6e061764ee
commit 8e1def225b
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -35,7 +35,7 @@ commands:
working_directory: build working_directory: build
- run: - run:
name: Build RPM name: Build RPM
command: rpmbuild -ba ../dist/rpm/strawberry.spec command: rpmbuild -ba ../dist/unix/strawberry.spec
working_directory: build working_directory: build

6
cmake/Rpm.cmake
View File

@ -57,12 +57,12 @@ if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file") set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file")
endif() endif()
message(STATUS "RPM Suffix: ${RPM_DISTRO}") message(STATUS "RPM Suffix: ${RPM_DISTRO}")
configure_file(${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec.in ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec @ONLY) configure_file(${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec.in ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec @ONLY)
add_custom_target(rpm add_custom_target(rpm
COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh
COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/ COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
COMMAND ${RPMBUILD_EXEC} -bs ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec COMMAND ${RPMBUILD_EXEC} -bs ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec
COMMAND ${RPMBUILD_EXEC} -bb ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec COMMAND ${RPMBUILD_EXEC} -bb ${CMAKE_SOURCE_DIR}/dist/unix/strawberry.spec
) )
endif() endif()
endif() endif()

4
debian/rules vendored
View File

@ -6,8 +6,8 @@
override_dh_auto_clean: override_dh_auto_clean:
rm -f dist/macos/Info.plist rm -f dist/macos/Info.plist
rm -f dist/macos/create-dmg.sh rm -f dist/macos/create-dmg.sh
rm -f dist/pacman/PKGBUILD rm -f dist/unix/PKGBUILD
rm -f dist/rpm/strawberry.spec rm -f dist/unix/strawberry.spec
rm -f dist/scripts/maketarball.sh rm -f dist/scripts/maketarball.sh
rm -f dist/windows/strawberry.nsi rm -f dist/windows/strawberry.nsi
rm -f src/translations/translations.pot rm -f src/translations/translations.pot

4
dist/CMakeLists.txt vendored
View File

@ -1,5 +1,5 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD @ONLY)
if (APPLE) 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/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
@ -16,7 +16,7 @@ if (UNIX AND NOT APPLE)
install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/) install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications) install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo) install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1) install(FILES unix/strawberry.1 unix/strawberry-tagreader.1 DESTINATION share/man/man1)
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)
if (APPLE) if (APPLE)

2
dist/scripts/maketarball.sh.in vendored
View File

@ -36,7 +36,7 @@ tar -cJf $name-$version.tar.xz \
--exclude="$root/.zanata-cache" \ --exclude="$root/.zanata-cache" \
--exclude="$root/debian/changelog" \ --exclude="$root/debian/changelog" \
--exclude="$root/dist/scripts/maketarball.sh" \ --exclude="$root/dist/scripts/maketarball.sh" \
--exclude="$root/dist/pacman/PKGBUILD" \ --exclude="$root/dist/unix/PKGBUILD" \
--exclude="$root/dist/macos/create-dmg.sh" \ --exclude="$root/dist/macos/create-dmg.sh" \
--exclude="$root/dist/macos/Info.plist" \ --exclude="$root/dist/macos/Info.plist" \
--exclude="$root/dist/windows/windres.rc" \ --exclude="$root/dist/windows/windres.rc" \

0
dist/pacman/PKGBUILD.in → dist/unix/PKGBUILD.in vendored
View File

0
dist/man/strawberry-tagreader.1 → dist/unix/strawberry-tagreader.1 vendored
View File

0
dist/man/strawberry.1 → dist/unix/strawberry.1 vendored
View File

0
dist/rpm/strawberry.spec.in → dist/unix/strawberry.spec.in vendored
View File