projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Fix source-specific compile definitions
[quassel.git]
/
scripts
/
build
/
macosx_makePackage.sh
diff --git
a/scripts/build/macosx_makePackage.sh
b/scripts/build/macosx_makePackage.sh
index
007d3f2
..
3c560dd
100755
(executable)
--- 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.
# 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 .
# 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)
fi
SCRIPTDIR=$(dirname $mypath)
-QUASSEL_VERSION=$(git
-
describe)
+QUASSEL_VERSION=$(git
describe)
BUILDTYPE=$1
# check the working dir
BUILDTYPE=$1
# check the working dir
@@
-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 "${PACKAGETMPDIR}/Quassel Client.app"
+ ${SCRIPTDIR}/macosx_DeployApp.py
--plugins=qcocoa,qgenericbearer,qcorewlanbearer,qmacstyle${ADDITIONAL_PLUGINS}
"${PACKAGETMPDIR}/Quassel Client.app"
;;
"Core")
cp ${WORKINGDIR}quasselcore ${PACKAGETMPDIR}/
;;
"Core")
cp ${WORKINGDIR}quasselcore ${PACKAGETMPDIR}/
- ${SCRIPTDIR}/macosx_DeployApp.py --nobundle ${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 "${PACKAGETMPDIR}/Quassel.app"
+ ${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\"."
;;
*)
echo >&2 "Valid parameters are \"Client\", \"Core\", or \"Mono\"."
@@
-73,5
+80,6
@@
case $BUILDTYPE in
exit 1
;;
esac
exit 1
;;
esac
-hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}${QUASSEL_DMG}" >/dev/null
+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}
rm -rf ${PACKAGETMPDIR}