fix script

This commit is contained in:
Andrei Yankovich 2018-12-08 11:52:04 +03:00
parent e29aaa80a0
commit 78ec396e23
2 changed files with 22 additions and 3 deletions

View File

@ -3,10 +3,20 @@
BASE_DIR=$(dirname $0)
echo "clean build dir"
rm -rfd $BASE_DIR/build
rm -rfd $BASE_DIR/distro
echo "Start static build"
$BASE_DIR/staticBuild.sh
$BASE_DIR/staticBuild.sh Q_OS_LINUX_SNAP
if [ $? -eq 0 ]
then
echo ""
echo "staticBuild is successfully completed!"
else
echo ""
echo "staticBuild is failed!" >&2
exit 1
fi
snapcraft clean cqtdeployer -s pull

View File

@ -1,5 +1,13 @@
#!/bin/bash
IS_SNAP="$1"
if [ -e "$PREFIX"]
then
echo "build for snap"
SNAP_DEFINES="$IS_SNAP"
fi
declare -a QTLIBS
BASE_DIR=$(dirname "$(readlink -f "$0")")
@ -45,7 +53,7 @@ cd ..
rm -rdf $BASE_DIR/build
export PATH=$PATH:$BASE_DIR/staticQt
$BASE_DIR/staticQt/bin/qmake QMAKE_LFLAGS+="-static" $BASE_DIR/CQtDeployer.pro
$BASE_DIR/staticQt/bin/qmake QMAKE_LFLAGS+="-static" $BASE_DIR/CQtDeployer.pro DEFINES+="$SNAP_DEFINES"
make -j$(nproc)
@ -56,6 +64,7 @@ then
else
echo ""
echo "Build is failed!" >&2
exit 1
fi
mkdir -p $RELEASE_DIR