# This script automates creating universal binaries of LyX on Mac.
# Author: Bennett Helm (and extended by Konrad Hofbauer)
-# modified by Stephan Witt
-# Last modified: 9 July 2010
+# latest changes by Stephan Witt
+# Last modified: January 2011
-#Qt4SourceVersion="qt-everywhere-opensource-src-4.7.0-beta1"
-#Qt4Build="qt4.7-beta"
+MAC_API=-cocoa
+Qt4Version="4.6.3"
+Qt4SourceVersion="qt-everywhere-opensource-src-${Qt4Version}"
+Qt4BuildSubDir="qt-${Qt4Version}-build${MAC_API}"
# Prerequisite:
# * a decent checkout of LyX sources (probably you have it already)
# the hunspell sources placed in a sibling directory (variable HunSpellSourceVersion)
# * 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
+# - hunspell: the dictionary files in the sibling directory dictionaries/dicts
+# - 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"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
+Qt4ConfigureOptions="${Qt4ConfigureOptions} ${MAC_API}"
aspell_dictionaries="no"
hunspell_dictionaries="no"
MACOSX_DEPLOYMENT_TARGET="10.4" # Tiger support is default
SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" # Leopard build is default
+# detection of script home
+LyxSourceDir=`dirname "$0"`
+if [ ! -d "${LyxSourceDir}" ]; then
+ echo Missing LyX source directory.
+ exit 2
+fi
+case "${LyxSourceDir}" in
+/*/development)
+ LyxSourceDir=`dirname "${LyxSourceDir}"`
+ ;;
+/*)
+ ;;
+*/development|development)
+ LyxSourceDir=`dirname "${LyxSourceDir}"`
+ LyxSourceDir=`cd "${LyxSourceDir}";pwd`
+ ;;
+*)
+ LyxSourceDir=`cd "${LyxSourceDir}";pwd`
+ ;;
+esac
+
usage() {
- echo Build script for LyX on Mac OS X
+ 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
echo "All other arguments with -- are passed to configure"
echo "including the defaults: ${LyXConfigureOptions}"
- echo
+ if [ -x "${LyxSourceDir}/configure" ]; then
+ echo
+ echo "*" Configure options of LyX
+ echo
+ "${LyxSourceDir}/configure" --help
+ fi
exit 0
}
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=*)
LyxBuildDir=`echo ${1}|cut -d= -f2`
shift
;;
- --help)
+ --help|--help=*)
usage
;;
--without-aspell)
hunspell_deployment="no"
shift
;;
+ --only-package=*)
+ LyxOnlyPackage=`echo ${1}|cut -d= -f2`
+ shift
+ ;;
--*)
LyXConfigureOptions="${LyXConfigureOptions} ${1}"
shift
esac
done
-# Set these variables -- to
-# (1) the location of your Qt4 installation
-# (2) the location of resulting DMG
-# (3) the version of private aspell installation
-# (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"}
strip="-strip"
aspellstrip=
-# detection of script home
-LyxSourceDir=${1:-`dirname "$0"`}
-if [ ! -d "${LyxSourceDir}" ]; then
- echo Missing LyX source directory.
- exit 2
-fi
-case "${LyxSourceDir}" in
-/*/development)
- LyxSourceDir=`dirname "${LyxSourceDir}"`
- ;;
-/*)
- ;;
-*/development|development)
- LyxSourceDir=`dirname "${LyxSourceDir}"`
- LyxSourceDir=`cd "${LyxSourceDir}";pwd`
- ;;
-*)
- LyxSourceDir=`cd "${LyxSourceDir}";pwd`
- ;;
-esac
-
LyxBuildDir=${LyxBuildDir:-`dirname "${LyxSourceDir}"`/lyx-build}
DMGLocation=${DMGLocation:-"${LyxBuildDir}"}
HunSpellSourceDir=${HUNSPELLDIR:-`dirname "${LyxSourceDir}"`/${HunSpellSourceVersion}}
HunSpellInstallDir=${HunSpellInstallDir:-"${LyxBuildDir}"/SpellChecker.lib}
Qt4SourceDir=${QT4SOURCEDIR:-`dirname "${LyxSourceDir}"`/${Qt4SourceVersion}}
-Qt4BuildDir=${Qt4BuildDir:-"${LyxBuildDir}"/${Qt4Build:-"qt4-build"}}
-DictionarySourceDir=${DICTIONARYDIR:-`dirname "${LyxSourceDir}"`/Dictionaries}
+Qt4BuildDir=${Qt4BuildDir:-"${LyxBuildDir}"/${Qt4BuildSubDir:-"qt4-build"}}
+DictionarySourceDir=${DICTIONARYDIR:-`dirname "${LyxSourceDir}"`/dictionaries}
+DocumentationDir=`dirname "${LyxSourceDir}"`/Documents
+DmgBackground="${LyxSourceDir}"/development/MacOSX/dmg-background.png
ASpellInstallHdr="${ASpellInstallDir}/include/aspell.h"
HunSpellInstallHdr="${HunSpellInstallDir}/include/hunspell/hunspell.h"
if [ -z "${LyXVersion}" ]; then
LyXVersion=`grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()"`
fi
+LyXVersionSuffix=${LyXVersionSuffix:-`echo "${LyXVersion}" | cut -d. -f1-2`}
LyxName="LyX"
LyxBase="${LyxName}-${LyXVersion}"
DMGNAME="${LyxBase}"
DMGSIZE="550m"
-BACKGROUND="${LyxAppDir}.app/Contents/Resources/images/banner.png"
# Check for existing SDKs
SDKs=`echo /Developer/SDKs/MacOSX10*sdk`
*10.6*)
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.5"}; export MACOSX_DEPLOYMENT_TARGET
case "${MACOSX_DEPLOYMENT_TARGET}" in
+ 10.6)
+ SDKROOT="/Developer/SDKs/MacOSX10.6.sdk"; export SDKROOT
+ ;;
10.5|10.4)
SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT
;;
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
- 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 [ -d "${Qt4SourceDir}" -a ! -d "${Qt4BuildDir}" ]; then
+if [ "${configure_qt4_frameworks}" != "yes" -a -d "${Qt4SourceDir}" -a ! \( -d "${Qt4BuildDir}" -a -d "${QtInstallDir}" \) ]; 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
)
)
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
CXXFLAGS=-g "${ASpellSourceDir}/configure"\
--prefix="${ASpellInstallDir}"\
${AspellConfigureOptions}
- #--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"}
make && make install${aspellstrip}
for file in ${FILE_LIST} ; do
if [ -f "${ASpellInstallDir}"/lib/${file} ]; then
done
fi
-# exit 0
-
framework_name() {
echo "Frameworks/${1}.framework"
}
-if [ ! -f "${LyxSourceDir}"/configure -o "${LyxSourceDir}"/configure -ot "${LyxSourceDir}"/configure.ac ]; then
- ( cd "${LyxSourceDir}" && sh autogen.sh )
-fi
-
-FILE_LIST="lyx lyxclient tex2lyx"
+LYX_FILE_LIST="lyx lyxclient tex2lyx"
BUNDLE_PATH="Contents/MacOS"
LYX_BUNDLE_PATH="${LyxAppPrefix}/${BUNDLE_PATH}"
build_lyx() {
if [ -n "${LyxAppZip}" -a -f "${LyxAppZip}" ]; then rm "${LyxAppZip}"; fi
if [ -d "${LyxAppPrefix}" ]; then rm -rf "${LyxAppPrefix}"; fi
+ # -------------------------------------
+ # Automate configure check
+ # -------------------------------------
+ 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 [ -f "$dname/Makefile.in" -a "$dname/Makefile.in" -ot "$file" ]; then
+ ( cd "${LyxSourceDir}" && sh autogen.sh )
+ break
+ fi
+ done
+ fi
# -------------------------------------
# Build LyX for different architectures
# -------------------------------------
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
for arch in ${ARCH_LIST} ; do
if [ -d "${LyxBuildDir}" ]; then rm -r "${LyxBuildDir}"; fi
- mkdir "${LyxBuildDir}" && cd "${LyxBuildDir}"
+ mkdir -p "${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
+
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}
- for file in ${FILE_LIST} ; do
+ make -j2 && make install${strip}
+ for file in ${LYX_FILE_LIST} ; do
if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
mv "${LYX_BUNDLE_PATH}/${file}"\
"${LYX_BUNDLE_PATH}/${file}-${arch}"
test -f "${condir}/Resources/qt.conf" || cat - > "${condir}/Resources/qt.conf" <<-EOF
[Paths]
Plugins = PlugIns
+Translations = translations
EOF
if [ ! -d "${condir}/PlugIns" ]; then
mkdir -p "${condir}/PlugIns"
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}"`
echo Set library id in "${condir}/${fwdir}/${version}${libnm}"
install_name_tool -id "@executable_path/../${fwdir}/${version}${libnm}" "${condir}/${fwdir}/${version}${libnm}"
find "${condir}/PlugIns" "${condir}/"`dirname "${fwdir}"` -name Headers -prune -o -type f -print | while read filename ; do
- otool -L "${filename}" 2>/dev/null | while read library ; do
- # pattern match for: /path/to/qt4/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.6.0, current version 4.6.2)
- case "${library}" in
- *"${libnm}"*"("*")"*)
- echo Correct library id reference to "${libnm}" in "${filename}"
- install_name_tool -change\
- "${source}/lib/${dirname}/${version}${libnm}"\
- "@executable_path/../${fwdir}/${version}${libnm}"\
- "${filename}"
- ;;
- esac
- done
+ if [ "${filename}" != "${target}" ]; then
+ otool -L "${filename}" 2>/dev/null | sort -u | while read library ; do
+ # pattern match for: /path/to/qt4/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.6.0, current version 4.6.2)
+ case "${library}" in
+ *"${libnm}"*"("*version*")"*)
+ echo Correct library id reference to "${libnm}" in "${filename}"
+ install_name_tool -change\
+ "${source}/lib/${dirname}/${version}${libnm}"\
+ "@executable_path/../${fwdir}/${version}${libnm}"\
+ "${filename}"
+ ;;
+ esac
+ done
+ fi
done
)
echo Correct library id reference to "${libnm}" in "${target}"
"@executable_path/../${fwdir}/${version}${libnm}"\
"${target}"
done
+ if [ ! -d "${condir}/translations" ]; then
+ mkdir -p "${condir}/translations"
+ fi
+ echo Copy Qt translations to "${condir}/translations"
+ cp -p "${source}"/translations/qt_*.qm "${condir}/translations"
}
# -------------------------
# -------------------------
convert_universal() {
cd "${LyxAppPrefix}"
- for file in ${FILE_LIST} ; do
+ for file in ${LYX_FILE_LIST} ; do
OBJ_LIST=
for arch in ${ARCH_LIST} ; do
if [ -f "${BUNDLE_PATH}/${file}-${arch}" ]; then
if [ -d /opt/local/lib/aspell-0.60 ]; then ASpellInstallDir=/opt/local ; fi
mkdir -p "${ASpellResources}"
echo Copy Aspell dictionaries from "${ASpellInstallDir}"
- mkdir -p "${ASpellResources}"/data "${ASpellResources}"/dict
+ mkdir -p "${ASpellResources}"/data "${ASpellResources}"/dicts
cp -p -r "${ASpellInstallDir}/lib/aspell-0.60"/* "${ASpellResources}"/data
- cp -p -r "${ASpellInstallDir}/share/aspell"/* "${ASpellResources}"/dict
+ cp -p -r "${ASpellInstallDir}/share/aspell"/* "${ASpellResources}"/dicts
fi
if [ -d "${HunSpellInstallDir}" -a "yes" = "${hunspell_dictionaries}" ]; then
HunSpellResources="${LyxAppPrefix}/Contents/Resources"
if [ -d "${DictionarySourceDir}" ]; then
- updateDictionaries "${DictionarySourceDir}"
- cp -p -r "${DictionarySourceDir}/dict" "${HunSpellResources}"
+ ( cd "${DictionarySourceDir}" && find dicts -name .svn -prune -o -type f -print | cpio -pmdv "${HunSpellResources}" )
fi
fi
if [ -d "${DictionarySourceDir}" -a "yes" = "${thesaurus_deployment}" ]; then
MyThesResources="${LyxAppPrefix}/Contents/Resources"
- cp -p -r "${DictionarySourceDir}/thes" "${MyThesResources}"
+ ( cd "${DictionarySourceDir}" && find thes -name .svn -prune -o -type f -print | cpio -pmdv "${MyThesResources}" )
fi
}
-function set_bundle_display_options() {
+set_bundle_display_options() {
+ X_BOUNDS=$2
+ Y_BOUNDS=$3
+ Y_POSITION=$((Y_BOUNDS - 65))
+ Y_BOUNDS=$((Y_BOUNDS + 20))
+ LYX_X_POSITION=$((X_BOUNDS / 4))
+ LYX_Y_POSITION=$Y_POSITION
+ APP_X_POSITION=$((3 * X_BOUNDS / 4))
+ APP_Y_POSITION=$Y_POSITION
osascript <<-EOF
- tell application "Finder"
+ tell application "Finder"
set f to POSIX file ("${1}" as string) as alias
tell folder f
open
set statusbar visible to false
set current view to icon view
delay 1 -- sync
- set the bounds to {20, 50, $2, $3}
+ set the bounds to {20, 50, $X_BOUNDS, $Y_BOUNDS}
end tell
delay 1 -- sync
set icon size of the icon view options of container window to 64
set arrangement of the icon view options of container window to not arranged
- set position of item "${LyxName}.app" to {100,$4}
- set position of item "Applications" to {280,$4}
+ set position of item "Documents" to {$LYX_X_POSITION,0}
+ set position of item "${LyxName}.app" to {$LYX_X_POSITION,$LYX_Y_POSITION}
+ set position of item "Applications" to {$APP_X_POSITION,$APP_Y_POSITION}
set background picture of the icon view options\
of container window to file "background.png" of folder "Pictures"
- set the bounds of the container window to {0, 0, $2, $3}
+ set the bounds of the container window to {0, 0, $X_BOUNDS, $Y_BOUNDS}
update without registering applications
delay 5 -- sync
close
EOF
}
-function make_dmg() {
+make_dmg() {
cd "${1}"
- BGSIZE=`file "$BACKGROUND" | awk -F , '/PNG/{print $2 }' | tr x ' '`
+ BGSIZE=`file "$DmgBackground" | awk -F , '/PNG/{print $2 }' | tr x ' '`
BG_W=`echo ${BGSIZE} | awk '{print $1 }'`
- BG_H=`echo ${BGSIZE} | awk '{h = $2 + 20 ;print h }'`
- BG_Y=`echo ${BGSIZE} | awk '{y = $2 - 60 ;print y }'`
+ BG_H=`echo ${BGSIZE} | awk '{print $2 }'`
rm -f "${DMGNAME}.sparseimage" "${DMGNAME}.dmg"
# copy in background image
mkdir -p "${VOLUME}/Pictures"
- cp "${BACKGROUND}" "${VOLUME}/Pictures/background.png"
+ cp "${DmgBackground}" "${VOLUME}/Pictures/background.png"
# symlink applications
ln -s /Applications/ "${VOLUME}"/Applications
- set_bundle_display_options "${VOLUME}" ${BG_W} ${BG_H} ${BG_Y}
+ test -d "${DocumentationDir}" && cp -r "${DocumentationDir}" "${VOLUME}"
+ set_bundle_display_options "${VOLUME}" ${BG_W} ${BG_H}
+ /Developer/Tools/SetFile -a C "${VOLUME}"
mv "${VOLUME}/Pictures" "${VOLUME}/.Pictures"
# Unmount the disk image
rm -f "${DMGNAME}.sparseimage"
}
-build_lyx
-convert_universal
-copy_dictionaries
-
# ------------------------------
# Building distribution packages
# ------------------------------
-test -n "${LyxAppZip}" && (
- cd "${LyxAppPrefix}" && zip -r "${LyxAppZip}" .
-)
-
-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"
- 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}"
- fi
-)
+build_package() {
+ test -n "${LyxAppZip}" && (
+ cd "${LyxAppPrefix}" && zip -r "${LyxAppZip}" .
+ )
+
+ 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${MAC_API}.dmg"
+ mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+qt4${MAC_API}.dmg"
+ fi
+ )
+}
+
+# ------------------------------
+# main block
+# ------------------------------
+
+if [ ${LyxOnlyPackage:-"no"} = "no" ]; then
+ build_lyx
+ convert_universal
+ copy_dictionaries
+fi
+build_package
projects / lyx.git / blobdiff