mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-14 20:33:05 +02:00
Fix indentation restored
This commit is contained in:
Simon De Backer
parent
d1c969b723
commit
e3b98001f3
@ -9,24 +9,14 @@ TEMP_DIR="$HOME"
|
||||
SSH_TARGET='scorpio810@ssh.tuxfamily.org:/home/qet/qelectrotech.org-web/htdocs/dl_link.inc.php'
|
||||
SSH_OPTIONS=-B
|
||||
|
||||
#Find Subversion revision number in 0.60 branch
|
||||
#if [ -z "$HEAD" ] ; then
|
||||
#HEAD=$(svn --xml info svn://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60 | grep revision=\" | tail -1 | cut -d\" -f2)
|
||||
|
||||
#fi
|
||||
|
||||
#VERSION=$(svn cat svn://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60/sources/qet.h | grep "const QString version" | cut -d\" -f2 | cut -d\" -f1) #Find version tag in Subversion sources/qet.h
|
||||
#tagName=$(svn cat svn://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60/sources/qet.h | grep displayedVersion | cut -d\" -f2 | cut -d\" -f1) #Find displayedVersion tag in Subversion sources/qet.h
|
||||
cd $DEFAULT_DIR
|
||||
cd qet_git
|
||||
git pull
|
||||
#git checkout test_pugi
|
||||
|
||||
GITCOMMIT=$(git rev-parse --short HEAD)
|
||||
|
||||
#Find Subversion revision number in trunk branch
|
||||
if [ -z "$HEAD" ] ; then
|
||||
#HEAD=$(svn --xml info svn://svn.tuxfamily.org/svnroot/qet/qet/trunk | grep revision=\" | tail -1 | cut -d\" -f2)
|
||||
A=$(git rev-list HEAD --count)
|
||||
HEAD=$(($A+473))
|
||||
# force displayed number
|
||||
@ -34,12 +24,6 @@ fi
|
||||
|
||||
VERSION=$(cat sources/qet.h | grep "const QString version" | cut -d\" -f2 | cut -d\" -f1) #Find version tag in Subversion sources/qet.h
|
||||
tagName=$(cat sources/qet.h | grep displayedVersion | cut -d\" -f2 | cut -d\" -f1) #Find displayedVersion tag in Subversion sources/qet.h
|
||||
#git ls-remote https://git.tuxfamily.org/qet/qet.git/ | head -1 | cut -c1-10
|
||||
#95d1fca171
|
||||
#git rev-list HEAD --count
|
||||
#5475
|
||||
|
||||
|
||||
|
||||
#clean /var/cache/pbuilder/ .. / result/debs
|
||||
echo -e "\033[1;31mWould you like to clean all debs n/Y?.\033[m"
|
||||
@ -83,10 +67,6 @@ echo -e "\033[1;34mdownload source qelectrotech-$VERSION.r$HEAD.\033[m"
|
||||
|
||||
cd $TEMP_DIR
|
||||
|
||||
#get latest source revision
|
||||
# svn export svn://svn.tuxfamily.org/svnroot/qet/qet/trunk --revision 5212 qelectrotech-$VERSION.r$HEAD/ # force a specific version in trunk
|
||||
#svn export svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-$VERSION.r$HEAD/
|
||||
#svn export svn://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60 qelectrotech-$VERSION.r$HEAD/ # Branch 0.61
|
||||
cp -r $DEFAULT_DIR/qet_git/ $TEMP_DIR/qelectrotech-$VERSION.r$HEAD/
|
||||
rm -rf qelectrotech-$VERSION.r$HEAD/.git
|
||||
#create svn tarball
|
||||
@ -135,7 +115,6 @@ cd debian/ && rm -rf *ex *EX README*
|
||||
cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/debian/patches/
|
||||
sed -i 's/'"$tagName+[0-9]*"'/'"$tagName+$GITCOMMIT"'/' 03_qet.diff
|
||||
|
||||
|
||||
#deplacement dans le paquet_qet
|
||||
cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/
|
||||
quilt push
|
||||
@ -156,10 +135,6 @@ echo -e "\033[1;34mBuild_all_environements.\033[m"
|
||||
STRING="Build_all_environements is ready!!!"
|
||||
echo $STRING
|
||||
|
||||
#save debian/
|
||||
#echo -e "\033[1;33mDebian sauvegardé.\033[m"
|
||||
#cp -r debian/ $DEFAULT_DIR
|
||||
|
||||
#prepare download copys
|
||||
cd $DEFAULT_DIR
|
||||
mkdir -p $HEAD/stable/amd64
|
||||
@ -188,7 +163,6 @@ cd $DEFAULT_DIR/$HEAD/sid/amd64
|
||||
debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes
|
||||
echo -e "\033[1;33mAll sid amd64 are sign.\033[m"
|
||||
|
||||
|
||||
#debsign stable i386
|
||||
cd $DEFAULT_DIR/$HEAD/stable/i386
|
||||
debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes
|
||||
@ -209,9 +183,7 @@ read a
|
||||
if [[ $a == "Y" || $a == "y" ]]; then
|
||||
echo -e "\033[1;33mUpload qelectrotech-$VERSION.r$HEAD.\033[m"
|
||||
|
||||
|
||||
cd ~/apt
|
||||
#rm db/*
|
||||
reprepro -vb . include unstable $DEFAULT_DIR/$HEAD/sid/amd64/*.changes
|
||||
reprepro -vb . includedeb unstable $DEFAULT_DIR/$HEAD/sid/i386/*i386.deb
|
||||
reprepro -vb . include stable $DEFAULT_DIR/$HEAD/stable/amd64/*.changes
|
||||
@ -252,15 +224,6 @@ if [[ $a == "Y" || $a == "y" ]]; then
|
||||
#deplacement dans le paquet_qet
|
||||
cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/
|
||||
|
||||
#dch -i -D yakkety "Yakkety Upload to ppa"
|
||||
#debuild -S -sa -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
|
||||
|
||||
#dch -i -D xenial "Xenial Upload to ppa"
|
||||
#debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
|
||||
|
||||
#dch -i -D artful "Artful Upload to ppa"
|
||||
#debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
|
||||
|
||||
dch -i -D bionic "Bionic Upload to ppa"
|
||||
debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
|
||||
|
||||
@ -272,14 +235,9 @@ debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
|
||||
|
||||
cd $DEFAULT_DIR/
|
||||
|
||||
#dput my-ppa qelectrotech_$VERSION.r$HEAD-*ubuntu1_source.changes
|
||||
#dput my-ppa qelectrotech_$VERSION.r$HEAD-*ubuntu2_source.changes
|
||||
#dput my-ppa qelectrotech_$VERSION.r$HEAD-*ubuntu3_source.changes
|
||||
|
||||
dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu1_source.changes
|
||||
dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu2_source.changes
|
||||
dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu3_source.changes
|
||||
#dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu4_source.changes
|
||||
|
||||
else
|
||||
echo -e "\033[1;33mExit.\033[m"
|
||||
@ -327,13 +285,7 @@ export PATH=/media/backup6/digikam_new2/project/bundles/mxe/build.win32/usr/bin:
|
||||
cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD
|
||||
mkdir build/ && cd build
|
||||
|
||||
#mxe: qmake-qt5 i686-w64
|
||||
#/home/laurent/mxe/usr/bin/i686-w64-mingw32.static.posix-qmake-qt5 $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/qelectrotech.pro
|
||||
|
||||
/media/backup6/digikam_new2/project/bundles/mxe/build.win32/usr/bin/i686-w64-mingw32.static-qmake-qt5 $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/qelectrotech.pro
|
||||
#build jobs=17
|
||||
#build jobs=17
|
||||
#make -j17
|
||||
make -j$(nproc)
|
||||
|
||||
#copy 32 bits binarie to /bin Windows packages
|
||||
@ -341,11 +293,6 @@ cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/build/release/
|
||||
cp qelectrotech.exe /$DEFAULT_DIR/nsis_base$HEAD/files/bin
|
||||
cp qelectrotech.exe /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-x86-win32-readytouse/bin
|
||||
|
||||
#copy manifest file to /bin Windows packages
|
||||
#cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD
|
||||
#cp qelectrotech.exe.manifest /$DEFAULT_DIR/nsis_base$HEAD/files/bin
|
||||
#cp qelectrotech.exe.manifest /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-x86-win32-readytouse/bin
|
||||
|
||||
#tag $HEAD by sed for nsis script
|
||||
cd $DEFAULT_DIR/nsis_base$HEAD
|
||||
sed -i 's/'"0.5-dev+[0-9]*"'/'"$tagName"+git"$HEAD"'/' QET.nsi
|
||||
@ -355,92 +302,28 @@ makensis QET.nsi
|
||||
|
||||
#################################################################################################################
|
||||
export PATH=/media/backup6/digikam_new2/project/bundles/mxe/build.win64/usr/bin:$PATH
|
||||
#export PATH=/media/backup6/digikam_new2/project/bundles/mxe/build.win64/usr/bin:$PATH
|
||||
|
||||
#cross-compil 64 bits
|
||||
cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD
|
||||
rm -r build/
|
||||
mkdir build/ && cd build
|
||||
#mxe: qmake-qt5 x86_64-w64
|
||||
#/home/laurent/mxe/usr/bin/x86_64-w64-mingw32.static.posix-qmake-qt5 $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/qelectrotech.pro
|
||||
/media/backup6/digikam_new2/project/bundles/mxe/build.win64/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/qelectrotech.pro
|
||||
#/media/backup6/digikam_new2/project/bundles/mxe/build.win64/usr/bin/x86_64-w64-mingw32.static.posix.seh-qmake-qt5 $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/qelectrotech.pro
|
||||
#build jobs=17
|
||||
#make -j17
|
||||
make -j$(nproc)
|
||||
|
||||
cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/build/release/
|
||||
mv qelectrotech.exe /$DEFAULT_DIR/nsis_base64$HEAD/files/bin
|
||||
|
||||
#copy manifest file to /bin Windows packages
|
||||
#cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD
|
||||
#cp qelectrotech.exe.manifest /$DEFAULT_DIR/nsis_base64$HEAD/files/bin
|
||||
|
||||
cd $DEFAULT_DIR/nsis_base64$HEAD
|
||||
|
||||
sed -i 's/'"0.5-dev_x86_64-win64+[0-9]*"'/'"$tagName"_x86_64-win64+git"$HEAD"'/' QET64.nsi
|
||||
|
||||
makensis QET64.nsi
|
||||
|
||||
#################################################################################################################
|
||||
#cross-compil 32 bits XP VISTA
|
||||
|
||||
# WIN XP VISTA build
|
||||
#cd $DEFAULT_DIR
|
||||
#cp -r nsis_base nsis_baseXP$HEAD
|
||||
#cd qelectrotech-$VERSION.r$HEAD/
|
||||
#cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/nsis_baseXP$HEAD/files
|
||||
#cp -r elements/ examples/ titleblocks/ /$DEFAULT_DIR/nsis_base$HEAD/files
|
||||
#cp -r lang/*.qm /$DEFAULT_DIR/nsis_baseXP$HEAD/files/lang
|
||||
|
||||
#cd $DEFAULT_DIR
|
||||
#cd qelectrotech-$VERSION.r$HEAD/build-aux/windows/
|
||||
#cp {lang_extra.nsh,QET.nsi,lang_extra_fr.nsh} /$DEFAULT_DIR/nsis_baseXP$HEAD/
|
||||
|
||||
#copy and update folders of readytouse_XP_base skeleton
|
||||
#cd $DEFAULT_DIR
|
||||
#cp -r readytouse_base qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse
|
||||
#cd qelectrotech-$VERSION.r$HEAD/
|
||||
#cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse
|
||||
#cp -r lang/*.qm /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse/lang
|
||||
|
||||
#cd /home/$USER
|
||||
#mv mxe mxe_old
|
||||
#mv mxeXP mxe
|
||||
#sleep 4
|
||||
|
||||
#cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD-XP
|
||||
|
||||
#mkdir build/ && cd build
|
||||
|
||||
#mxe: qmake-qt5 i686-w64
|
||||
#/home/laurent/mxe/usr/bin/i686-w64-mingw32.static.posix-qmake-qt5 $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD-XP/qelectrotech.pro
|
||||
#/home/laurent/mxe/usr/bin/i686-w64-mingw32.static.posix-qmake-qt5.7 $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD-XP/qelectrotech.pro
|
||||
#build jobs=17
|
||||
#make -j17
|
||||
#make -j$(nproc)
|
||||
|
||||
#cd /home/$USER
|
||||
#mv mxe mxeXP
|
||||
#mv mxe_old mxe
|
||||
|
||||
#copy 32 bits binarie to /bin Windows packages
|
||||
#cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD-XP/build/release
|
||||
#cp qelectrotech.exe /$DEFAULT_DIR/nsis_baseXP$HEAD/files/bin
|
||||
#cp qelectrotech.exe /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse/bin
|
||||
|
||||
#tag $HEAD by sed for nsis script
|
||||
#cd $DEFAULT_DIR/nsis_baseXP$HEAD
|
||||
#sed -i 's/'"0.5-dev+[0-9]*"'/'"$tagName"+git"$HEAD"'/' QET.nsi
|
||||
|
||||
#build Windows installer
|
||||
#makensis QET.nsi
|
||||
|
||||
#crompress readytouse
|
||||
cd $DEFAULT_DIR
|
||||
|
||||
7za a -m0=lzma qelectrotech-$tagName+git$HEAD-x86-win32-readytouse.7z qelectrotech-$tagName+git$HEAD-x86-win32-readytouse/
|
||||
#7za a -m0=lzma qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse.7z qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse/
|
||||
|
||||
echo -e "\033[1;31mWould you like to prepare to RSYNC Windows packages /Y?.\033[m"
|
||||
read a
|
||||
@ -458,15 +341,11 @@ while [ "$(ls /home/$USER/builds/nightly/ | grep $name$i)" != "" ]; do
|
||||
done
|
||||
#create a new folder incremented by 1
|
||||
mkdir /home/$USER/builds/nightly/$name$i
|
||||
#mkdir /home/$USER/builds/nightly/$name$i/WIN_XP_VISTA
|
||||
|
||||
cd $DEFAULT_DIR/
|
||||
cp qelectrotech-$tagName+git$HEAD-x86-win32-readytouse.7z /home/laurent/builds/nightly/$name$i
|
||||
#cp qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse.7z /home/laurent/builds/nightly/$name$i/WIN_XP_VISTA
|
||||
cd /$DEFAULT_DIR/nsis_base$HEAD
|
||||
cp Installer_QElectroTech-$tagName+git$HEAD-1.exe /home/laurent/builds/nightly/$name$i
|
||||
#cd /$DEFAULT_DIR/nsis_baseXP$HEAD
|
||||
#cp Installer_QElectroTech-$tagName+git$HEAD-1.exe /home/laurent/builds/nightly/$name$i/WIN_XP_VISTA
|
||||
cd $DEFAULT_DIR/nsis_base64$HEAD
|
||||
cp Installer_QElectroTech-$tagName"_x86_64-win64+git"$HEAD-1.exe /home/laurent/builds/nightly/$name$i
|
||||
|
||||
@ -485,10 +364,6 @@ echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD "
|
||||
rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /home/laurent/builds/nightly/ scorpio810@ssh.tuxfamily.org:/home/qet/qet-repository/builds/nightly/
|
||||
} fi
|
||||
|
||||
#cd ~/paquet_qet/script
|
||||
#sed -i 's/'[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9]'/'"$name$i"'/' dl_link.inc.php
|
||||
#scp dl_link.inc.php "${SSH_TARGET}"
|
||||
|
||||
else
|
||||
echo -e "\033[1;33mExit.\033[m"
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user