zhyang-dev/ThirdParty-common
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/ThirdParty-common.git synced 2025-12-08 06:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: Ensure makeQt work (issue #11)

Browse Source
This commit is contained in:
mark
2016-11-21 23:27:52 +01:00
parent 1fd3d5ab4f
commit 8688694af0
3 changed files with 116 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
etc/relocateQt
View File

@ -4,7 +4,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM.
@ -26,12 +26,13 @@
# etc/relocateQt # etc/relocateQt
# #
# Description # Description
# Change prefix when relocating qt installation # Change prefix when relocating QT installation
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
qtVERSION=4.7.2 qtVERSION=4.8.7
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# run from third-party directory only # Run from third-party directory only
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
@ -49,15 +50,18 @@ usage() {
usage: ${0##*/} [OPTION] [VERSION] usage: ${0##*/} [OPTION] [VERSION]
options: options:
-force create qt.conf and edit pkgconfig to use \${prefix} -force Create qt.conf and edit pkgconfig to use \${prefix}
-help -help
Adjust prefix in qt.conf and pkgconfig files after relocating third-party
with a QT installation.
* adjust relocation prefix for $qtVERSION * adjust relocation prefix for $qtVERSION
USAGE USAGE
exit 1 exit 1
} }
#------------------------------------------------------------------------------
unset forceOpt unset forceOpt
# parse options # parse options
@ -70,9 +74,10 @@ do
-f | -force) -f | -force)
forceOpt=true forceOpt=true
;; ;;
[1-9]* | qt-[1-9]*) -qt-[1-9]* | [1-9]* | qt-*)
# -qt-VERSION, VERSION, qt-VERSION, qt-everywhere-opensource-src-VERSION
qtVERSION="${1%%/}"; qtVERSION="${1%%/}";
qtVERSION="${qtVERSION#qt-}" qtVERSION="${qtVERSION##*-}"
;; ;;
*) *)
die "unknown option/argument: '$1'" die "unknown option/argument: '$1'"
@ -82,9 +87,12 @@ do
done done
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
prefixDIR=$installBASE/qt-$qtVERSION QT_ARCH_PATH=$installBASE/qt-$qtVERSION
[ "${forceOpt:-false}" = true ] && finalizeQt if [ "${forceOpt:-false}" = true ]
then
finalizeQt
fi
changePrefix changePrefix

