Différences
Ci-dessous, les différences entre deux révisions de la page.
Les deux révisions précédentesRévision précédenteProchaine révision | Révision précédenteProchaine révisionLes deux révisions suivantes | ||
doc:packaging_debian [07/10/2019 21:33] – scorpio810 | doc:packaging_debian [14/02/2020 15:08] – scorpio810 | ||
---|---|---|---|
Ligne 36: | Ligne 36: | ||
SSH_TARGET=' | SSH_TARGET=' | ||
SSH_OPTIONS=-B | SSH_OPTIONS=-B | ||
+ | |||
+ | #Find Subversion revision number in 0.60 branch | ||
+ | #if [ -z " | ||
+ | #HEAD=$(svn --xml info svn:// | ||
+ | |||
+ | #fi | ||
+ | |||
+ | # | ||
+ | # | ||
+ | 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 | #Find Subversion revision number in trunk branch | ||
if [ -z " | if [ -z " | ||
- | HEAD=$(svn --xml info svn:// | + | #HEAD=$(svn --xml info svn:// |
+ | A=$(git rev-list HEAD --count) | ||
+ | HEAD=$(($A+473)) | ||
+ | # force displayed number | ||
fi | fi | ||
- | VERSION=$(svn cat svn:// | + | VERSION=$(cat sources/ |
- | tagName=$(svn cat svn:// | + | tagName=$(cat sources/ |
+ | #git ls-remote https:// | ||
+ | # | ||
+ | #git rev-list HEAD --count | ||
+ | #5475 | ||
Ligne 92: | Ligne 113: | ||
#get latest source revision | #get latest source revision | ||
- | svn export svn:// | + | # svn export svn:// |
+ | #svn export svn:// | ||
+ | #svn export svn:// | ||
+ | cp -r $DEFAULT_DIR/ | ||
+ | rm -rf qelectrotech-$VERSION.r$HEAD/ | ||
#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 -Rf qelectrotech-$VERSION.r$HEAD/ | ||
Ligne 110: | Ligne 134: | ||
#create origin.tar.gz | #create origin.tar.gz | ||
- | dh_make -e scorpio@qelectrotech.org | + | dh_make -e scorpio@qelectrotech.org |
#clean debian folder | #clean debian folder | ||
Ligne 138: | Ligne 162: | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | sed -i ' | + | sed -i ' |
Ligne 162: | Ligne 186: | ||
#save debian/ | #save debian/ | ||
- | echo -e " | + | #echo -e " |
- | 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/ | cd $DEFAULT_DIR/ | ||
- | debsign -k1D4FB6C1 | + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
echo -e " | echo -e " | ||
#debsign sid amd64 | #debsign sid amd64 | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | debsign -k1D4FB6C1 | + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
echo -e " | echo -e " | ||
Ligne 196: | Ligne 220: | ||
#debsign stable i386 | #debsign stable i386 | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | debsign -k1D4FB6C1 | + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
echo -e " | echo -e " | ||
#debsign sid i386 | #debsign sid i386 | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | debsign -k1D4FB6C1 | + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
echo -e " | echo -e " | ||
Ligne 216: | Ligne 240: | ||
cd ~/apt | cd ~/apt | ||
+ | #rm db/* | ||
reprepro -vb . include unstable $DEFAULT_DIR/ | reprepro -vb . include unstable $DEFAULT_DIR/ | ||
reprepro -vb . includedeb unstable $DEFAULT_DIR/ | reprepro -vb . includedeb unstable $DEFAULT_DIR/ | ||
Ligne 261: | Ligne 286: | ||
#dch -i -D yakkety " | #dch -i -D yakkety " | ||
- | #debuild -S -sa -k1D4FB6C1 | + | #debuild -S -sa -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
- | dch -i -D artful | + | #dch -i -D xenial |
- | debuild -S -sa -k1D4FB6C1 | + | #debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
- | dch -i -D xenial | + | #dch -i -D artful |
- | debuild -S -k1D4FB6C1 | + | #debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
- | dch -i -D zesty "Zesty Upload to ppa" | + | dch -i -D bionic |
- | debuild -S -k1D4FB6C1 | + | debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 |
- | dch -i -D trusty | + | dch -i -D eoan "Eoan 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 " | echo -e " | ||
fi | fi | ||
- | |||
Ligne 306: | Ligne 334: | ||
cd qelectrotech-$VERSION.r$HEAD/ | cd qelectrotech-$VERSION.r$HEAD/ | ||
cp -r {elements, | cp -r {elements, | ||
- | #cp -r elements/ examples/ titleblocks/ | ||
cp -r lang/ | cp -r lang/ | ||
cd $DEFAULT_DIR | cd $DEFAULT_DIR | ||
- | cd qelectrotech-$VERSION.r$HEAD/ | + | cd qelectrotech-$VERSION.r$HEAD/ |
cp {lang_extra.nsh, | cp {lang_extra.nsh, | ||
Ligne 321: | Ligne 348: | ||
cd qelectrotech-$VERSION.r$HEAD/ | cd qelectrotech-$VERSION.r$HEAD/ | ||
cp -r {elements, | cp -r {elements, | ||
- | #cp -r elements/ examples/ titleblocks/ | ||
cp -r lang/ | cp -r lang/ | ||
cd $DEFAULT_DIR | cd $DEFAULT_DIR | ||
- | cd qelectrotech-$VERSION.r$HEAD/ | + | cd qelectrotech-$VERSION.r$HEAD/ |
cp {lang_extra.nsh, | cp {lang_extra.nsh, | ||
#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, | + | cp -r {elements, |
- | cp -r lang/ | + | cp -r lang/ |
################################################################################################################# | ################################################################################################################# | ||
+ | export PATH=/ | ||
# | # | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
Ligne 341: | Ligne 368: | ||
#mxe: qmake-qt5 i686-w64 | #mxe: qmake-qt5 i686-w64 | ||
- | / | + | #/ |
+ | / | ||
+ | #build jobs=17 | ||
#build jobs=17 | #build jobs=17 | ||
#make -j17 | #make -j17 | ||
Ligne 348: | Ligne 377: | ||
#copy 32 bits binarie to /bin Windows packages | #copy 32 bits binarie to /bin Windows packages | ||
- | cd $DEFAULT_DIR/ | + | cd $DEFAULT_DIR/ |
cp qelectrotech.exe / | cp qelectrotech.exe / | ||
- | cp qelectrotech.exe / | + | cp qelectrotech.exe / |
+ | |||
+ | #copy manifest file to /bin Windows packages | ||
+ | #cd $DEFAULT_DIR/ | ||
+ | #cp qelectrotech.exe.manifest / | ||
+ | #cp qelectrotech.exe.manifest / | ||
#tag $HEAD by sed for nsis script | #tag $HEAD by sed for nsis script | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | sed -i ' | + | sed -i ' |
Ligne 361: | Ligne 395: | ||
################################################################################################################# | ################################################################################################################# | ||
+ | export PATH=/ | ||
+ | #export PATH=/ | ||
+ | |||
# | # | ||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
Ligne 366: | Ligne 403: | ||
mkdir build/ && cd build | mkdir build/ && cd build | ||
#mxe: qmake-qt5 x86_64-w64 | #mxe: qmake-qt5 x86_64-w64 | ||
- | / | + | #/ |
+ | / | ||
+ | #/ | ||
#build jobs=17 | #build jobs=17 | ||
#make -j17 | #make -j17 | ||
make -j$(nproc) | make -j$(nproc) | ||
- | cd $DEFAULT_DIR/ | + | cd $DEFAULT_DIR/ |
mv qelectrotech.exe / | mv qelectrotech.exe / | ||
+ | |||
+ | #copy manifest file to /bin Windows packages | ||
+ | #cd $DEFAULT_DIR/ | ||
+ | #cp qelectrotech.exe.manifest / | ||
+ | |||
+ | |||
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | sed -i ' | + | sed -i ' |
makensis QET64.nsi | makensis QET64.nsi | ||
Ligne 384: | Ligne 428: | ||
# 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, | + | #cp -r {elements, |
#cp -r elements/ examples/ titleblocks/ | #cp -r elements/ examples/ titleblocks/ | ||
- | cp -r lang/ | + | #cp -r lang/ |
- | cd $DEFAULT_DIR | + | #cd $DEFAULT_DIR |
- | cd qelectrotech-$VERSION.r$HEAD/ | + | #cd qelectrotech-$VERSION.r$HEAD/ |
- | cp {lang_extra.nsh, | + | #cp {lang_extra.nsh, |
#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, | + | #cp -r {elements, |
- | cp -r lang/ | + | #cp -r lang/ |
Ligne 408: | Ligne 452: | ||
#sleep 4 | #sleep 4 | ||
- | cd $DEFAULT_DIR/ | + | #cd $DEFAULT_DIR/ |
- | mkdir build/ && cd build | + | #mkdir build/ && cd build |
#mxe: qmake-qt5 i686-w64 | #mxe: qmake-qt5 i686-w64 | ||
- | #/ | + | #/ |
- | / | + | #/ |
#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 468: | ||
#copy 32 bits binarie to /bin Windows packages | #copy 32 bits binarie to /bin Windows packages | ||
- | cd $DEFAULT_DIR/ | + | #cd $DEFAULT_DIR/ |
- | cp qelectrotech.exe / | + | #cp qelectrotech.exe / |
- | cp qelectrotech.exe / | + | #cp qelectrotech.exe / |
#tag $HEAD by sed for nsis script | #tag $HEAD by sed for nsis script | ||
- | cd $DEFAULT_DIR/ | + | #cd $DEFAULT_DIR/ |
- | sed -i ' | + | #sed -i ' |
#build Windows installer | #build Windows installer | ||
- | makensis QET.nsi | + | #makensis QET.nsi |
Ligne 440: | Ligne 484: | ||
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 507: | ||
#create a new folder incremented by 1 | #create a new folder incremented by 1 | ||
mkdir / | mkdir / | ||
- | mkdir / | + | #mkdir / |
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | cp qelectrotech-$tagName+svn$HEAD-x86-win32-readytouse.7z / | + | cp qelectrotech-$tagName+git$HEAD-x86-win32-readytouse.7z / |
- | cp qelectrotech-$tagName+svn$HEAD-WIN_XP-x86-win32-readytouse.7z / | + | #cp qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse.7z / |
cd / | cd / | ||
- | cp Installer_QElectroTech-$tagName+svn$HEAD-1.exe / | + | cp Installer_QElectroTech-$tagName+git$HEAD-1.exe / |
- | cd / | + | #cd / |
- | cp Installer_QElectroTech-$tagName+svn$HEAD-1.exe / | + | #cp Installer_QElectroTech-$tagName+git$HEAD-1.exe / |
cd $DEFAULT_DIR/ | cd $DEFAULT_DIR/ | ||
- | cp Installer_QElectroTech-$tagName" | + | cp Installer_QElectroTech-$tagName" |
Ligne 496: | Ligne 540: | ||
} fi | } fi | ||
+ | #cd ~/ | ||
+ | #sed -i ' | ||
+ | #scp dl_link.inc.php " | ||
else | else |