# modified by Stephan Witt
# Last modified: 9 July 2010
-#Qt4SourceVersion="qt-everywhere-opensource-src-4.7.0-beta1"
-#Qt4Build="qt4.7-beta"
+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)
# - 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 --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib"
+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"
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)"
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
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"
;;
--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=*)
# (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=${Qt4SourceVersion:-"qt-everywhere-opensource-src-4.6.3"}
+HunSpellSourceVersion="hunspell-1.2.12"
ARCH_LIST=${ARCH_LIST:-"ppc i386"}
HunSpellSourceDir=${HUNSPELLDIR:-`dirname "${LyxSourceDir}"`/${HunSpellSourceVersion}}
HunSpellInstallDir=${HunSpellInstallDir:-"${LyxBuildDir}"/SpellChecker.lib}
Qt4SourceDir=${QT4SOURCEDIR:-`dirname "${LyxSourceDir}"`/${Qt4SourceVersion}}
-Qt4BuildDir=${Qt4BuildDir:-"${LyxBuildDir}"/${Qt4Build:-"qt4-build"}}
+Qt4BuildDir=${Qt4BuildDir:-"${LyxBuildDir}"/${Qt4BuildSubDir:-"qt4-build"}}
DictionarySourceDir=${DICTIONARYDIR:-`dirname "${LyxSourceDir}"`/Dictionaries}
ASpellInstallHdr="${ASpellInstallDir}/include/aspell.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"
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
+ 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)
rm -rf "$TMP_DIR"
}
-if [ -d "${Qt4SourceDir}" -a ! -d "${Qt4BuildDir}" ]; then
+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
done
echo configure options:
echo ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-
echo yes | "${Qt4SourceDir}"/configure ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
make && make install
)
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"
# -------------------------------------
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
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} ${MYCFLAGS}"; 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_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"`
projects / lyx.git / blobdiff