X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=scripts%2Fbuild%2Fmacosx_makePackage.sh;h=3c560dde0589017ced21b5e05788a1479f3a06da;hb=c8102e95706ac43e88364bb1fa3bef69e0145c84;hp=b37f3b0cd046e8b9dfc403db20a5ab32b967b173;hpb=12d5b08ebc07113674642483bdaad9bcd63a9a95;p=quassel.git

diff --git a/scripts/build/macosx_makePackage.sh b/scripts/build/macosx_makePackage.sh
index b37f3b0c..3c560dde 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 .
@@ -41,7 +41,7 @@ if [ ! -f "$mypath" ]; then
 fi
 
 SCRIPTDIR=$(dirname $mypath)
-QUASSEL_VERSION=$(git-describe)
+QUASSEL_VERSION=$(git describe)
 BUILDTYPE=$1
 
 # check the working dir
@@ -51,18 +51,35 @@ 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"
+
+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}/
-	${SCRIPTDIR}/macosx_DeployApp.py "${PACKAGETMPDIR}/Quassel Client.app"
-    else
+	${SCRIPTDIR}/macosx_DeployApp.py --plugins=qcocoa,qgenericbearer,qcorewlanbearer,qmacstyle${ADDITIONAL_PLUGINS} "${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${ADDITIONAL_PLUGINS} ${PACKAGETMPDIR}
+	;;
+"Mono")
+	cp -r ${WORKINGDIR}Quassel.app ${PACKAGETMPDIR}/
+	${SCRIPTDIR}/macosx_DeployApp.py --plugins=qsqlite,qsqlpsql,qcocoa,qgenericbearer,qcorewlanbearer,qmacstyle${ADDITIONAL_PLUGINS} "${PACKAGETMPDIR}/Quassel.app"
+	;;
+*)
+	echo >&2 "Valid parameters are \"Client\", \"Core\", or \"Mono\"."
+	rmdir ${PACKAGETMPDIR}
+	exit 1
+	;;
+esac
+PACKAGESIZE=$(echo "$(du -ms ${PACKAGETMPDIR} | cut -f1) * 1.1" | bc)
+hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -size ${PACKAGESIZE}M -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}${QUASSEL_DMG}" >/dev/null
+rm -rf ${PACKAGETMPDIR}