X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=scripts%2Fbuild%2Fmacosx_makePackage.sh;h=007d3f220b97f0e00c525296bc7f5fea8a83c89d;hb=f6cc3c4c662771d76355f876dd6e0317b890676b;hp=35b4f884839ff0b3c4f7531397a26b0352653ff1;hpb=335e3cf6203327b3ce1ee6e47c09a8139232317c;p=quassel.git

diff --git a/scripts/build/macosx_makePackage.sh b/scripts/build/macosx_makePackage.sh
index 35b4f884..007d3f22 100755
--- a/scripts/build/macosx_makePackage.sh
+++ b/scripts/build/macosx_makePackage.sh
@@ -43,17 +43,35 @@ fi
 SCRIPTDIR=$(dirname $mypath)
 QUASSEL_VERSION=$(git-describe)
 BUILDTYPE=$1
-if [[ $BUILDTYPE = "Core" ]] || [[ $BUILDTYPE = "Client" ]]; then
-    QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg"
-    mkdir $BUILDTYPE
-    if [[ $BUILDTYPE = "Client" ]]; then
-	cp -r Quassel\ Client.app Client/
-	${SCRIPTDIR}/macosx_DeployApp.py "Client/Quassel Client.app"
-    else
-	cp quasselcore Core/
-	${SCRIPTDIR}/macosx_DeployApp.py --nobundle Core
-    fi
-    hdiutil create -srcfolder ${BUILDTYPE} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg" >/dev/null
-else
-    echo >&2 "Valid parameters are \"Client\" or \"Core\""
+
+# check the working dir
+WORKINGDIR=$2
+if [[ ! -n $2 ]]; then
+    WORKINGDIR="."
 fi
+WORKINGDIR="${WORKINGDIR}/"
+PACKAGETMPDIR="${WORKINGDIR}PACKAGE_TMP_DIR_${BUILDTYPE}"
+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"
+	;;
+"Core")
+	cp ${WORKINGDIR}quasselcore ${PACKAGETMPDIR}/
+	${SCRIPTDIR}/macosx_DeployApp.py --nobundle ${PACKAGETMPDIR}
+	;;
+"Mono")
+	cp -r ${WORKINGDIR}Quassel.app ${PACKAGETMPDIR}/
+	${SCRIPTDIR}/macosx_DeployApp.py "${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}