From cbe476521a03eb76eb73467dda39cd7bfea7a16d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 17 May 2016 13:33:37 +0200 Subject: package Product/App specific resources --- tools/linux_packaging/build | 11 ++++++----- tools/linux_packaging/stage2.run.in | 16 ++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'tools/linux_packaging') diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 2035539bc4..80a911dd80 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -586,14 +586,15 @@ cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc # Copied directly from source tree +mkdir ${Shared}/icons +mkdir ${Shared}/resources cp ../../system_config $Etc/system_config cp ../../gtk2_ardour/*.colors $Etc cp ../../instant.xml $Shared/instant.xml -cp -r ../../gtk2_ardour/icons $Shared -cp -r ../../gtk2_ardour/pixmaps $Shared -cp -r ../../gtk2_ardour/icons/${EXENAME}-splash.png ${Shared}/splash.png -cp -r ../../gtk2_ardour/icons/${EXENAME}-small-splash.png ${Shared}/small-splash.png -cp -r ../../gtk2_ardour/ArdourMono.ttf $Shared +cp ../../gtk2_ardour/icons/*.png ${Shared}/icons +cp -r ../../gtk2_ardour/icons/icons/cursor_* ${Shared}/icons/ +cp ../../gtk2_ardour/ArdourMono.ttf $Shared +cp ../../gtk2_ardour/resources/${APPNAME}-* ${Shared}/resources/ # # put sooper sekrit ingredients here and they will be copied diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in index 445643b573..5241e806d4 100755 --- a/tools/linux_packaging/stage2.run.in +++ b/tools/linux_packaging/stage2.run.in @@ -500,7 +500,7 @@ else fi PGM_EXEC_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/bin/${PGM_EXEC_FILE}" -ICON_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share/icons" +ICON_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share/resources" MENU_FILE_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share" ################################ @@ -563,15 +563,15 @@ ${SUPER} mv /tmp/${MENU_FILE} ${MENU_FILE_PATH}/. if [ "T" = ${HAS_XDG} ]; then echo "Adding ${PGM_NAME} to the applications menu" - ${SUPER} xdg-icon-resource install --context apps --size 16 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_16px.png ${ICON_NAME} - ${SUPER} xdg-icon-resource install --context apps --size 22 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_22px.png ${ICON_NAME} - ${SUPER} xdg-icon-resource install --context apps --size 32 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_32px.png ${ICON_NAME} - ${SUPER} xdg-icon-resource install --context apps --size 48 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_48px.png ${ICON_NAME} - ${SUPER} xdg-icon-resource install --context apps --size 256 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_256px.png ${ICON_NAME} + ${SUPER} xdg-icon-resource install --context apps --size 16 ${ICON_PATH}/${PGM_NAME}-icon_16px.png ${ICON_NAME} + ${SUPER} xdg-icon-resource install --context apps --size 22 ${ICON_PATH}/${PGM_NAME}-icon_22px.png ${ICON_NAME} + ${SUPER} xdg-icon-resource install --context apps --size 32 ${ICON_PATH}/${PGM_NAME}-icon_32px.png ${ICON_NAME} + ${SUPER} xdg-icon-resource install --context apps --size 48 ${ICON_PATH}/${PGM_NAME}-icon_48px.png ${ICON_NAME} + ${SUPER} xdg-icon-resource install --context apps --size 256 ${ICON_PATH}/${PGM_NAME}-icon_256px.png ${ICON_NAME} - if [ -e ${ICON_PATH}/${PGM_NAME_LOWER}_icon.svg -a -d /usr/share/icons/hicolor/scalable/apps ]; + if [ -e ${ICON_PATH}/${PGM_NAME}_icon.svg -a -d /usr/share/icons/hicolor/scalable/apps ]; then - ${SUPER} cp -f ${ICON_PATH}/${PGM_NAME_LOWER}_icon.svg /usr/share/icons/hicolor/scalable/apps/${ICON_NAME}.svg + ${SUPER} cp -f ${ICON_PATH}/${PGM_NAME}_icon.svg /usr/share/icons/hicolor/scalable/apps/${ICON_NAME}.svg fi ${SUPER} xdg-desktop-menu install ${MENU_FILE_PATH}/${MENU_FILE} -- cgit v1.2.3