From e3b98001f36426fb6e62bcdab40bc5c333fd159c Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Sat, 7 Nov 2020 22:19:54 +0100 Subject: [PATCH] Fix indentation restored --- packaging_script_Debian_Ubuntu_Windows.sh | 529 +++++++++------------- 1 file changed, 202 insertions(+), 327 deletions(-) diff --git a/packaging_script_Debian_Ubuntu_Windows.sh b/packaging_script_Debian_Ubuntu_Windows.sh index 5a3ad97d4..8290c45c1 100755 --- a/packaging_script_Debian_Ubuntu_Windows.sh +++ b/packaging_script_Debian_Ubuntu_Windows.sh @@ -9,37 +9,21 @@ 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)) + A=$(git rev-list HEAD --count) + HEAD=$(($A+473)) # force displayed number 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" @@ -50,7 +34,7 @@ if [[ $a == "Y" || $a == "y" ]]; then cd /var/cache/pbuilder/unstable-amd64/result/ && sudo rm qe* cd /var/cache/pbuilder/stable-i386/result/ && sudo rm qe* cd /var/cache/pbuilder/unstable-i386/result/ && sudo rm qe* - else +else echo -e "\033[1;33mNo Clean_all_base_environment.\033[m" fi #clean all apt cache @@ -62,31 +46,27 @@ if [[ $a == "Y" || $a == "y" ]]; then DIST=stable ARCH=amd64 sudo pbuilder --clean DIST=unstable ARCH=i386 sudo pbuilder --clean DIST=unstable ARCH=amd64 sudo pbuilder --clean - else - echo -e "\033[1;33mNo Clean_all_pbuilder_environment.\033[m" +else + echo -e "\033[1;33mNo Clean_all_pbuilder_environment.\033[m" fi #Update des chroots echo -e "\033[1;31mWould you like to update all chroots n/Y?.\033[m" read a if [[ $a == "Y" || $a == "y" ]]; then - echo -e "\033[1;33mUpdate_all_base_environment..\033[m" - sudo DIST=stable ARCH=i386 pbuilder update --override-config --configfile /home/laurent/.pbuilderrc - sudo DIST=sid ARCH=i386 pbuilder update --override-config --configfile /home/laurent/.pbuilderrc - sudo DIST=stable pbuilder update --override-config --configfile /home/laurent/.pbuilderrc - sudo DIST=sid pbuilder update --override-config --configfile /home/laurent/.pbuilderrc - else -echo -e "\033[1;33mNo Update_all_base_environment.\033[m" + echo -e "\033[1;33mUpdate_all_base_environment..\033[m" + sudo DIST=stable ARCH=i386 pbuilder update --override-config --configfile /home/laurent/.pbuilderrc + sudo DIST=sid ARCH=i386 pbuilder update --override-config --configfile /home/laurent/.pbuilderrc + sudo DIST=stable pbuilder update --override-config --configfile /home/laurent/.pbuilderrc + sudo DIST=sid pbuilder update --override-config --configfile /home/laurent/.pbuilderrc +else + echo -e "\033[1;33mNo Update_all_base_environment.\033[m" fi -echo -e "\033[1;34mdownload source qelectrotech-$VERSION.r$HEAD.\033[m" +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 @@ -121,13 +101,13 @@ cp -r debian/ qelectrotech-$VERSION.r$HEAD/ cd qelectrotech-$VERSION.r$HEAD/ dch -d -D unstable "New upstream subversion version " #edit changelog -echo -e "\033[1;31mWould you like to edit changelog n/Y?.\033[m" +echo -e "\033[1;31mWould you like to edit changelog n/Y?.\033[m" read a if [[ $a == "Y" || $a == "y" ]]; then - echo -e "\033[1;31mEdit debian changelog..\033[m" - dch --edit - else -echo -e "\033[1;33mNo edit changelog.\033[m" + echo -e "\033[1;31mEdit debian changelog..\033[m" + dch --edit +else + echo -e "\033[1;33mNo edit changelog.\033[m" fi cd debian/ && rm -rf *ex *EX README* @@ -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 @@ -146,101 +125,94 @@ echo -e "\033[1;31mWould you like to build Debian packages n/Y?.\033[m" read a if [[ $a == "Y" || $a == "y" ]]; then -#build -echo -e "\033[1;34mBuild_all_environements.\033[m" - sudo DIST=sid ARCH=amd64 pdebuild --configfile /home/laurent/.pbuilderrc - sudo DIST=sid ARCH=i386 pdebuild --configfile /home/laurent/.pbuilderrc - dch -i -D stable "Backport stable " && - sudo DIST=stable ARCH=amd64 pdebuild --configfile /home/laurent/.pbuilderrc - sudo DIST=stable ARCH=i386 pdebuild --configfile /home/laurent/.pbuilderrc -STRING="Build_all_environements is ready!!!" -echo $STRING + #build + echo -e "\033[1;34mBuild_all_environements.\033[m" + sudo DIST=sid ARCH=amd64 pdebuild --configfile /home/laurent/.pbuilderrc + sudo DIST=sid ARCH=i386 pdebuild --configfile /home/laurent/.pbuilderrc + dch -i -D stable "Backport stable " && + sudo DIST=stable ARCH=amd64 pdebuild --configfile /home/laurent/.pbuilderrc + sudo DIST=stable ARCH=i386 pdebuild --configfile /home/laurent/.pbuilderrc + 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 + mkdir -p $HEAD/stable/i386 + mkdir -p $HEAD/sid/amd64 + mkdir -p $HEAD/sid/i386 -#prepare download copys -cd $DEFAULT_DIR -mkdir -p $HEAD/stable/amd64 -mkdir -p $HEAD/stable/i386 -mkdir -p $HEAD/sid/amd64 -mkdir -p $HEAD/sid/i386 + #copie des debs des results vers $HEAD + find /var/cache/pbuilder/stable-amd64/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/stable/amd64 \; + find /var/cache/pbuilder/stable-i386/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/stable/i386 \; + find /var/cache/pbuilder/unstable-amd64/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/sid/amd64 \; + find /var/cache/pbuilder/unstable-i386/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/sid/i386 \; -#copie des debs des results vers $HEAD -find /var/cache/pbuilder/stable-amd64/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/stable/amd64 \; -find /var/cache/pbuilder/stable-i386/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/stable/i386 \; -find /var/cache/pbuilder/unstable-amd64/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/sid/amd64 \; -find /var/cache/pbuilder/unstable-i386/result -name "qe*" -exec cp {} $DEFAULT_DIR/$HEAD/sid/i386 \; + #debsign + echo -e "\033[1;31mWould you like to sign all packages n/Y?.\033[m" + read a + if [[ $a == "Y" || $a == "y" ]]; then -#debsign -echo -e "\033[1;31mWould you like to sign all packages n/Y?.\033[m" -read a -if [[ $a == "Y" || $a == "y" ]]; then + #debsign stable amd64 + cd $DEFAULT_DIR/$HEAD/stable/amd64 + debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes + echo -e "\033[1;33mAll stable amd64 are sign.\033[m" -#debsign stable amd64 -cd $DEFAULT_DIR/$HEAD/stable/amd64 -debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes -echo -e "\033[1;33mAll stable amd64 are sign.\033[m" + #debsign sid amd64 + cd $DEFAULT_DIR/$HEAD/sid/amd64 + debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes + echo -e "\033[1;33mAll sid amd64 are sign.\033[m" -#debsign sid amd64 -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 + echo -e "\033[1;33mAll stable i386 are sign.\033[m" + #debsign sid i386 + cd $DEFAULT_DIR/$HEAD/sid/i386 + debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes + echo -e "\033[1;33mAll sid i386 are sign.\033[m" -#debsign stable i386 -cd $DEFAULT_DIR/$HEAD/stable/i386 -debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes -echo -e "\033[1;33mAll stable i386 are sign.\033[m" + else + echo -e "\033[1;33mExit.\033[m" + fi -#debsign sid i386 -cd $DEFAULT_DIR/$HEAD/sid/i386 -debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes -echo -e "\033[1;33mAll sid i386 are sign.\033[m" + #upload vers incoming + echo -e "\033[1;31mWould you like to upload to incoming n/Y?.\033[m" + read a + if [[ $a == "Y" || $a == "y" ]]; then + echo -e "\033[1;33mUpload qelectrotech-$VERSION.r$HEAD.\033[m" + cd ~/apt + 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 + reprepro -vb . includedeb stable $DEFAULT_DIR/$HEAD/stable/i386/*i386.deb + reprepro -b . export + + else + echo -e "\033[1;33mExit.\033[m" + fi + + #rsync to TF + echo -e "\033[1;31mWould you like to RSYNC Debian packages to TF n/Y?.\033[m" + read a + if [[ $a == "Y" || $a == "y" ]]; then + echo -e "\033[1;33mRsync to TF qelectrotech-$VERSION.r$HEAD .\033[m" + echo -e "\033[1;31mrsync to TF password ssh and TF\033[m" + cd $DEFAULT_DIR/script + rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/apt/ scorpio810@ssh.tuxfamily.org:/home/qet/qet-repository/debian/ + if [ $? != 0 ]; then + { + echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " + rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/apt/ scorpio810@ssh.tuxfamily.org:/home/qet/qet-repository/debian/ + } fi + + else + echo -e "\033[1;33mExit.\033[m" + fi else - echo -e "\033[1;33mExit.\033[m" -fi - -#upload vers incoming -echo -e "\033[1;31mWould you like to upload to incoming n/Y?.\033[m" -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 -reprepro -vb . includedeb stable $DEFAULT_DIR/$HEAD/stable/i386/*i386.deb -reprepro -b . export - -else - echo -e "\033[1;33mExit.\033[m" -fi - -#rsync to TF -echo -e "\033[1;31mWould you like to RSYNC Debian packages to TF n/Y?.\033[m" -read a -if [[ $a == "Y" || $a == "y" ]]; then -echo -e "\033[1;33mRsync to TF qelectrotech-$VERSION.r$HEAD .\033[m" -echo -e "\033[1;31mrsync to TF password ssh and TF\033[m" -cd $DEFAULT_DIR/script -rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/apt/ scorpio810@ssh.tuxfamily.org:/home/qet/qet-repository/debian/ -if [ $? != 0 ]; then -{ -echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " -rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/apt/ scorpio810@ssh.tuxfamily.org:/home/qet/qet-repository/debian/ -} fi - -else - echo -e "\033[1;33mExit.\033[m" -fi - else -echo -e "\033[1;33mExit.\033[m" + echo -e "\033[1;33mExit.\033[m" fi ############# Ubuntu packages ################################################################################################ @@ -249,40 +221,26 @@ echo -e "\033[1;31mWould you like to build Ubuntu PPA packages n/Y?.\033[m" read a if [[ $a == "Y" || $a == "y" ]]; then -#deplacement dans le paquet_qet -cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/ + #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 bionic "Bionic Upload to ppa" + debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 -#dch -i -D xenial "Xenial Upload to ppa" -#debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 + dch -i -D eoan "Eoan Upload to ppa" + debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 -#dch -i -D artful "Artful Upload to ppa" -#debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 + dch -i -D disco "Disco Upload to ppa" + debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 -dch -i -D bionic "Bionic Upload to ppa" -debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 + cd $DEFAULT_DIR/ -dch -i -D eoan "Eoan Upload to ppa" -debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 - -dch -i -D disco "Disco Upload to ppa" -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 + 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 else - echo -e "\033[1;33mExit.\033[m" + echo -e "\033[1;33mExit.\033[m" fi ############# Windows packages ################################################################################################ @@ -291,208 +249,125 @@ fi echo -e "\033[1;31mWould you like to build Window packages n/Y?.\033[m" read a if [[ $a == "Y" || $a == "y" ]]; then -# 32 bits -cd $DEFAULT_DIR -cp -r qelectrotech-$VERSION.r$HEAD/ qelectrotech-$VERSION.r$HEAD-XP/ -cp -r nsis_base nsis_base$HEAD -cd qelectrotech-$VERSION.r$HEAD/ -cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/nsis_base$HEAD/files -cp -r lang/*.qm /$DEFAULT_DIR/nsis_base$HEAD/files/lang + # 32 bits + cd $DEFAULT_DIR + cp -r qelectrotech-$VERSION.r$HEAD/ qelectrotech-$VERSION.r$HEAD-XP/ + cp -r nsis_base nsis_base$HEAD + cd qelectrotech-$VERSION.r$HEAD/ + cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/nsis_base$HEAD/files + cp -r lang/*.qm /$DEFAULT_DIR/nsis_base$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_base$HEAD/ + cd $DEFAULT_DIR + cd qelectrotech-$VERSION.r$HEAD/build-aux/windows/ + cp {lang_extra.nsh,QET.nsi,lang_extra_fr.nsh} /$DEFAULT_DIR/nsis_base$HEAD/ -# 64 bits -cd $DEFAULT_DIR -cp -r nsis_base nsis_base64$HEAD -cd qelectrotech-$VERSION.r$HEAD/ -cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/nsis_base64$HEAD/files -cp -r lang/*.qm /$DEFAULT_DIR/nsis_base64$HEAD/files/lang + # 64 bits + cd $DEFAULT_DIR + cp -r nsis_base nsis_base64$HEAD + cd qelectrotech-$VERSION.r$HEAD/ + cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/nsis_base64$HEAD/files + cp -r lang/*.qm /$DEFAULT_DIR/nsis_base64$HEAD/files/lang -cd $DEFAULT_DIR -cd qelectrotech-$VERSION.r$HEAD/build-aux/windows/ -cp {lang_extra.nsh,QET64.nsi,lang_extra_fr.nsh} /$DEFAULT_DIR/nsis_base64$HEAD/ + cd $DEFAULT_DIR + cd qelectrotech-$VERSION.r$HEAD/build-aux/windows/ + cp {lang_extra.nsh,QET64.nsi,lang_extra_fr.nsh} /$DEFAULT_DIR/nsis_base64$HEAD/ -#copy and update folders of readytouse_base skeleton -cd $DEFAULT_DIR -cp -r readytouse_base qelectrotech-$tagName+git$HEAD-x86-win32-readytouse -cd qelectrotech-$VERSION.r$HEAD/ -cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-x86-win32-readytouse -cp -r lang/*.qm /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-x86-win32-readytouse/lang + #copy and update folders of readytouse_base skeleton + cd $DEFAULT_DIR + cp -r readytouse_base qelectrotech-$tagName+git$HEAD-x86-win32-readytouse + cd qelectrotech-$VERSION.r$HEAD/ + cp -r {elements,examples,titleblocks} /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-x86-win32-readytouse + cp -r lang/*.qm /$DEFAULT_DIR/qelectrotech-$tagName+git$HEAD-x86-win32-readytouse/lang -################################################################################################################# -export PATH=/media/backup6/digikam_new2/project/bundles/mxe/build.win32/usr/bin:$PATH -#cross-compil 32 bits -cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD -mkdir build/ && cd build + ################################################################################################################# + export PATH=/media/backup6/digikam_new2/project/bundles/mxe/build.win32/usr/bin:$PATH + #cross-compil 32 bits + 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 + make -j$(nproc) -/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 + 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 32 bits binarie to /bin Windows packages -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 + #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 -#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 + #build Windows installer + makensis QET.nsi -#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 + ################################################################################################################# + export PATH=/media/backup6/digikam_new2/project/bundles/mxe/build.win64/usr/bin:$PATH -#build Windows installer -makensis QET.nsi + #cross-compil 64 bits + cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD + rm -r build/ + mkdir build/ && cd build + #mxe: qmake-qt5 x86_64-w64 + /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 + make -j$(nproc) -################################################################################################################# -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 + cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/build/release/ + mv qelectrotech.exe /$DEFAULT_DIR/nsis_base64$HEAD/files/bin -#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/nsis_base64$HEAD -cd $DEFAULT_DIR/qelectrotech-$VERSION.r$HEAD/build/release/ -mv qelectrotech.exe /$DEFAULT_DIR/nsis_base64$HEAD/files/bin + sed -i 's/'"0.5-dev_x86_64-win64+[0-9]*"'/'"$tagName"_x86_64-win64+git"$HEAD"'/' QET64.nsi -#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 + makensis QET64.nsi -cd $DEFAULT_DIR/nsis_base64$HEAD + #crompress readytouse + cd $DEFAULT_DIR -sed -i 's/'"0.5-dev_x86_64-win64+[0-9]*"'/'"$tagName"_x86_64-win64+git"$HEAD"'/' QET64.nsi + 7za a -m0=lzma qelectrotech-$tagName+git$HEAD-x86-win32-readytouse.7z qelectrotech-$tagName+git$HEAD-x86-win32-readytouse/ -makensis QET64.nsi + echo -e "\033[1;31mWould you like to prepare to RSYNC Windows packages /Y?.\033[m" + read a + if [[ $a == "Y" || $a == "y" ]]; then -################################################################################################################# -#cross-compil 32 bits XP VISTA + cd /home/laurent/builds/nightly/ -# 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 + name=$(date +%Y-%m-%d-) #defined a name based on the date -#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/ + #start increment to 1 + i=1 + #increment by i if the builds have already been created + while [ "$(ls /home/$USER/builds/nightly/ | grep $name$i)" != "" ]; do + ((i++)) + done + #create a new folder incremented by 1 + mkdir /home/$USER/builds/nightly/$name$i -#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 $DEFAULT_DIR/ + cp qelectrotech-$tagName+git$HEAD-x86-win32-readytouse.7z /home/laurent/builds/nightly/$name$i + cd /$DEFAULT_DIR/nsis_base$HEAD + cp Installer_QElectroTech-$tagName+git$HEAD-1.exe /home/laurent/builds/nightly/$name$i + cd $DEFAULT_DIR/nsis_base64$HEAD + cp Installer_QElectroTech-$tagName"_x86_64-win64+git"$HEAD-1.exe /home/laurent/builds/nightly/$name$i -#cd /home/$USER -#mv mxe mxe_old -#mv mxeXP mxe -#sleep 4 + else + echo -e "\033[1;33mExit.\033[m" + fi -#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 -if [[ $a == "Y" || $a == "y" ]]; then - -cd /home/laurent/builds/nightly/ - -name=$(date +%Y-%m-%d-) #defined a name based on the date - -#start increment to 1 -i=1 -#increment by i if the builds have already been created -while [ "$(ls /home/$USER/builds/nightly/ | grep $name$i)" != "" ]; do - ((i++)) -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 + #rsync to TF Windows builds + echo -e "\033[1;31mWould you like to upload Windows packages n/Y?.\033[m" + read a + if [[ $a == "Y" || $a == "y" ]]; then + 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/ + if [ $? != 0 ]; then + { + 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 + else + echo -e "\033[1;33mExit.\033[m" + fi else - echo -e "\033[1;33mExit.\033[m" -fi - -#rsync to TF Windows builds -echo -e "\033[1;31mWould you like to upload Windows packages n/Y?.\033[m" -read a -if [[ $a == "Y" || $a == "y" ]]; then -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/ -if [ $? != 0 ]; then -{ -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 -else - echo -e "\033[1;33mExit.\033[m" + echo -e "\033[1;33mExit.\033[m" fi exit