Fixed a bug with the linux build script
I learned the Qt binaries directory can end up in a non-standard directory seperate from the Qt libaries and plugins and this kind of setup would cause the script to fail to copy all needed files. To fix this, i hard coded the standard directory: '/usr/lib/x86_64-linux-gnu/qt5/bin' into the script instead of having it call qtpaths. Ended users that have even further customized setups will need modify the build script themselves to make sure all references to $qt_dir points to the correct directory for their dev setup.
This commit is contained in:
parent
b2abe53bef
commit
ccbaf2c531
|
@ -13,9 +13,13 @@ tmp_dir="$HOME/.cache/cmdr_build"
|
||||||
|
|
||||||
if [ ! -d "$qt_dir" ]; then
|
if [ ! -d "$qt_dir" ]; then
|
||||||
|
|
||||||
echo "a path to Qt was not provided, attempting to get it from 'qtpaths.'"
|
echo "a valid path to Qt was not provided, falling back to the default: /usr/lib/x86_64-linux-gnu/qt5/bin"
|
||||||
|
|
||||||
qt_dir="$(qtpaths --binaries-dir)"
|
qt_dir="/usr/lib/x86_64-linux-gnu/qt5/bin"
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
PATH=$qt_dir:$PATH
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -36,10 +40,7 @@ if [ $? -eq 0 -a -d "$qt_dir" ]; then
|
||||||
mkdir -vp $tmp_dir
|
mkdir -vp $tmp_dir
|
||||||
cp -rv $src_dir/. $tmp_dir
|
cp -rv $src_dir/. $tmp_dir
|
||||||
cd $tmp_dir
|
cd $tmp_dir
|
||||||
|
qmake -config release
|
||||||
PATH=$qt_dir:$PATH
|
|
||||||
|
|
||||||
$qt_dir/qmake -config release
|
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user