X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=scripts%2Fbuild%2Fmacosx_makePackage.sh;h=a9326c0ad19b5f24404f7cf6b852261e9e1dce84;hp=b37f3b0cd046e8b9dfc403db20a5ab32b967b173;hb=d6888a62baaa3cbb5fcf461aafa1fbf5197c4f49;hpb=12d5b08ebc07113674642483bdaad9bcd63a9a95 diff --git a/scripts/build/macosx_makePackage.sh b/scripts/build/macosx_makePackage.sh index b37f3b0c..a9326c0a 100755 --- a/scripts/build/macosx_makePackage.sh +++ b/scripts/build/macosx_makePackage.sh @@ -13,7 +13,7 @@ else # care to interpret leading and trailing ":" as meaning # the current directory; the same is true for "::" within # the PATH. - + # Replace leading : with . in PATH, store in p p=${PATH/#:/.:} # Replace trailing : with . @@ -51,18 +51,27 @@ if [[ ! -n $2 ]]; then fi WORKINGDIR="${WORKINGDIR}/" PACKAGETMPDIR="${WORKINGDIR}PACKAGE_TMP_DIR_${BUILDTYPE}" -if [[ $BUILDTYPE = "Core" ]] || [[ $BUILDTYPE = "Client" ]]; then - QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg" - mkdir $PACKAGETMPDIR - if [[ $BUILDTYPE = "Client" ]]; then +QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-x86_64_${QUASSEL_VERSION}.dmg" + +mkdir $PACKAGETMPDIR +case $BUILDTYPE in +"Client") cp -r ${WORKINGDIR}Quassel\ Client.app ${PACKAGETMPDIR}/ - ${SCRIPTDIR}/macosx_DeployApp.py "${PACKAGETMPDIR}/Quassel Client.app" - else + ${SCRIPTDIR}/macosx_DeployApp.py --plugins=qcocoa "${PACKAGETMPDIR}/Quassel Client.app" + ;; +"Core") cp ${WORKINGDIR}quasselcore ${PACKAGETMPDIR}/ - ${SCRIPTDIR}/macosx_DeployApp.py --nobundle ${PACKAGETMPDIR} - fi - hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg" >/dev/null - rm -rf ${PACKAGETMPDIR} -else - echo >&2 "Valid parameters are \"Client\" or \"Core\"" -fi + ${SCRIPTDIR}/macosx_DeployApp.py --nobundle --plugins=qsqlite,qsqlpsql ${PACKAGETMPDIR} + ;; +"Mono") + cp -r ${WORKINGDIR}Quassel.app ${PACKAGETMPDIR}/ + ${SCRIPTDIR}/macosx_DeployApp.py --plugins=qsqlite,qsqlpsql,qcocoa "${PACKAGETMPDIR}/Quassel.app" + ;; +*) + echo >&2 "Valid parameters are \"Client\", \"Core\", or \"Mono\"." + rmdir ${PACKAGETMPDIR} + exit 1 + ;; +esac +hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}${QUASSEL_DMG}" >/dev/null +rm -rf ${PACKAGETMPDIR}