]> git.lyx.org Git - lyx.git/blobdiff - development/LyX-Mac-binary-release.sh
updated compile instructions for the MSVC 2010 / CMake environment
[lyx.git] / development / LyX-Mac-binary-release.sh
index b0460897b928196394193463577e5ae46efb50b6..fc8da7bece94672f85b4e7ee3465f6d52dfa7b4d 100644 (file)
@@ -5,7 +5,10 @@
 # This script automates creating universal binaries of LyX on Mac.
 # Author: Bennett Helm (and extended by Konrad Hofbauer)
 # modified by Stephan Witt
-# Last modified: 17 April 2010
+# Last modified: 9 July 2010
+
+Qt4SourceVersion="qt-everywhere-opensource-src-4.7.1"
+Qt4BuildSubDir="qt-4.7.1-build"
 
 # Prerequisite:
 # * a decent checkout of LyX sources (probably you have it already)
 #   the aspell sources placed in a sibling directory (variable ASpellSourceVersion)
 # * for hunspell support:
 #   the hunspell sources placed in a sibling directory (variable HunSpellSourceVersion)
-# * for dictionary deployment:
+# * for dictionary deployment (per default thesauri only):
 #   - aspell:   the dictionary files of macports (in /opt/local/share/aspell and /opt/local/lib/aspell-0.60)
 #   - hunspell: the dictionary files in the sibling directory Dictionaries/dict
 #   - mythes:   the data and idx files in the sibling directory Dictionaries/thes
 
-LyXConfigureOptions="--enable-warnings --enable-optimization=-Os --with-included-gettext"
-AspellConfigureOptions="--enable-warnings --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
+LyXConfigureOptions="--enable-warnings --enable-optimization=-Os --with-included-gettext --with-x=no"
+AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
 HunspellConfigureOptions="--with-warnings --disable-nls --with-included-gettext --disable-static"
 Qt4ConfigureOptions="-opensource -silent -shared -release -fast -no-exceptions"
 Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
 Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
 
+aspell_dictionaries="no"
+hunspell_dictionaries="no"
+
 aspell_deployment="yes"
 hunspell_deployment="yes"
 thesaurus_deployment="yes"
+
 qt4_deployment="yes"
+
 MACOSX_DEPLOYMENT_TARGET="10.4" # Tiger support is default
+SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" # Leopard build is default
 
 usage() {
        echo Build script for LyX on Mac OS X
        echo
        echo Optional arguments:
        echo " --aspell-deployment=yes|no ." default yes
+       echo " --with-qt4-frameworks=yes|no" default no
        echo " --qt4-deployment=yes|no ...." default yes
        echo " --with-macosx-target=TARGET " default 10.4 "(Tiger)"
+       echo " --with-sdkroot=SDKROOT ....." default 10.5 "(Leopard)"
        echo " --with-arch=ARCH ..........." default ppc,i386
        echo " --with-build-path=PATH ....." default \${lyx-src-dir}/../lyx-build
        echo " --with-dmg-location=PATH ..." default \${build-path}
@@ -52,6 +63,14 @@ usage() {
 
 while [ $# -gt 0 ]; do
        case "${1}" in
+       --with-qt4-frameworks=*)
+               configure_qt4_frameworks=`echo ${1}|cut -d= -f2`
+               if [ "$configure_qt4_frameworks" = "yes" ]; then
+                       unset QTDIR
+                       qt4_deployment="no"
+               fi
+               shift
+               ;;
        --with-qt4-dir=*)
                QTDIR=`echo ${1}|cut -d= -f2`
                shift
@@ -60,12 +79,32 @@ while [ $# -gt 0 ]; do
                MACOSX_DEPLOYMENT_TARGET=`echo ${1}|cut -d= -f2`
                shift
                ;;
+       --with-sdkroot=*)
+               SDKROOT=`echo ${1}|cut -d= -f2`
+               case "${SDKROOT}" in
+               10.4)
+                       SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"
+                       export CC=gcc-4.0
+                       export OBJC=gcc-4.0
+                       export CXX=g++-4.0
+                       ;;
+               10.5|10.6)
+                       SDKROOT="/Developer/SDKs/MacOSX${SDKROOT}.sdk"
+                       ;;
+               *)
+                       usage
+                       ;;
+               esac
+               shift
+               ;;
        --aspell-deployment=*)
                aspell_deployment=`echo ${1}|cut -d= -f2`
