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

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