mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-05-03 03:49:59 +02:00
Update MacQetDeploy script, thank Yoann
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3275 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -101,7 +101,6 @@ echo "Adding the version tag..."
|
|||||||
mkdir temp
|
mkdir temp
|
||||||
cp -Rf "sources/qet.h" "temp/qet.h"
|
cp -Rf "sources/qet.h" "temp/qet.h"
|
||||||
|
|
||||||
#cd
|
|
||||||
# On modifie l'originale avec le numero de version
|
# On modifie l'originale avec le numero de version
|
||||||
sed -i "" "s/const QString displayedVersion = \"0.4-dev\"/const QString displayedVersion = \"0.4-dev-r$revAp\"/" sources/qet.h
|
sed -i "" "s/const QString displayedVersion = \"0.4-dev\"/const QString displayedVersion = \"0.4-dev-r$revAp\"/" sources/qet.h
|
||||||
|
|
||||||
@@ -148,14 +147,28 @@ qmake -spec macx-g++
|
|||||||
# compilation
|
# compilation
|
||||||
if [ -e Makefile.Release ] ; then
|
if [ -e Makefile.Release ] ; then
|
||||||
START_TIME=$SECONDS
|
START_TIME=$SECONDS
|
||||||
make -f Makefile.Release
|
|
||||||
|
# arret du script si erreur de compilation
|
||||||
|
testSuccessBuild () {
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
cleanVerionTag
|
||||||
|
ELAPSED_TIME=$(($SECONDS - $START_TIME))
|
||||||
|
echo
|
||||||
|
echo "make failed - $(($ELAPSED_TIME/60)) min $(($ELAPSED_TIME%60)) sec"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# utilise tout les coeurs pour une compilation plus rapide
|
||||||
|
coeur=$(sysctl hw.ncpu | awk '{print $2}')
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
cleanVerionTag
|
make -f Makefile.Release
|
||||||
ELAPSED_TIME=$(($SECONDS - $START_TIME))
|
testSuccessBuild
|
||||||
echo
|
else
|
||||||
echo "make failed - $(($ELAPSED_TIME/60)) min $(($ELAPSED_TIME%60)) sec"
|
make -j$(($coeur + 1)) -f Makefile.Release
|
||||||
exit 1
|
testSuccessBuild
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cleanVerionTag
|
cleanVerionTag
|
||||||
ELAPSED_TIME=$(($SECONDS - $START_TIME))
|
ELAPSED_TIME=$(($SECONDS - $START_TIME))
|
||||||
echo
|
echo
|
||||||
@@ -220,6 +233,7 @@ echo "Create disk image:"
|
|||||||
|
|
||||||
# Direction
|
# Direction
|
||||||
EX_Dir="examples"
|
EX_Dir="examples"
|
||||||
|
DOC_Dir="docs/doc-en.pdf"
|
||||||
imagedir="/tmp/$APPNAME.$$"
|
imagedir="/tmp/$APPNAME.$$"
|
||||||
|
|
||||||
# Remove any previous disk folder or DMG
|
# Remove any previous disk folder or DMG
|
||||||
@@ -242,6 +256,11 @@ echo 'Copying application bundle and examples... '
|
|||||||
mkdir $imagedir
|
mkdir $imagedir
|
||||||
cp -Rf $BUNDLE $imagedir
|
cp -Rf $BUNDLE $imagedir
|
||||||
cp -Rf $EX_Dir $imagedir
|
cp -Rf $EX_Dir $imagedir
|
||||||
|
if [ -e $DOC_Dir ] ; then
|
||||||
|
cp $DOC_Dir $imagedir
|
||||||
|
else
|
||||||
|
echo "Documentation in ${DOC_Dir} not find."
|
||||||
|
fi
|
||||||
ln -s /Applications $imagedir/Applications
|
ln -s /Applications $imagedir/Applications
|
||||||
|
|
||||||
# Elimine les accents, symbole ...
|
# Elimine les accents, symbole ...
|
||||||
|
|||||||
Reference in New Issue
Block a user