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 ++++++++-------- tools/osx_packaging/osx_build | 14 ++++++-------- 3 files changed, 20 insertions(+), 21 deletions(-) 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} diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 4eb1971f9d..a63821aa91 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -24,7 +24,6 @@ WITH_LADSPA=1 STRIP=1 PRINT_SYSDEPS= WITH_NLS= -LCNAME=ardour : ${HARRISONCHANNELSTRIP=harrison_channelstrip} @@ -53,7 +52,6 @@ while [ $# -gt 0 ] ; do WITH_LADSPA=; STRIP= ; PRODUCT_PKG_DIR=Mixbus; - LCNAME=mixbus ; APPNAME=Mixbus ; shift ;; --mixbus32c) MIXBUS=1; @@ -64,7 +62,6 @@ while [ $# -gt 0 ] ; do SAE= ; WITH_LADSPA=; STRIP= ; - LCNAME=mixbus32c ; PRODUCT_PKG_DIR=Mixbus32C; APPNAME=Mixbus32C-${major_version} ; major_version="" @@ -485,14 +482,15 @@ cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources # Copied directly from source tree +mkdir ${Resources}/icons +mkdir ${Resources}/resources cp ../../system_config $Resources/system_config cp ../../instant.xml $Resources/instant.xml -cp -r ../../gtk2_ardour/icons $Resources -cp -r ../../gtk2_ardour/pixmaps $Resources +cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/ +cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/ cp ../../gtk2_ardour/*.colors $Resources -cp -R ../../gtk2_ardour/icons/${LCNAME}-splash.png ${Shared}/splash.png -cp -R ../../gtk2_ardour/icons/${LCNAME}-small-splash.png ${Shared}/small-splash.png -cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared +cp ../../gtk2_ardour/ArdourMono.ttf $Shared +cp ../../gtk2_ardour/resources/${PRODUCT_PKG_DIR}-* ${Resources}/resources/ # go through and recursively remove any .svn dirs in the bundle for svndir in `find $APPDIR -name .svn -type dir`; do -- cgit v1.2.3