+               aspell_dictionaries=$aspell_deployment
                shift
                ;;
        --hunspell-deployment=*)
                hunspell_deployment=`echo ${1}|cut -d= -f2`
+               hunspell_dictionaries=$hunspell_deployment
                shift
                ;;
        --thesaurus-deployment=*)
@@ -119,15 +158,17 @@ done
 #     (to define the location assign ASpellSourceDir instead)
 # (4) the list of architectures to build for
 
-QtInstallDir=${QTDIR:-"/opt/qt4"}
+if [ "${configure_qt4_frameworks}" != "yes" ]; then
+       QtInstallDir=${QTDIR:-"/opt/qt4"}
+fi
 QtFrameworkVersion="4"
 ASpellSourceVersion="aspell-0.60.6"
-HunSpellSourceVersion="hunspell-1.2.9"
-Qt4SourceVersion="qt-everywhere-opensource-src-4.6.2"
+HunSpellSourceVersion="hunspell-1.2.12"
 
 ARCH_LIST=${ARCH_LIST:-"ppc i386"}
 
 strip="-strip"
+aspellstrip=
 
 # detection of script home
 LyxSourceDir=${1:-`dirname "$0"`}
@@ -158,7 +199,7 @@ ASpellInstallDir=${ASpellInstallDir:-"${LyxBuildDir}"/SpellChecker.lib}
 HunSpellSourceDir=${HUNSPELLDIR:-`dirname "${LyxSourceDir}"`/${HunSpellSourceVersion}}
 HunSpellInstallDir=${HunSpellInstallDir:-"${LyxBuildDir}"/SpellChecker.lib}
 Qt4SourceDir=${QT4SOURCEDIR:-`dirname "${LyxSourceDir}"`/${Qt4SourceVersion}}
-Qt4BuildDir="${LyxBuildDir}/qt4-build"
+Qt4BuildDir=${Qt4BuildDir:-"${LyxBuildDir}"/${Qt4BuildSubDir:-"qt4-build"}}
 DictionarySourceDir=${DICTIONARYDIR:-`dirname "${LyxSourceDir}"`/Dictionaries}
 
 ASpellInstallHdr="${ASpellInstallDir}/include/aspell.h"
@@ -166,6 +207,8 @@ HunSpellInstallHdr="${HunSpellInstallDir}/include/hunspell/hunspell.h"
 
 if [ -z "${LyXVersion}" ]; then
        LyXVersion=`grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()"`
+       LyXVersionSuffix=`echo "${LyXVersion}" | cut -d. -f1-2`
+       LyXVersionSuffix="${LyXVersionSuffix:-${LyXVersion}}"
 fi
 
 LyxName="LyX"
@@ -183,14 +226,6 @@ BuildSystem=`"${LyxSourceDir}/config/config.guess"`
 # DON'T MODIFY ANYTHING BELOW HERE!
 # ---------------------------------
 
-# These variables define the identifiers of the
-# system (both Intel and PowerPC) to compile for.
-# (Note: darwin8 is 10.4; darwin9 is 10.5.)
-# Only change these if necessary
-
-HostSystem_i386="i686-apple-darwin8"
-HostSystem_ppc="powerpc-apple-darwin8"
-
 # don't change order here...
 QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
 
@@ -201,23 +236,22 @@ BACKGROUND="${LyxAppDir}.app/Contents/Resources/images/banner.png"
 # Check for existing SDKs
 SDKs=`echo /Developer/SDKs/MacOSX10*sdk`
 case "$SDKs" in
+${SDKROOT})
+       ;;
 *10.6*)
        MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.5"}; export MACOSX_DEPLOYMENT_TARGET
        case "${MACOSX_DEPLOYMENT_TARGET}" in
-       10.5)
-               SDKROOT="/Developer/SDKs/MacOSX10.5.sdk"; export SDKROOT
+       10.6)
+               SDKROOT="/Developer/SDKs/MacOSX10.6.sdk"; export SDKROOT
                ;;
-       10.4)
-               SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"; export SDKROOT
-               CC=gcc-4.0 ; export CC
-               CXX=g++-4.0 ; export CXX
-               OBJC=gcc-4.0 ; export OBJC
+       10.5|10.4)
+               SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT
                ;;
        esac
        ;;
 *10.5*)
-       MACOSX_DEPLOYMENT_TARGET="10.4"; export MACOSX_DEPLOYMENT_TARGET
-       SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"; export SDKROOT
+       MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.4"}; export MACOSX_DEPLOYMENT_TARGET
+       SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT
        ;;
 *)
        echo Unknown or missing SDK for Mac OS X.