50
etc/tools/QtFunctions
View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM.
@ -30,41 +30,41 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# create a qt.conf file in the QT bin/ # Create a qt.conf file in the QT bin/
# this can be modified easily if the qt installation gets relocated # - this can be modified easily if the qt installation is relocated
# #
createQtConf() createQtConf()
{ {
echo "create:" echo "create:"
echo " $prefixDIR/bin/qt.conf" echo " $QT_ARCH_PATH/bin/qt.conf"
[ -n "$prefixDIR" -a -d "$prefixDIR/bin" ] || { [ -n "$QT_ARCH_PATH" -a -d "$QT_ARCH_PATH/bin" ] || {
echo "Error: prefixDIR not correctly set" echo "Error: QT_ARCH_PATH not correctly set"
return return
} }
echo "[Paths]" > $prefixDIR/bin/qt.conf echo "[Paths]" > $QT_ARCH_PATH/bin/qt.conf
echo "Prefix=$prefixDIR" >> $prefixDIR/bin/qt.conf echo "Prefix=$QT_ARCH_PATH" >> $QT_ARCH_PATH/bin/qt.conf
} }
# #
# adjust pkgconfig information # Adjust pkgconfig information
# to generalize *location=, -L/... and -I/... # to generalize *location=, -L/... and -I/...
# to use ${prefix} # to use ${prefix}
# #
adjustPkgConfig() adjustPkgConfig()
{ {
echo "edit pkgconfig:" echo "edit pkgconfig:"
echo " $prefixDIR/lib/pkgconfig/*.pc" echo " $QT_ARCH_PATH/lib/pkgconfig/*.pc"
[ -n "$prefixDIR" -a -d "$prefixDIR/lib/pkgconfig" ] || { [ -n "$QT_ARCH_PATH" -a -d "$QT_ARCH_PATH/lib/pkgconfig" ] || {
echo "Error: prefixDIR not correctly set" echo "Error: QT_ARCH_PATH not correctly set"
return return
} }
( (
cd $prefixDIR/lib/pkgconfig || exit cd $QT_ARCH_PATH/lib/pkgconfig || exit
unset nfiles unset nfiles
for i in *.pc for i in *.pc
@ -73,8 +73,8 @@ adjustPkgConfig()
then then
nfiles="x$nfiles" nfiles="x$nfiles"
sed -i \ sed -i \
-e 's@\(location=\)'"$prefixDIR/"'@\1${prefix}/@' \ -e 's@\(location=\)'"$QT_ARCH_PATH/"'@\1${prefix}/@' \
-e 's@\(-[IL]\)'"$prefixDIR/"'@\1${prefix}/@g' \ -e 's@\(-[IL]\)'"$QT_ARCH_PATH/"'@\1${prefix}/@g' \
$i $i
fi fi
done done
@ -84,29 +84,29 @@ adjustPkgConfig()
# #
# change prefix=... and Prefix=... to use ${prefix} # Change prefix=... and Prefix=... to use ${prefix}
# #
changePrefix() changePrefix()
{ {
echo "relocate QT installation to new prefix directory:" echo "relocate QT installation to new prefix directory:"
echo " $prefixDIR" echo " $QT_ARCH_PATH"
echo "edit:" echo "edit:"
echo " $prefixDIR/bin/qt.conf" echo " $QT_ARCH_PATH/bin/qt.conf"
echo " $prefixDIR/lib/pkgconfig/*.pc" echo " $QT_ARCH_PATH/lib/pkgconfig/*.pc"
[ -n "$prefixDIR" -a -d "$prefixDIR/bin" -a -d "$prefixDIR/lib/pkgconfig" ] || { [ -n "$QT_ARCH_PATH" -a -d "$QT_ARCH_PATH/bin" -a -d "$QT_ARCH_PATH/lib/pkgconfig" ] || {
echo "Error: prefixDIR not correctly set" echo "Error: QT_ARCH_PATH not correctly set"
return return
} }
# adjust qt.conf # adjust qt.conf
for i in $prefixDIR/bin/qt.conf for i in $QT_ARCH_PATH/bin/qt.conf
do do
if [ -f "$i" ] if [ -f "$i" ]
then then
nfiles="x$nfiles" nfiles="x$nfiles"
sed -i \ sed -i \
-e 's@^\([Pp]refix=\).*$@\1'"$prefixDIR@" \ -e 's@^\([Pp]refix=\).*$@\1'"$QT_ARCH_PATH@" \
$i $i
echo " edited 1 file" echo " edited 1 file"
fi fi
@ -114,7 +114,7 @@ changePrefix()
# adjust pkgconfig files # adjust pkgconfig files
( (
cd $prefixDIR/lib/pkgconfig || exit cd $QT_ARCH_PATH/lib/pkgconfig || exit
unset nfiles unset nfiles
for i in *.pc for i in *.pc
@ -123,7 +123,7 @@ changePrefix()
then then
nfiles="x$nfiles" nfiles="x$nfiles"
sed -i \ sed -i \
-e 's@^\([Pp]refix=\).*$@\1'"$prefixDIR@" \ -e 's@^\([Pp]refix=\).*$@\1'"$QT_ARCH_PATH@" \
$i $i
fi fi
done done

103
makeQt
View File

@ -4,7 +4,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM.
@ -26,13 +26,14 @@
# makeQt # makeQt
# #
# Description # Description
# Build script for qt-everywhere-opensource-src # Build script for QT (the qt-everywhere-opensource-src package)
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
qtVERSION=4.7.3 qtVERSION=4.8.7
qtTYPE=qt-everywhere-opensource-src qtTYPE=qt-everywhere-opensource-src
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# run from third-party directory only # Run from third-party directory only
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
@ -59,10 +60,11 @@ USAGE
exit 1 exit 1
} }
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# export WM settings in a form that GNU configure recognizes
# ensure configure gets the correct C/C++ compiler
[ -n "$WM_CC" ] && export CC="$WM_CC" [ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX" [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
[ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS"
[ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS"
# parse options # parse options
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
@ -75,9 +77,10 @@ do
export CC=gcc # use gcc/g++ export CC=gcc # use gcc/g++
export CXX=g++ export CXX=g++
;; ;;
[1-9]* | qt-[1-9]*) -qt-[1-9]* | [1-9]* | qt-*)
# -qt-VERSION, VERSION, qt-VERSION, qt-everywhere-opensource-src-VERSION
qtVERSION="${1%%/}"; qtVERSION="${1%%/}";
qtVERSION="${qtVERSION#qt-}" qtVERSION="${qtVERSION##*-}"
;; ;;
*) *)
die "unknown option/argument: '$1'" die "unknown option/argument: '$1'"
@ -85,47 +88,83 @@ do
esac esac
shift shift
done done
qtPACKAGE=$qtTYPE-$qtVERSION
# nothing to build
if _foamIsNone "$qtPACKAGE"
then
echo "Using qt-none (skip ThirdParty build of QT)"
exit 0
elif _foamIsSystem "$qtPACKAGE"
then
echo "Using qt-system"
exit 0
fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
qtPACKAGE=$qtTYPE-$qtVERSION
prefixDIR=$installBASE/qt-$qtVERSION
# #
# Build QT # Build QT
#
echo "---------------" QT_ARCH_PATH=$installBASE/qt-$qtVERSION
if [ -d "$prefixDIR" -a -r "$prefixDIR/bin/qmake" ] QT_SOURCE_DIR=$WM_THIRD_PARTY_DIR/$qtPACKAGE
echo
echo ========================================
echo "Build Qt $qtPACKAGE"
echo
if [ -d "$QT_ARCH_PATH" -a -r "$QT_ARCH_PATH/bin/qmake" ]
then then
echo "Already built: Qt-$qtVERSION" echo "Already built: Qt-$qtVERSION"
else else
echo "Starting build: Qt-$qtVERSION" echo "Starting build: Qt-$qtVERSION"
( (
sourceDIR=$WM_THIRD_PARTY_DIR/$qtPACKAGE # Configuration options:
unset configOpt
configOpt="$configOpt -nomake examples"
case "$qtVERSION" in
4*) # QT-4
# Without demos.
configOpt="$configOpt -nomake demos"
# Without old qt3 transition code
configOpt="$configOpt -no-qt3support"
# Without WebKit - uses std:tr1 and does not compile with c++11
# Fortunately WebKit is now optional for ParaView
configOpt="$configOpt -no-webkit"
;;
*) # QT-5
# Avoid too many X11 system dependencies.
configOpt="$configOpt -qt-xcb"
;;
esac
# end of configuration options
# ----------------------------
buildDIR=$buildBASE/$qtPACKAGE buildDIR=$buildBASE/$qtPACKAGE
cd $sourceDIR || exit 1 cd $QT_SOURCE_DIR || exit 1
make distclean 2>/dev/null [ -e Makefile ] && make distclean 2>/dev/null
rm -rf $buildDIR # Remove any existing build folder and recreate
rm -rf $QT_ARCH_DIR
rm -rf $buildDIR 2>/dev/null
mkdir -p $buildDIR mkdir -p $buildDIR
cd $buildDIR
# remove old junk # Remove any remnants from a previous shadow build
rm -rf $prefixDIR rm -f "$QT_SOURCE_DIR/.qmake.cache" 2>/dev/null
rm -f "$QT_SOURCE_DIR/src/corelib/global/qconfig.h" 2>/dev/null
rm -f "$QT_SOURCE_DIR/src/corelib/global/qconfig.cpp" 2>/dev/null
# remove any remnants from a previous shadow build cd $buildDIR || exit 1
rm -f "$sourceDIR/.qmake.cache" 2>/dev/null
rm -f "$sourceDIR/src/corelib/global/qconfig.h" 2>/dev/null
rm -f "$sourceDIR/src/corelib/global/qconfig.cpp" 2>/dev/null
# compile as opensource, accepting LGPL conditions # Compile as opensource, accepting LGPL conditions (yes)
echo "yes" | \ echo yes | $QT_SOURCE_DIR/configure \
$sourceDIR/configure \ -prefix $QT_ARCH_PATH \
--prefix=$prefixDIR \
-opensource \ -opensource \
-nomake demos \ $configOpt \
-nomake examples \
&& time make -j $WM_NCOMPPROCS \ && time make -j $WM_NCOMPPROCS \
&& make install \ && make install \
&& echo "Built: Qt-$qtVERSION" \ && echo "Built: Qt-$qtVERSION" \