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

correct copying of Qt frameworks to application bundle; make using two cpus; support for 64bit build

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35247 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2010-08-31 20:35:17 +00:00
parent 4b6fe42475
commit 35b2872c8e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,9 @@ ${SDKROOT})
*10.6*) *10.6*)
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.5"}; export MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.5"}; export MACOSX_DEPLOYMENT_TARGET
case "${MACOSX_DEPLOYMENT_TARGET}" in case "${MACOSX_DEPLOYMENT_TARGET}" in
10.6)
SDKROOT="/Developer/SDKs/MacOSX10.6.sdk"; export SDKROOT
;;
10.5|10.4) 10.5|10.4)
SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT
;; ;;
@ -532,7 +535,7 @@ build_lyx() {
${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \ ${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
${LyXConfigureOptions}\ ${LyXConfigureOptions}\
--host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \ --host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \
make && make install${strip} make -j2 && make install${strip}
for file in ${FILE_LIST} ; do for file in ${FILE_LIST} ; do
if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
mv "${LYX_BUNDLE_PATH}/${file}"\ mv "${LYX_BUNDLE_PATH}/${file}"\
@ -591,6 +594,8 @@ EOF
fi fi
for libnm in ${QtLibraries} ; do for libnm in ${QtLibraries} ; do
fwdir=`framework_name "$libnm"` fwdir=`framework_name "$libnm"`
dirname=`dirname "${fwdir}"`
mkdir -p "${condir}/${dirname}"
dirname=`basename "${fwdir}"` dirname=`basename "${fwdir}"`
test -d "${condir}/${fwdir}" || ( test -d "${condir}/${fwdir}" || (
echo Copy framework "${source}/lib/"`basename "${fwdir}"` echo Copy framework "${source}/lib/"`basename "${fwdir}"`