@@ -226,9 +260,95 @@ case "$SDKs" in
 esac
 MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 
-if [ -d "${Qt4SourceDir}" -a ! -d "${Qt4BuildDir}" ]; then
-       echo Build Qt4 library ${Qt4SourceDir}
+# These variables define the identifiers of the
+# system (both Intel and PowerPC) to compile for.
+# (Note: darwin8 is 10.4; darwin9 is 10.5.)
+# Only change these if necessary
 
+HostSystem_i386="i686-apple-darwin8"
+HostSystem_ppc="powerpc-apple-darwin8"
+
+updateDictionaries() {
+       TMP_DIR="/tmp/lyx-build-$$"
+       mkdir -p "$1"/dict "$1"/thes
+       mkdir -p "$TMP_DIR" && (
+               for pack in "$1"/*.zip ; do
+                       case "${pack}" in
+                       *de_DE-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" de_DE_comb.zip thes_de_DE_v2.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/de_DE_comb.zip &&\
+                                       for suffix in .aff .dic ; do mv de_DE_comb$suffix de_DE$suffix; done
+                               cd "$1"/thes && unzip -o "$TMP_DIR"/thes_de_DE_v2.zip
+                               ;;
+                       *pl_PL-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" pl_PL.zip thes_pl_PL_v2.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/pl_PL.zip
+                               cd "$1"/thes && unzip -o "$TMP_DIR"/thes_pl_PL_v2.zip
+                               ;;
+                       *fr_FR-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" fr_FR.zip thes_fr_FR_v2.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/fr_FR.zip
+                               cd "$1"/thes && unzip -o "$TMP_DIR"/thes_fr_FR_v2.zip
+                               ;;
+                       *es_ES-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" es_ES.zip es_MX.zip thes_es_ES_v2.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/es_ES.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/es_MX.zip
+                               cd "$1"/thes && unzip -o "$TMP_DIR"/thes_es_ES_v2.zip
+                               ;;
+                       *pt_PT-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" pt_PT.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/pt_PT.zip
+                               cd "$1"/dict && unzip -o "$1"/pt_BR.zip
+                               cd "$1"/thes && unzip -o "$1"/thes_pt_PT_v2.zip
+                               ;;
+                       *it_IT-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" it_IT.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/it_IT.zip
+                               cd "$1"/thes && unzip -o "$1"/thes_it_IT_v2.zip
+                               ;;
+                       *ru_RU-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" ru_RU.zip
+                               cd "$1"/dict && unzip -o "$TMP_DIR"/ru_RU.zip
+                               cd "$1"/thes && tar xvf "$1"/thes_ru_RU_v2.tar.bz2
+                               ;;
+                       *en_EN-pack.zip)
+                               cd "$TMP_DIR" && unzip "${pack}" en_AU.zip en_CA.zip en_GB.zip en_NZ.zip en_US.zip
+                               for zipfile in en_AU.zip en_CA.zip en_GB.zip en_NZ.zip en_US.zip ; do
+                                       ( cd "$1"/dict && unzip -o "$TMP_DIR/$zipfile" )
+                               done
+                               cd "$1"/thes && unzip -o "$1"/thes_en_US_v2.zip
+                               ;;
+                       XXXX*-pack*)
+                               cd "$TMP_DIR" && unzip -l "${pack}" | while read len date time zipfile ; do
+                                       case "$zipfile" in
+                                       thes*_v2.zip)
+                                               echo "$zipfile"
+                                               cd "$TMP_DIR" && unzip -o "${pack}" "$zipfile"
+                                               cd "$1"/thes && unzip -o "$TMP_DIR"/"$zipfile"
+                                               ;;
+                                       [a-z][a-z]_[A-Z][A-Z].zip)
+                                               echo "$zipfile"
+                                               cd "$TMP_DIR" && unzip -o "${pack}" "$zipfile"
+                                               cd "$1"/dict && unzip -o "$TMP_DIR"/"$zipfile"
+                                               ;;
+                                       esac
+                               done
+                               # echo Ignore dictionary package `basename "${pack}"`
+                               ;;
+                       esac
+               done
+       )
+       rm -rf "$TMP_DIR"
+}
+
+if [ "${configure_qt4_frameworks}" != "yes" -a -d "${Qt4SourceDir}" -a ! -d "${Qt4BuildDir}" ]; then
+       echo Build Qt4 library ${Qt4SourceDir}
+       if [ "${QtInstallDir}" = "${Qt4BuildDir}" ]; then
+               echo Bad install directory for Qt.
+               echo Must be different from build directory "${Qt4BuildDir}".
+               exit 1
+       fi
        (
                mkdir -p "${Qt4BuildDir}" && cd "${Qt4BuildDir}"
                for arch in ${ARCH_LIST} ; do
@@ -236,7 +356,6 @@ if [ -d "${Qt4SourceDir}" -a ! -d "${Qt4BuildDir}" ]; then
                done
                echo configure options:
                echo ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-
                echo yes | "${Qt4SourceDir}"/configure ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
                make && make install
        )
@@ -249,6 +368,9 @@ if [ -d "${Qt4SourceDir}" -a ! -d "${Qt4BuildDir}" ]; then
        )
 fi
 
+# updateDictionaries "${DictionarySourceDir}"
+# exit
+
 if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
        # we have a private HunSpell source tree at hand...
        # so let's build and install it
@@ -272,8 +394,8 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
 
        for arch in ${ARCH_LIST} ; do
                make distclean
-               CPPFLAGS=" -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
-               LDFLAGS=" -arch ${arch}"; export LDFLAGS
+               CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
+               LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
                HOSTSYSTEM=`eval "echo \\$HostSystem_$arch"`
                "${HunSpellSourceDir}/configure"\
                        --prefix="${HunSpellInstallDir}"\
@@ -313,9 +435,6 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
        done
 fi
 
-#exit 0
-
-
 if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_deployment}" ]; then
        # we have a private ASpell source tree at hand...
        # so let's build and install it
@@ -340,14 +459,14 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
 
        for arch in ${ARCH_LIST} ; do
                make distclean
-               CPPFLAGS=" -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
-               LDFLAGS=" -arch ${arch}"; export LDFLAGS
+               CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
+               LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
                HOSTSYSTEM=`eval "echo \\$HostSystem_$arch"`
-               "${ASpellSourceDir}/configure"\
+               CXXFLAGS=-g "${ASpellSourceDir}/configure"\
                        --prefix="${ASpellInstallDir}"\
                        ${AspellConfigureOptions}
                        #--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"}
-               make && make install${strip}
+               make && make install${aspellstrip}
                for file in ${FILE_LIST} ; do
                        if [ -f "${ASpellInstallDir}"/lib/${file} ]; then
                                mv "${ASpellInstallDir}"/lib/${file}\
@@ -379,12 +498,23 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
        done
 fi
 
+# exit 0
+
+
 framework_name() {
        echo "Frameworks/${1}.framework"
 }
 
-if [ ! -f "${LyxSourceDir}"/configure ]; then
+if [ ! -f "${LyxSourceDir}"/configure -o "${LyxSourceDir}"/configure -ot "${LyxSourceDir}"/configure.ac ]; then
        ( cd "${LyxSourceDir}" && sh autogen.sh )
+else
+       find "${LyxSourceDir}" -name Makefile.am -print | while read file ; do
+               dname=`dirname "$file"`
+               if [ "$dname/Makefile.in" -ot "$file" ]; then
+                       ( cd "${LyxSourceDir}" && sh autogen.sh )
+                       break
+               fi
+       done
 fi
 
 FILE_LIST="lyx lyxclient tex2lyx"
@@ -400,11 +530,8 @@ build_lyx() {
        # -------------------------------------
 
        if [ -d "${ASpellInstallDir}" -a "yes" = "${aspell_deployment}" ]; then
-               ASpellFramework=`framework_name Aspell`
-               ASpellFramework=`basename "${ASpellFramework}"`
                ConfigureExtraInc="--with-extra-inc=${ASpellInstallDir}/include"
                ConfigureExtraLib="--with-extra-lib=${ASpellInstallDir}/lib"
-               LyXConfigureOptions="${LyXConfigureOptions} --with-aspell-framework=${ASpellFramework}"
        fi
 
        if [ -d "${HunSpellInstallDir}" -a "yes" = "${hunspell_deployment}" ]; then
@@ -422,19 +549,32 @@ build_lyx() {
                if [ -d "${LyxBuildDir}" ];  then rm -r "${LyxBuildDir}"; fi
                mkdir "${LyxBuildDir}" && cd "${LyxBuildDir}"
 
-               CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
-               LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch}"; export LDFLAGS
+               CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
+               LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
                HOSTSYSTEM=`eval "echo \\$HostSystem_$arch"`
 
+               if [ "$configure_qt4_frameworks" = "yes" ]; then
+                       export QT4_CORE_CFLAGS="-FQtCore"
+                       export QT4_CORE_LIBS="-framework QtCore"
+                       export QT4_FRONTEND_CFLAGS="-FQtGui"
+                       export QT4_FRONTEND_LIBS="-framework QtGui"
+                       export PKG_CONFIG=""
+                       CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtCore.framework/Headers"
+                       CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtGui.framework/Headers"
+               fi
+               LDFLAGS="${LDFLAGS} -framework Carbon -framework AppKit"
+
                echo LDFLAGS="${LDFLAGS}"
+               export LDFLAGS
                echo CPPFLAGS="${CPPFLAGS}"
-               echo CONFIGURE_OPTIONS="${LyXConfigureOptions}"
+               export CPPFLAGS
+               echo CONFIGURE_OPTIONS="${LyXConfigureOptions}" ${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"}
                "${LyxSourceDir}/configure"\
-                       --prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersion}"\
+                       --prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\
                        ${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
                        ${LyXConfigureOptions}\
-                       --host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel
-               make && make install${strip}
+                       --host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \
+               make -j2 && make install${strip}
                for file in ${FILE_LIST} ; do
                        if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
                                mv "${LYX_BUNDLE_PATH}/${file}"\
@@ -493,6 +633,8 @@ EOF
        fi
        for libnm in ${QtLibraries} ; do
                fwdir=`framework_name "$libnm"`
+               dirname=`dirname "${fwdir}"`
+               mkdir -p "${condir}/${dirname}"
                dirname=`basename "${fwdir}"`
                test -d "${condir}/${fwdir}" || (
                        echo Copy framework "${source}/lib/"`basename "${fwdir}"`
@@ -560,19 +702,20 @@ convert_universal() {
 }
 
 copy_dictionaries() {
-       if [ -d "${ASpellInstallDir}" -a "yes" = "${aspell_deployment}" ]; then
-               ASpellFramework=`framework_name Aspell`
-               ASpellResources="${LyxAppPrefix}/Contents/${ASpellFramework}/Resources"
+       if [ -d "${ASpellInstallDir}" -a "yes" = "${aspell_dictionaries}" ]; then
+               ASpellResources="${LyxAppPrefix}/Contents/Resources"
                # try to reuse macports dictionaries for now
                if [ -d /opt/local/lib/aspell-0.60 ]; then ASpellInstallDir=/opt/local ; fi
                mkdir -p "${ASpellResources}"
                echo Copy Aspell dictionaries from "${ASpellInstallDir}"
-               cp -p -r "${ASpellInstallDir}/lib/aspell-0.60" "${ASpellResources}"/data
-               cp -p -r "${ASpellInstallDir}/share/aspell" "${ASpellResources}"/dict
+               mkdir -p "${ASpellResources}"/data "${ASpellResources}"/dict
+               cp -p -r "${ASpellInstallDir}/lib/aspell-0.60"/* "${ASpellResources}"/data
+               cp -p -r "${ASpellInstallDir}/share/aspell"/* "${ASpellResources}"/dict
        fi
-       if [ -d "${HunSpellInstallDir}" -a "yes" = "${hunspell_deployment}" ]; then
+       if [ -d "${HunSpellInstallDir}" -a "yes" = "${hunspell_dictionaries}" ]; then
                HunSpellResources="${LyxAppPrefix}/Contents/Resources"
                if [ -d "${DictionarySourceDir}" ]; then
+                       updateDictionaries "${DictionarySourceDir}"
                        cp -p -r "${DictionarySourceDir}/dict" "${HunSpellResources}"
                fi
        fi
@@ -669,11 +812,12 @@ test -n "${DMGLocation}" && (
        make_dmg "${DMGLocation}"
        if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt4_deployment}" ]; then
                rm -f "${DMGLocation}/${DMGNAME}+qt4.dmg"
+               echo move to "${DMGLocation}/${DMGNAME}+qt4.dmg"
                mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+qt4.dmg"
-               for libnm in ${QtLibraries} ; do
-                       fwdir=`framework_name "$libnm"`
-                       rm -rf "${LyxAppDir}.app/Contents/${fwdir}"
-               done
-               make_dmg "${DMGLocation}"
+               #for libnm in ${QtLibraries} ; do
+               #       fwdir=`framework_name "$libnm"`
+               #       rm -rf "${LyxAppDir}.app/Contents/${fwdir}"
+               #done
+               #make_dmg "${DMGLocation}"
        fi
 )