anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not strip binary for packaging by default; improved name of disk image

Browse Source
This commit is contained in:
Stephan Witt 2014-07-16 22:25:25 +02:00
parent 294d08b1bf
commit 0eb2df6ab6
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
development/LyX-Mac-binary-release.sh
View File

@ -47,7 +47,7 @@ HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-exceptions" Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-exceptions"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus" Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools" Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
Qt4DmgSuffix=qt4${Qt4API}.dmg QtMajorVersion=qt4
# stupid special case... # stupid special case...
case "${Qt4Version}:${Qt4API}" in case "${Qt4Version}:${Qt4API}" in
@ -57,10 +57,10 @@ case "${Qt4Version}:${Qt4API}" in
Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-strip" Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-strip"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-javascript-jit -no-pkg-config" Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-javascript-jit -no-pkg-config"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools" Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
Qt4DmgSuffix=qt5${Qt4API}.dmg QtMajorVersion=qt5
;; ;;
5.*) 5.*)
Qt4DmgSuffix=qt5${Qt4API}.dmg QtMajorVersion=qt5
;; ;;
*) *)
Qt4ConfigureOptions="${Qt4ConfigureOptions} ${Qt4API}" Qt4ConfigureOptions="${Qt4ConfigureOptions} ${Qt4API}"
@ -123,15 +123,21 @@ usage() {
echo " --with-arch=ARCH ..........." default ppc,i386 echo " --with-arch=ARCH ..........." default ppc,i386
echo " --with-build-path=PATH ....." default \${lyx-src-dir}/../lyx-build echo " --with-build-path=PATH ....." default \${lyx-src-dir}/../lyx-build
echo " --with-dmg-location=PATH ..." default \${build-path} echo " --with-dmg-location=PATH ..." default \${build-path}
echo " --with-binary-strip=yes ...." default no
echo echo
echo "All other arguments with -- are passed to configure" echo "All other arguments with -- are passed to configure"
echo "including the defaults: ${LyXConfigureOptions}" echo "including the defaults: ${LyXConfigureOptions}"
if [ -x "${LyxSourceDir}/configure" ]; then case "${1}" in
echo --help=short)
echo "*" Configure options of LyX ;;
echo *)
"${LyxSourceDir}/configure" --help if [ -x "${LyxSourceDir}/configure" ]; then
fi echo
echo "*" Configure options of LyX
echo
"${LyxSourceDir}/configure" --help
fi
esac
exit 0 exit 0
} }
@ -208,12 +214,16 @@ while [ $# -gt 0 ]; do
DMGLocation=$(echo ${1}|cut -d= -f2) DMGLocation=$(echo ${1}|cut -d= -f2)
shift shift
;; ;;
--with-binary-strip=yes)
strip="-strip"
shift
;;
--with-build-path=*) --with-build-path=*)
LyxBuildDir=$(echo ${1}|cut -d= -f2) LyxBuildDir=$(echo ${1}|cut -d= -f2)
shift shift
;; ;;
--help|--help=*) --help|--help=*)
usage usage "${1}"
;; ;;
--without-aspell) --without-aspell)
LyXConfigureOptions="${LyXConfigureOptions} ${1}" LyXConfigureOptions="${LyXConfigureOptions} ${1}"
@ -245,7 +255,6 @@ fi
ARCH_LIST=${ARCH_LIST:-"ppc i386"} ARCH_LIST=${ARCH_LIST:-"ppc i386"}
strip="-strip"
aspellstrip= aspellstrip=
LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build} LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build}
@ -887,12 +896,18 @@ build_package() {
cd "${LyxAppPrefix}" && zip -r "${LyxAppZip}" . cd "${LyxAppPrefix}" && zip -r "${LyxAppZip}" .
) )
DMGARCH=""
for arch in ${ARCH_LIST} ; do
DMGARCH="${DMGARCH}-${arch}"
done
QtDmgArchSuffix=${QtMajorVersion}${DMGARCH}${Qt4API}.dmg
test -n "${DMGLocation}" && ( test -n "${DMGLocation}" && (
make_dmg "${DMGLocation}" make_dmg "${DMGLocation}"
if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt4_deployment}" ]; then if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt4_deployment}" ]; then
rm -f "${DMGLocation}/${DMGNAME}+${Qt4DmgSuffix}" rm -f "${DMGLocation}/${DMGNAME}+${QtDmgArchSuffix}"
echo move to "${DMGLocation}/${DMGNAME}+${Qt4DmgSuffix}" echo move to "${DMGLocation}/${DMGNAME}+${QtDmgArchSuffix}"
mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+${Qt4DmgSuffix}" mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+${QtDmgArchSuffix}"
fi fi
) )
} }