[qet] qet/qet: [4981] Move to Clang compiler, replace gcp command |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4981
Author: scorpio810
Date: 2017-06-27 16:49:46 +0200 (Tue, 27 Jun 2017)
Log Message:
-----------
Move to Clang compiler, replace gcp command
Modified Paths:
--------------
trunk/misc/MacQetDeploy.sh
Modified: trunk/misc/MacQetDeploy.sh
===================================================================
--- trunk/misc/MacQetDeploy.sh 2017-06-20 19:15:39 UTC (rev 4980)
+++ trunk/misc/MacQetDeploy.sh 2017-06-27 14:49:46 UTC (rev 4981)
@@ -146,7 +146,7 @@
# genere le Makefile
echo "Generating new makefile..."
-qmake -spec macx-g++
+qmake -spec macx-clang
# compilation
if [ -e Makefile.Release ] ; then
@@ -178,7 +178,7 @@
echo
echo "The time of compilation is $(($ELAPSED_TIME/60)) min $(($ELAPSED_TIME%60)) sec"
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
fi
@@ -233,13 +233,12 @@
if [ -d "${QET_LANG_DIR}" ]; then
echo "Copying translations in the bundle... "
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
if [ -d "${LANG_DIR}" ]; then
-echo "Copying translations in the bundle... "
-#mkdir $BUNDLE/Contents/Resources/lang
-gcp -R ${current_dir}/lang1/*.qm $BUNDLE/Contents/Resources/lang
+ echo "Copying translations in the bundle... "
+ cp ${current_dir}/lang1/*.qm $BUNDLE/Contents/Resources/lang
fi
@@ -332,12 +331,12 @@
echo -e "\033[1;31mWould you like to upload MacOS packages "${APPNAME}"-"$tagName"_"r$revAp.dmg", n/Y?.\033[m"
read a
if [[ $a == "Y" || $a == "y" ]]; then
-cp -Rf "packaging/mac-osx/${APPNAME} $tagName r$revAp.dmg" /Users/amdosx/MAC_OS_X/
-rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /Users/amdosx/MAC_OS_X/ admin@xxxxxxxxxxxxxxxxx:/home/qet/qet-repository/builds/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/laurent/MAC_OS_X/ admin@xxxxxxxxxxxxxxxxx:/home/qet/qet-repository/builds/MAC_OS_X/
if [ $? != 0 ]; then
{
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@xxxxxxxxxxxxxxxxx:/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@xxxxxxxxxxxxxxxxx:/home/qet/qet-repository/builds/MAC_OS_X/
} fi
@@ -344,4 +343,4 @@
else
echo -e "\033[1;33mExit.\033[m"
-fi
\ No newline at end of file
+fi