Différences

Ci-dessous, les différences entre deux révisions de la page.

Lien vers cette vue comparative

Les deux révisions précédentes Révision précédente
doc:packaging_debian [07/10/2019 19:33]
scorpio810
doc:packaging_debian [08/10/2019 09:29] (Version actuelle)
scorpio810
Ligne 36: Ligne 36:
 SSH_TARGET='​scorpio810@ssh.tuxfamily.org:/​home/​qet/​qelectrotech.org-web/​htdocs/​dl_link.inc.php'​ SSH_TARGET='​scorpio810@ssh.tuxfamily.org:/​home/​qet/​qelectrotech.org-web/​htdocs/​dl_link.inc.php'​
 SSH_OPTIONS=-B 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 foliolist_position
 +
 +GITCOMMIT=$(git rev-parse --short HEAD)
  
 #Find Subversion revision number in trunk branch ​ #Find Subversion revision number in trunk branch ​
 if [ -z "​$HEAD"​ ] ; then 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)                                     ​ +#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
 fi 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 +VERSION=$(cat 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+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
  
  
Ligne 92: Ligne 113:
  
 #get latest source revision #get latest source revision
-svn export svn://​svn.tuxfamily.org/​svnroot/​qet/​qet/​branches/​0.60 qelectrotech-$VERSION.r$HEAD/​ +# 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 #create svn tarball
 tar cfvz qelectrotech-$VERSION.r$HEAD.tar.gz qelectrotech-$VERSION.r$HEAD/​ tar cfvz qelectrotech-$VERSION.r$HEAD.tar.gz qelectrotech-$VERSION.r$HEAD/​
Ligne 100: Ligne 124:
 cp qelectrotech-$VERSION.r$HEAD.tar.gz $DEFAULT_DIR ​ cp qelectrotech-$VERSION.r$HEAD.tar.gz $DEFAULT_DIR ​
  
-#clean $TEMP_DIR+clean $TEMP_DIR
 rm -Rf qelectrotech-$VERSION.r$HEAD/​ && rm qelectrotech-$VERSION.r$HEAD.tar.gz rm -Rf qelectrotech-$VERSION.r$HEAD/​ && rm qelectrotech-$VERSION.r$HEAD.tar.gz
  
Ligne 110: Ligne 134:
  
 #create origin.tar.gz #create origin.tar.gz
-dh_make -e  scorpio@qelectrotech.org ​ -f ../​qelectrotech-$VERSION.r$HEAD.tar.gz+dh_make -e  scorpio@qelectrotech.org ​-c gpl2  -f ../​qelectrotech-$VERSION.r$HEAD.tar.gz
  
 #clean debian folder #clean debian folder
Ligne 138: Ligne 162:
  
 cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​debian/​patches/ ​ cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​debian/​patches/ ​
-sed -i '​s/'"​$tagName+svn[0-9]*"'/'"​$tagName+svn$HEAD"'/'​ 03_qet.diff+sed -i '​s/'"​$tagName+[0-9]*"'/'"​$tagName+$GITCOMMIT"'/'​ 03_qet.diff
  
  
Ligne 162: Ligne 186:
  
 #save debian/ #save debian/
-echo  -e "​\033[1;​33mDebian sauvegardé.\033[m"​ +#echo  -e "​\033[1;​33mDebian sauvegardé.\033[m"​ 
-cp -r debian/ $DEFAULT_DIR+#cp -r debian/ $DEFAULT_DIR
  
 #prepare download copys #prepare download copys
Ligne 185: Ligne 209:
 #debsign stable amd64 #debsign stable amd64
 cd $DEFAULT_DIR/​$HEAD/​stable/​amd64 cd $DEFAULT_DIR/​$HEAD/​stable/​amd64
-debsign -k1D4FB6C1 ​*.changes+debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 ​*.changes
 echo  -e "​\033[1;​33mAll stable amd64 are sign.\033[m"​ echo  -e "​\033[1;​33mAll stable amd64 are sign.\033[m"​
  
 #debsign sid amd64 #debsign sid amd64
 cd $DEFAULT_DIR/​$HEAD/​sid/​amd64 cd $DEFAULT_DIR/​$HEAD/​sid/​amd64
-debsign -k1D4FB6C1 ​*.changes+debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 ​*.changes
 echo  -e "​\033[1;​33mAll sid amd64 are sign.\033[m"​ echo  -e "​\033[1;​33mAll sid amd64 are sign.\033[m"​
  
Ligne 196: Ligne 220:
 #debsign stable i386 #debsign stable i386
 cd $DEFAULT_DIR/​$HEAD/​stable/​i386 cd $DEFAULT_DIR/​$HEAD/​stable/​i386
-debsign -k1D4FB6C1 ​*.changes+debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 ​*.changes
 echo  -e "​\033[1;​33mAll stable i386 are sign.\033[m"​ echo  -e "​\033[1;​33mAll stable i386 are sign.\033[m"​
  
 #debsign sid i386 #debsign sid i386
 cd $DEFAULT_DIR/​$HEAD/​sid/​i386 cd $DEFAULT_DIR/​$HEAD/​sid/​i386
-debsign -k1D4FB6C1 ​*.changes+debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 ​*.changes
 echo  -e "​\033[1;​33mAll sid i386 are sign.\033[m"​ echo  -e "​\033[1;​33mAll sid i386 are sign.\033[m"​
  
Ligne 216: Ligne 240:
  
 cd ~/apt cd ~/apt
 +#rm db/*
 reprepro -vb . include unstable $DEFAULT_DIR/​$HEAD/​sid/​amd64/​*.changes ​ reprepro -vb . include unstable $DEFAULT_DIR/​$HEAD/​sid/​amd64/​*.changes ​
 reprepro -vb . includedeb unstable $DEFAULT_DIR/​$HEAD/​sid/​i386/​*i386.deb ​ reprepro -vb . includedeb unstable $DEFAULT_DIR/​$HEAD/​sid/​i386/​*i386.deb ​
Ligne 261: Ligne 286:
  
 #dch -i -D yakkety "​Yakkety Upload to ppa" #dch -i -D yakkety "​Yakkety Upload to ppa"
-#debuild -S -sa -k1D4FB6C1+#debuild -S -sa -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
  
-dch -i -D artful ​"Artful ​Upload to ppa" +#dch -i -D xenial ​"Xenial ​Upload to ppa" 
-debuild -S -sa -k1D4FB6C1+#debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
  
-dch -i -D xenial ​"Xenial ​Upload to ppa" +#dch -i -D artful ​"Artful ​Upload to ppa" 
-debuild -S  -k1D4FB6C1+#debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
  
-dch -i -D zesty "Zesty Upload to ppa" +dch -i -D bionic ​"Bionic ​Upload to ppa" 
-debuild -S  -k1D4FB6C1+debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1
  
-dch -i -D trusty ​"trusty ​Upload to ppa" +#dch -i -D cosmic ​"cosmic ​Upload to ppa" 
-debuild -S  -k1D4FB6C1+#debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 ​  
 + 
 + 
 +dch -i -D disco "Disco Upload to ppa" 
 +debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1  ​
  
 cd $DEFAULT_DIR/​ cd $DEFAULT_DIR/​
  
-dput my-ppa qelectrotech_$VERSION.r$HEAD-*ubuntu1_source.changes +#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-*ubuntu2_source.changes 
-dput my-ppa qelectrotech_$VERSION.r$HEAD-*ubuntu3_source.changes +#dput my-ppa qelectrotech_$VERSION.r$HEAD-*ubuntu3_source.changes
-dput my-ppa 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-*ubuntu1_source.changes 
-#dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu2_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-*ubuntu3_source.changes
 +#dput my-ppa-dev qelectrotech_$VERSION.r$HEAD-*ubuntu4_source.changes
  
  
Ligne 290: Ligne 319:
   echo  -e "​\033[1;​33mExit.\033[m"​   echo  -e "​\033[1;​33mExit.\033[m"​
 fi fi
- 
  
  
Ligne 306: Ligne 334:
 cd qelectrotech-$VERSION.r$HEAD/​ cd qelectrotech-$VERSION.r$HEAD/​
 cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​nsis_base$HEAD/​files cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​nsis_base$HEAD/​files
-#cp -r elements/ examples/ titleblocks/​ /​$DEFAULT_DIR/​nsis_base$HEAD/​files 
 cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​nsis_base$HEAD/​files/​lang cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​nsis_base$HEAD/​files/​lang
  
Ligne 321: Ligne 348:
 cd qelectrotech-$VERSION.r$HEAD/​ cd qelectrotech-$VERSION.r$HEAD/​
 cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​nsis_base64$HEAD/​files cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​nsis_base64$HEAD/​files
-#cp -r elements/ examples/ titleblocks/​ /​$DEFAULT_DIR/​nsis_base$HEAD/​files 
 cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​nsis_base64$HEAD/​files/​lang cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​nsis_base64$HEAD/​files/​lang
  
Ligne 330: Ligne 356:
 #copy and update folders of  readytouse_base skeleton #copy and update folders of  readytouse_base skeleton
 cd $DEFAULT_DIR cd $DEFAULT_DIR
-cp -r readytouse_base qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse+cp -r readytouse_base qelectrotech-$tagName+git$HEAD-x86-win32-readytouse
 cd qelectrotech-$VERSION.r$HEAD/​ cd qelectrotech-$VERSION.r$HEAD/​
-cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse +cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​qelectrotech-$tagName+git$HEAD-x86-win32-readytouse 
-cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse/​lang+cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​qelectrotech-$tagName+git$HEAD-x86-win32-readytouse/​lang
  
 #################################################################################################################​ #################################################################################################################​
 +export PATH=/​media/​backup6/​digikam_new/​project/​bundles/​mxe/​build.win32/​usr/​bin:​$PATH
 #​cross-compil 32 bits #​cross-compil 32 bits
 cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD
Ligne 341: Ligne 368:
  
 #mxe: qmake-qt5 i686-w64 #mxe: qmake-qt5 i686-w64
-/​home/​laurent/​mxe/​usr/​bin/​i686-w64-mingw32.static-qmake-qt5 $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​qelectrotech.pro+#/​home/​laurent/​mxe/​usr/​bin/​i686-w64-mingw32.static.posix-qmake-qt5 $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​qelectrotech.pro
  
 +/​media/​backup6/​digikam_new/​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 #build jobs=17
 #make -j17 #make -j17
Ligne 350: Ligne 379:
 cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​build/​release cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​build/​release
 cp qelectrotech.exe /​$DEFAULT_DIR/​nsis_base$HEAD/​files/​bin cp qelectrotech.exe /​$DEFAULT_DIR/​nsis_base$HEAD/​files/​bin
-cp qelectrotech.exe /​$DEFAULT_DIR/​qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse/​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 #tag $HEAD by sed for nsis script
 cd $DEFAULT_DIR/​nsis_base$HEAD cd $DEFAULT_DIR/​nsis_base$HEAD
-sed -i '​s/'"​0.5-dev+[0-9]*"'/'"​$tagName"​+svn"​$HEAD"'/'​ QET.nsi+sed -i '​s/'"​0.5-dev+[0-9]*"'/'"​$tagName"​+git"​$HEAD"'/'​ QET.nsi
  
  
Ligne 361: Ligne 395:
  
 #################################################################################################################​ #################################################################################################################​
 +export PATH=/​media/​backup6/​digikam_new/​project/​bundles/​mxe/​build.win64/​usr/​bin:​$PATH
 +
 #​cross-compil 64 bits #​cross-compil 64 bits
 cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD
Ligne 366: Ligne 402:
 mkdir build/ && cd build mkdir build/ && cd build
 #mxe: qmake-qt5 x86_64-w64 #mxe: qmake-qt5 x86_64-w64
-/​home/​laurent/​mxe/​usr/​bin/​x86_64-w64-mingw32.static-qmake-qt5 $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​qelectrotech.pro +#/​home/​laurent/​mxe/​usr/​bin/​x86_64-w64-mingw32.static.posix-qmake-qt5 $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​qelectrotech.pro 
 +/​media/​backup6/​digikam_new/​project/​bundles/​mxe/​build.win64/​usr/​bin/​x86_64-w64-mingw32.static-qmake-qt5 $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​qelectrotech.pro
 #build jobs=17 #build jobs=17
 #make -j17 #make -j17
Ligne 374: Ligne 410:
 cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​build/​release cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD/​build/​release
 mv qelectrotech.exe /​$DEFAULT_DIR/​nsis_base64$HEAD/​files/​bin 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 cd $DEFAULT_DIR/​nsis_base64$HEAD
  
-sed -i '​s/'"​0.5-dev_x86_64-win64+[0-9]*"'/'"​$tagName"​_x86_64-win64+svn"​$HEAD"'/'​ QET64.nsi+sed -i '​s/'"​0.5-dev_x86_64-win64+[0-9]*"'/'"​$tagName"​_x86_64-win64+git"​$HEAD"'/'​ QET64.nsi
  
 makensis QET64.nsi makensis QET64.nsi
Ligne 384: Ligne 426:
  
 # WIN XP VISTA build # WIN XP VISTA build
-cd $DEFAULT_DIR +#cd $DEFAULT_DIR 
-cp -r nsis_base nsis_baseXP$HEAD +#cp -r nsis_base nsis_baseXP$HEAD 
-cd qelectrotech-$VERSION.r$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_baseXP$HEAD/​files
 #cp -r elements/ examples/ titleblocks/​ /​$DEFAULT_DIR/​nsis_base$HEAD/​files #cp -r elements/ examples/ titleblocks/​ /​$DEFAULT_DIR/​nsis_base$HEAD/​files
-cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​nsis_baseXP$HEAD/​files/​lang+#cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​nsis_baseXP$HEAD/​files/​lang
  
-cd $DEFAULT_DIR +#cd $DEFAULT_DIR 
-cd qelectrotech-$VERSION.r$HEAD/​packaging/​windows/​ +#cd qelectrotech-$VERSION.r$HEAD/​packaging/​windows/​ 
-cp {lang_extra.nsh,​QET.nsi,​lang_extra_fr.nsh} /​$DEFAULT_DIR/​nsis_baseXP$HEAD/​+#cp {lang_extra.nsh,​QET.nsi,​lang_extra_fr.nsh} /​$DEFAULT_DIR/​nsis_baseXP$HEAD/​
  
 #copy and update folders of  readytouse_XP_base skeleton #copy and update folders of  readytouse_XP_base skeleton
-cd $DEFAULT_DIR +#cd $DEFAULT_DIR 
-cp -r readytouse_base qelectrotech-$tagName+svn$HEAD-WIN_XP-x86-win32-readytouse +#cp -r readytouse_base qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse 
-cd qelectrotech-$VERSION.r$HEAD/​ +#cd qelectrotech-$VERSION.r$HEAD/​ 
-cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​qelectrotech-$tagName+svn$HEAD-WIN_XP-x86-win32-readytouse +#cp -r {elements,​examples,​titleblocks} /​$DEFAULT_DIR/​qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse 
-cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​qelectrotech-$tagName+svn$HEAD-WIN_XP-x86-win32-readytouse/​lang+#cp -r lang/​*.qm ​ /​$DEFAULT_DIR/​qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse/​lang
  
  
Ligne 408: Ligne 450:
 #sleep 4 #sleep 4
  
-cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD-XP+#cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD-XP
  
-mkdir build/ && cd build+#mkdir build/ && cd build
  
 #mxe: qmake-qt5 i686-w64 #mxe: qmake-qt5 i686-w64
-#/​home/​laurent/​mxe/​usr/​bin/​i686-w64-mingw32.static-qmake-qt5 $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD-XP/​qelectrotech.pro +#/​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-qmake-qt5.7 $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 #build jobs=17
 #make -j17 #make -j17
-make -j$(nproc)+#make -j$(nproc)
  
 #cd /home/$USER #cd /home/$USER
Ligne 424: Ligne 466:
  
 #copy 32 bits binarie to /bin Windows packages #copy 32 bits binarie to /bin Windows packages
-cd $DEFAULT_DIR/​qelectrotech-$VERSION.r$HEAD-XP/​build/​release +#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/​nsis_baseXP$HEAD/​files/​bin 
-cp qelectrotech.exe /​$DEFAULT_DIR/​qelectrotech-$tagName+svn$HEAD-WIN_XP-x86-win32-readytouse/​bin+#cp qelectrotech.exe /​$DEFAULT_DIR/​qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse/​bin
  
 #tag $HEAD by sed for nsis script #tag $HEAD by sed for nsis script
-cd $DEFAULT_DIR/​nsis_baseXP$HEAD +#cd $DEFAULT_DIR/​nsis_baseXP$HEAD 
-sed -i '​s/'"​0.5-dev+[0-9]*"'/'"​$tagName"​+svn"​$HEAD"'/'​ QET.nsi+#sed -i '​s/'"​0.5-dev+[0-9]*"'/'"​$tagName"​+git"​$HEAD"'/'​ QET.nsi
  
  
 #build Windows installer #build Windows installer
-makensis QET.nsi+#makensis QET.nsi
  
  
Ligne 440: Ligne 482:
 cd $DEFAULT_DIR cd $DEFAULT_DIR
  
-7za a -m0=lzma qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse.7z qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse/​ +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+svn$HEAD-WIN_XP-x86-win32-readytouse.7z qelectrotech-$tagName+svn$HEAD-WIN_XP-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/​
  
  
Ligne 463: Ligne 505:
 #create a new folder incremented by 1 #create a new folder incremented by 1
 mkdir /​home/​$USER/​builds/​nightly/​$name$i ​ mkdir /​home/​$USER/​builds/​nightly/​$name$i ​
-mkdir /​home/​$USER/​builds/​nightly/​$name$i/​WIN_XP_VISTA+#mkdir /​home/​$USER/​builds/​nightly/​$name$i/​WIN_XP_VISTA
  
  
  
 cd $DEFAULT_DIR/​ cd $DEFAULT_DIR/​
-cp qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse.7z /​home/​laurent/​builds/​nightly/​$name$i +cp qelectrotech-$tagName+git$HEAD-x86-win32-readytouse.7z /​home/​laurent/​builds/​nightly/​$name$i 
-cp qelectrotech-$tagName+svn$HEAD-WIN_XP-x86-win32-readytouse.7z /​home/​laurent/​builds/​nightly/​$name$i/​WIN_XP_VISTA+#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 cd /​$DEFAULT_DIR/​nsis_base$HEAD
-cp Installer_QElectroTech-$tagName+svn$HEAD-1.exe /​home/​laurent/​builds/​nightly/​$name$i +cp Installer_QElectroTech-$tagName+git$HEAD-1.exe /​home/​laurent/​builds/​nightly/​$name$i 
-cd /​$DEFAULT_DIR/​nsis_baseXP$HEAD +#cd /​$DEFAULT_DIR/​nsis_baseXP$HEAD 
-cp Installer_QElectroTech-$tagName+svn$HEAD-1.exe /​home/​laurent/​builds/​nightly/​$name$i/​WIN_XP_VISTA+#cp Installer_QElectroTech-$tagName+git$HEAD-1.exe /​home/​laurent/​builds/​nightly/​$name$i/​WIN_XP_VISTA
 cd $DEFAULT_DIR/​nsis_base64$HEAD cd $DEFAULT_DIR/​nsis_base64$HEAD
-cp Installer_QElectroTech-$tagName"​_x86_64-win64+svn"​$HEAD-1.exe /​home/​laurent/​builds/​nightly/​$name$i+cp Installer_QElectroTech-$tagName"​_x86_64-win64+git"​$HEAD-1.exe /​home/​laurent/​builds/​nightly/​$name$i
  
  
Ligne 496: Ligne 538:
 } fi } 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 else
Ligne 504: Ligne 549:
 fi fi
 exit exit
 +
  
  
Imprimer/exporter
Langages