kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move to Clang compiler, replace gcp command

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4981 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-06-27 14:49:46 +00:00
parent f390c750d5
commit 06eefc793a
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
misc/MacQetDeploy.sh
View File

@@ -146,7 +146,7 @@ fi
# genere le Makefile # genere le Makefile
echo "Generating new makefile..." echo "Generating new makefile..."
qmake -spec macx-g++ qmake -spec macx-clang
# compilation # compilation
if [ -e Makefile.Release ] ; then if [ -e Makefile.Release ] ; then
@@ -178,7 +178,7 @@ if [ -e Makefile.Release ] ; then
echo echo
echo "The time of compilation is $(($ELAPSED_TIME/60)) min $(($ELAPSED_TIME%60)) sec" echo "The time of compilation is $(($ELAPSED_TIME/60)) min $(($ELAPSED_TIME%60)) sec"
else else
echo "ERROR: Makefile not found. This script requires the macx-g++ makespec" echo "ERROR: Makefile not found. This script requires the macx-clang makespec"
exit exit
fi fi
@@ -233,13 +233,12 @@ fi
if [ -d "${QET_LANG_DIR}" ]; then if [ -d "${QET_LANG_DIR}" ]; then
echo "Copying translations in the bundle... " echo "Copying translations in the bundle... "
mkdir $BUNDLE/Contents/Resources/lang mkdir $BUNDLE/Contents/Resources/lang
gcp -R ${current_dir}/lang/*.qm $BUNDLE/Contents/Resources/lang cp ${current_dir}/lang/*.qm $BUNDLE/Contents/Resources/lang
fi fi
if [ -d "${LANG_DIR}" ]; then if [ -d "${LANG_DIR}" ]; then
echo "Copying translations in the bundle... " echo "Copying translations in the bundle... "
#mkdir $BUNDLE/Contents/Resources/lang cp ${current_dir}/lang1/*.qm $BUNDLE/Contents/Resources/lang
gcp -R ${current_dir}/lang1/*.qm $BUNDLE/Contents/Resources/lang
fi fi
@@ -332,12 +331,12 @@ fi
echo -e "\033[1;31mWould you like to upload MacOS packages "${APPNAME}"-"$tagName"_"r$revAp.dmg", n/Y?.\033[m" echo -e "\033[1;31mWould you like to upload MacOS packages "${APPNAME}"-"$tagName"_"r$revAp.dmg", n/Y?.\033[m"
read a read a
if [[ $a == "Y" || $a == "y" ]]; then if [[ $a == "Y" || $a == "y" ]]; then
cp -Rf "packaging/mac-osx/${APPNAME} $tagName r$revAp.dmg" /Users/amdosx/MAC_OS_X/ cp -Rf "packaging/mac-osx/${APPNAME} $tagName r$revAp.dmg" /Users/laurent/MAC_OS_X/
rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /Users/amdosx/MAC_OS_X/ admin@ssh.tuxfamily.org:/home/qet/qet-repository/builds/MAC_OS_X/ rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /Users/laurent/MAC_OS_X/ admin@ssh.tuxfamily.org:/home/qet/qet-repository/builds/MAC_OS_X/
if [ $? != 0 ]; then if [ $? != 0 ]; then
{ {
echo "RSYNC ERROR: problem syncing ${APPNAME} $tagName r$revAp.dmg" echo "RSYNC ERROR: problem syncing ${APPNAME} $tagName r$revAp.dmg"
rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /Users/amdosx/MAC_OS_X/ admin@ssh.tuxfamily.org:/home/qet/qet-repository/builds/MAC_OS_X/ rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /Users/laurent/MAC_OS_X/ admin@ssh.tuxfamily.org:/home/qet/qet-repository/builds/MAC_OS_X/
} fi } fi