Adapt macosx_makePackage.sh for svg icon support

Resolves GH-234.

diff --git a/scripts/build/macosx_makePackage.sh b/scripts/build/macosx_makePackage.sh
index 02ec554..05a1cd2 100755 (executable)
--- a/scripts/build/macosx_makePackage.sh
+++ b/scripts/build/macosx_makePackage.sh
@@ -53,19 +53,26 @@ WORKINGDIR="${WORKINGDIR}/"
 PACKAGETMPDIR="${WORKINGDIR}PACKAGE_TMP_DIR_${BUILDTYPE}"
 QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-x86_64_${QUASSEL_VERSION}.dmg"
 
 PACKAGETMPDIR="${WORKINGDIR}PACKAGE_TMP_DIR_${BUILDTYPE}"
 QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-x86_64_${QUASSEL_VERSION}.dmg"
 

+ADDITIONAL_PLUGINS=",$3"
+if [[ ! -n $3 ]]; then
+       ADDITIONAL_PLUGINS=""
+fi
+
+echo "ADDITIONAL_PLUGINS: ${ADDITIONAL_PLUGINS}"
+

 mkdir $PACKAGETMPDIR
 case $BUILDTYPE in
 "Client")
        cp -r ${WORKINGDIR}Quassel\ Client.app ${PACKAGETMPDIR}/
 mkdir $PACKAGETMPDIR
 case $BUILDTYPE in
 "Client")
        cp -r ${WORKINGDIR}Quassel\ Client.app ${PACKAGETMPDIR}/

-       ${SCRIPTDIR}/macosx_DeployApp.py --plugins=qcocoa "${PACKAGETMPDIR}/Quassel Client.app"
+       ${SCRIPTDIR}/macosx_DeployApp.py --plugins=qcocoa${ADDITIONAL_PLUGINS} "${PACKAGETMPDIR}/Quassel Client.app"

        ;;
 "Core")
        cp ${WORKINGDIR}quasselcore ${PACKAGETMPDIR}/
        ;;
 "Core")
        cp ${WORKINGDIR}quasselcore ${PACKAGETMPDIR}/

-       ${SCRIPTDIR}/macosx_DeployApp.py --nobundle --plugins=qsqlite,qsqlpsql ${PACKAGETMPDIR}
+       ${SCRIPTDIR}/macosx_DeployApp.py --nobundle --plugins=qsqlite,qsqlpsql${ADDITIONAL_PLUGINS} ${PACKAGETMPDIR}

        ;;
 "Mono")
        cp -r ${WORKINGDIR}Quassel.app ${PACKAGETMPDIR}/
        ;;
 "Mono")
        cp -r ${WORKINGDIR}Quassel.app ${PACKAGETMPDIR}/

-       ${SCRIPTDIR}/macosx_DeployApp.py --plugins=qsqlite,qsqlpsql,qcocoa "${PACKAGETMPDIR}/Quassel.app"
+       ${SCRIPTDIR}/macosx_DeployApp.py --plugins=qsqlite,qsqlpsql,qcocoa${ADDITIONAL_PLUGINS} "${PACKAGETMPDIR}/Quassel.app"

        ;;
 *)
        echo >&2 "Valid parameters are \"Client\", \"Core\", or \"Mono\"."
        ;;
 *)
        echo >&2 "Valid parameters are \"Client\", \"Core\", or \"Mono\"."

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc16334..96b66af 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,10 +84,10 @@ if(APPLE)
                              ${CMAKE_SOURCE_DIR} "Quassel" ../quassel)
   if(DEPLOY)
     add_custom_command(TARGET quasselclient POST_BUILD
                              ${CMAKE_SOURCE_DIR} "Quassel" ../quassel)
   if(DEPLOY)
     add_custom_command(TARGET quasselclient POST_BUILD

-                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client ..)
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client .. qsvgicon)

     add_custom_command(TARGET quasselcore POST_BUILD
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
     add_custom_command(TARGET quassel POST_BUILD
     add_custom_command(TARGET quasselcore POST_BUILD
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
     add_custom_command(TARGET quassel POST_BUILD

-                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono ..)
+                       COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono .. qsvgicon)

   endif()
 endif()
   endif()
 endif()