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édente | ||
| doc:packaging_debian [16/11/2017 18:47] – scorpio810 | doc:packaging_debian [17/01/2024 16:36] (Version actuelle) – scorpio810 | ||
|---|---|---|---|
| Ligne 1: | Ligne 1: | ||
| + | ~~NOCACHE~~ | ||
| + | ====== Notes ====== | ||
| + | |||
| + | === Dépôt Debian QElectroTech === | ||
| + | |||
| + | #for Debian Sid aka unstable | ||
| + | | ||
| + | |||
| + | | ||
| + | |||
| + | #for Debian stable | ||
| + | |||
| + | deb http:// | ||
| + | |||
| + | | ||
| + | |||
| + | [[https:// | ||
| + | |||
| + | === Git Debian package ==== | ||
| + | |||
| + | |||
| + | [[http:// | ||
| + | |||
| + | === packaging_script Debian, Ubuntu, Windows === | ||
| + | |||
| + | < | ||
| + | # | ||
| + | #nettoyage des chroots | ||
| + | #set -x | ||
| + | eval $(gpg-agent --daemon) | ||
| + | |||
| + | #variables repertoires de travail | ||
| + | DEFAULT_DIR=" | ||
| + | TEMP_DIR=" | ||
| + | SSH_TARGET=' | ||
| + | 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 | ||
| + | if [ -z " | ||
| + | #HEAD=$(svn --xml info svn:// | ||
| + | A=$(git rev-list HEAD --count) | ||
| + | HEAD=$(($A+473)) | ||
| + | # force displayed number | ||
| + | fi | ||
| + | |||
| + | VERSION=$(cat sources/ | ||
| + | tagName=$(cat sources/ | ||
| + | #git ls-remote https:// | ||
| + | #95d1fca171 | ||
| + | #git rev-list HEAD --count | ||
| + | #5475 | ||
| + | |||
| + | |||
| + | |||
| + | #clean / | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | echo -e " | ||
| + | cd / | ||
| + | cd / | ||
| + | cd / | ||
| + | cd / | ||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | #clean all apt cache | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | echo -e " | ||
| + | DIST=stable ARCH=i386 sudo pbuilder --clean | ||
| + | DIST=stable ARCH=amd64 sudo pbuilder --clean | ||
| + | DIST=unstable ARCH=i386 sudo pbuilder --clean | ||
| + | DIST=unstable ARCH=amd64 sudo pbuilder --clean | ||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | |||
| + | #Update des chroots | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | | ||
| + | sudo DIST=stable ARCH=i386 pbuilder update --override-config --configfile / | ||
| + | sudo DIST=sid ARCH=i386 pbuilder update --override-config --configfile / | ||
| + | sudo DIST=stable pbuilder update --override-config --configfile / | ||
| + | sudo DIST=sid pbuilder update --override-config --configfile / | ||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | echo -e " | ||
| + | |||
| + | cd $TEMP_DIR | ||
| + | |||
| + | #get latest source revision | ||
| + | # svn export svn:// | ||
| + | #svn export svn:// | ||
| + | #svn export svn:// | ||
| + | cp -r $DEFAULT_DIR/ | ||
| + | rm -rf qelectrotech-$VERSION.r$HEAD/ | ||
| + | #create svn tarball | ||
| + | tar cfvz qelectrotech-$VERSION.r$HEAD.tar.gz qelectrotech-$VERSION.r$HEAD/ | ||
| + | |||
| + | #copy tarball in $DEFAULT_DIR | ||
| + | cp qelectrotech-$VERSION.r$HEAD.tar.gz $DEFAULT_DIR | ||
| + | |||
| + | clean $TEMP_DIR | ||
| + | rm -Rf qelectrotech-$VERSION.r$HEAD/ | ||
| + | |||
| + | #return to working directory | ||
| + | cd $DEFAULT_DIR | ||
| + | |||
| + | #extract tarball and go to archive | ||
| + | tar zxvf qelectrotech-$VERSION.r$HEAD.tar.gz && cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | |||
| + | #create origin.tar.gz | ||
| + | dh_make -e scorpio@qelectrotech.org -c gpl2 -f ../ | ||
| + | |||
| + | #clean debian folder | ||
| + | cd / | ||
| + | rm -Rf debian/ | ||
| + | |||
| + | #return to working directory | ||
| + | cd $DEFAULT_DIR | ||
| + | |||
| + | #copy debian folder | ||
| + | cp -r debian/ qelectrotech-$VERSION.r$HEAD/ | ||
| + | |||
| + | #update changelog to new release | ||
| + | cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | dch -d -D unstable "New upstream subversion version " | ||
| + | #edit changelog | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | | ||
| + | dch --edit | ||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | cd debian/ && rm -rf *ex *EX README* | ||
| + | |||
| + | cd $DEFAULT_DIR/ | ||
| + | sed -i ' | ||
| + | |||
| + | |||
| + | # | ||
| + | cd $DEFAULT_DIR/ | ||
| + | quilt push | ||
| + | quilt push | ||
| + | quilt refresh | ||
| + | |||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | |||
| + | # | ||
| + | echo -e " | ||
| + | sudo DIST=sid ARCH=amd64 | ||
| + | sudo DIST=sid ARCH=i386 pdebuild --configfile / | ||
| + | dch -i -D stable | ||
| + | sudo DIST=stable ARCH=amd64 pdebuild --configfile / | ||
| + | sudo DIST=stable ARCH=i386 pdebuild --configfile / | ||
| + | STRING=" | ||
| + | echo $STRING | ||
| + | |||
| + | #save debian/ | ||
| + | #echo -e " | ||
| + | #cp -r debian/ $DEFAULT_DIR | ||
| + | |||
| + | #prepare download copys | ||
| + | cd $DEFAULT_DIR | ||
| + | mkdir -p $HEAD/ | ||
| + | mkdir -p $HEAD/ | ||
| + | mkdir -p $HEAD/ | ||
| + | mkdir -p $HEAD/ | ||
| + | |||
| + | #copie des debs des results vers $HEAD | ||
| + | find / | ||
| + | find / | ||
| + | find / | ||
| + | find / | ||
| + | |||
| + | #debsign | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | |||
| + | #debsign stable amd64 | ||
| + | cd $DEFAULT_DIR/ | ||
| + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes | ||
| + | echo -e " | ||
| + | |||
| + | #debsign sid amd64 | ||
| + | cd $DEFAULT_DIR/ | ||
| + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes | ||
| + | echo -e " | ||
| + | |||
| + | |||
| + | #debsign stable i386 | ||
| + | cd $DEFAULT_DIR/ | ||
| + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes | ||
| + | echo -e " | ||
| + | |||
| + | #debsign sid i386 | ||
| + | cd $DEFAULT_DIR/ | ||
| + | debsign -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 *.changes | ||
| + | echo -e " | ||
| + | |||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | #upload vers incoming | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | echo -e " | ||
| + | |||
| + | |||
| + | cd ~/apt | ||
| + | #rm db/* | ||
| + | reprepro -vb . include unstable $DEFAULT_DIR/ | ||
| + | reprepro -vb . includedeb unstable $DEFAULT_DIR/ | ||
| + | reprepro -vb . include stable $DEFAULT_DIR/ | ||
| + | reprepro -vb . includedeb stable $DEFAULT_DIR/ | ||
| + | reprepro -b . export | ||
| + | |||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | #rsync to TF | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | echo -e " | ||
| + | echo -e " | ||
| + | cd $DEFAULT_DIR/ | ||
| + | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/apt/ server: | ||
| + | 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/ server: | ||
| + | } fi | ||
| + | |||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | |||
| + | |||
| + | |||
| + | |||
| + | ############# | ||
| + | |||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | |||
| + | # | ||
| + | cd $DEFAULT_DIR/ | ||
| + | |||
| + | #dch -i -D yakkety " | ||
| + | #debuild -S -sa -k D3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 | ||
| + | |||
| + | #dch -i -D xenial " | ||
| + | #debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 | ||
| + | |||
| + | #dch -i -D artful " | ||
| + | #debuild -S -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 | ||
| + | |||
| + | dch -i -D bionic " | ||
| + | debuild -S -sa -kD3439F4E2273F7DCD3228C9EBC9F825E1D4FB6C1 | ||
| + | |||
| + | 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 | ||
| + | |||
| + | |||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | |||
| + | ############# | ||
| + | |||
| + | |||
| + | #copy and update folders of nsis_base skeleton | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | # 32 bits | ||
| + | cd $DEFAULT_DIR | ||
| + | cp -r qelectrotech-$VERSION.r$HEAD/ | ||
| + | cp -r nsis_base nsis_base$HEAD | ||
| + | cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | cp -r {elements, | ||
| + | cp -r lang/ | ||
| + | |||
| + | cd $DEFAULT_DIR | ||
| + | cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | cp {lang_extra.nsh, | ||
| + | |||
| + | |||
| + | |||
| + | |||
| + | # 64 bits | ||
| + | cd $DEFAULT_DIR | ||
| + | cp -r nsis_base nsis_base64$HEAD | ||
| + | cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | cp -r {elements, | ||
| + | cp -r lang/ | ||
| + | |||
| + | cd $DEFAULT_DIR | ||
| + | cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | cp {lang_extra.nsh, | ||
| + | |||
| + | #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, | ||
| + | cp -r lang/ | ||
| + | |||
| + | ################################################################################################################# | ||
| + | export PATH=/ | ||
| + | # | ||
| + | cd $DEFAULT_DIR/ | ||
| + | mkdir build/ && cd build | ||
| + | |||
| + | #mxe: qmake-qt5 i686-w64 | ||
| + | #/ | ||
| + | |||
| + | / | ||
| + | #build jobs=17 | ||
| + | #build jobs=17 | ||
| + | #make -j17 | ||
| + | make -j$(nproc) | ||
| + | |||
| + | #copy 32 bits binarie to /bin Windows packages | ||
| + | cd $DEFAULT_DIR/ | ||
| + | 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 | ||
| + | cd $DEFAULT_DIR/ | ||
| + | sed -i ' | ||
| + | |||
| + | |||
| + | #build Windows installer | ||
| + | makensis QET.nsi | ||
| + | |||
| + | ################################################################################################################# | ||
| + | export PATH=/ | ||
| + | #export PATH=/ | ||
| + | |||
| + | # | ||
| + | cd $DEFAULT_DIR/ | ||
| + | rm -r build/ | ||
| + | mkdir build/ && cd build | ||
| + | #mxe: qmake-qt5 x86_64-w64 | ||
| + | #/ | ||
| + | / | ||
| + | #/ | ||
| + | #build jobs=17 | ||
| + | #make -j17 | ||
| + | make -j$(nproc) | ||
| + | |||
| + | cd $DEFAULT_DIR/ | ||
| + | mv qelectrotech.exe / | ||
| + | |||
| + | #copy manifest file to /bin Windows packages | ||
| + | #cd $DEFAULT_DIR/ | ||
| + | #cp qelectrotech.exe.manifest / | ||
| + | |||
| + | |||
| + | cd $DEFAULT_DIR/ | ||
| + | |||
| + | sed -i ' | ||
| + | |||
| + | makensis QET64.nsi | ||
| + | |||
| + | ################################################################################################################# | ||
| + | # | ||
| + | |||
| + | # WIN XP VISTA build | ||
| + | #cd $DEFAULT_DIR | ||
| + | #cp -r nsis_base nsis_baseXP$HEAD | ||
| + | #cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | #cp -r {elements, | ||
| + | #cp -r elements/ examples/ titleblocks/ | ||
| + | #cp -r lang/ | ||
| + | |||
| + | #cd $DEFAULT_DIR | ||
| + | #cd qelectrotech-$VERSION.r$HEAD/ | ||
| + | #cp {lang_extra.nsh, | ||
| + | |||
| + | #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, | ||
| + | #cp -r lang/ | ||
| + | |||
| + | |||
| + | #cd /home/$USER | ||
| + | #mv mxe mxe_old | ||
| + | #mv mxeXP mxe | ||
| + | #sleep 4 | ||
| + | |||
| + | #cd $DEFAULT_DIR/ | ||
| + | |||
| + | #mkdir build/ && cd build | ||
| + | |||
| + | #mxe: qmake-qt5 i686-w64 | ||
| + | #/ | ||
| + | #/ | ||
| + | #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/ | ||
| + | #cp qelectrotech.exe / | ||
| + | #cp qelectrotech.exe / | ||
| + | |||
| + | #tag $HEAD by sed for nsis script | ||
| + | #cd $DEFAULT_DIR/ | ||
| + | #sed -i ' | ||
| + | |||
| + | |||
| + | #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 " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | |||
| + | cd / | ||
| + | |||
| + | 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 / | ||
| + | ((i++)) | ||
| + | done | ||
| + | #create a new folder incremented by 1 | ||
| + | mkdir / | ||
| + | #mkdir / | ||
| + | |||
| + | |||
| + | |||
| + | cd $DEFAULT_DIR/ | ||
| + | cp qelectrotech-$tagName+git$HEAD-x86-win32-readytouse.7z / | ||
| + | #cp qelectrotech-$tagName+git$HEAD-WIN_XP-x86-win32-readytouse.7z / | ||
| + | cd / | ||
| + | cp Installer_QElectroTech-$tagName+git$HEAD-1.exe / | ||
| + | #cd / | ||
| + | #cp Installer_QElectroTech-$tagName+git$HEAD-1.exe / | ||
| + | cd $DEFAULT_DIR/ | ||
| + | cp Installer_QElectroTech-$tagName" | ||
| + | |||
| + | |||
| + | |||
| + | |||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | |||
| + | |||
| + | #rsync to TF Windows builds | ||
| + | echo -e " | ||
| + | read a | ||
| + | if [[ $a == " | ||
| + | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress | ||
| + | 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 | ||
| + | } fi | ||
| + | |||
| + | #cd ~/ | ||
| + | #sed -i ' | ||
| + | #scp dl_link.inc.php " | ||
| + | |||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | else | ||
| + | echo -e " | ||
| + | fi | ||
| + | exit | ||
| + | |||
| + | |||
| + | |||
| + | </ | ||
| + | |||
| + | === AppImage === | ||
| + | |||
| + | |||
| + | We use now Digikam scripts, on Xubuntu 20.04 VM for create Qt 5.15.X compile environment with system-sqlite (Sqilte3) for database project exporting.\\ | ||
| + | See: | ||
| + | https:// | ||
| + | First read the README file: \\ | ||
| + | https:// | ||
| + | |||
| + | We only use __01-build-host.sh__ | ||
| + | |||
| + | < | ||
| + | git clone https:// | ||
| + | cd digikam/ | ||
| + | |||
| + | |||
| + | |||
| + | < | ||
| + | diff --git a/ | ||
| + | index a362363309..8548419442 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -38,7 +38,7 @@ ExternalProject_Add(ext_qt5 | ||
| + | | ||
| + | | ||
| + | | ||
| + | - -sql-sqlite | ||
| + | + -system-sqlite | ||
| + | | ||
| + | # | ||
| + | -icu | ||
| + | diff --git a/ | ||
| + | index f8c317f336..77e1247fb3 100755 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -80,19 +80,10 @@ cmake $ORIG_WD/ | ||
| + | | ||
| + | | ||
| + | | ||
| + | - -DKDE_VERSION=$DK_KDE_VERSION \ | ||
| + | - -DENABLE_QTVERSION=$DK_QTVERSION \ | ||
| + | - -DENABLE_QTWEBENGINE=$DK_QTWEBENGINE | ||
| + | + -DKDE_VERSION=$DK_KDE_VERSION | ||
| + | |||
| + | # Install new cmake recent version and shared lib | ||
| + | |||
| + | -cmake --build . --config RelWithDebInfo --target ext_cmake | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_jasper | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_libde265 | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_libjxl | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_libaom | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_libavif | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_ffmpeg | ||
| + | |||
| + | ################################################################################################# | ||
| + | |||
| + | @@ -107,9 +98,7 @@ cmake $ORIG_WD/ | ||
| + | | ||
| + | | ||
| + | | ||
| + | - -DENABLE_QTVERSION=$DK_QTVERSION \ | ||
| + | - -DENABLE_QTWEBENGINE=$DK_QTWEBENGINE \ | ||
| + | - -DQTWEBENGINE_VERSION=$DK_QTWEBENGINEVERSION | ||
| + | + -DENABLE_QTVERSION=$DK_QTVERSION | ||
| + | |||
| + | # Low level libraries and Qt dependencies | ||
| + | # NOTE: The order to compile each component here is very important. | ||
| + | @@ -121,9 +110,7 @@ cmake --build . --config RelWithDebInfo --target ext_openssl | ||
| + | |||
| + | cmake --build . --config RelWithDebInfo --target ext_qt$DK_QTVERSION -- -j$CPU_CORES | ||
| + | |||
| + | -if [[ $DK_QTWEBENGINE = 0 ]] ; then | ||
| + | - cmake --build . --config RelWithDebInfo --target ext_qtwebkit | ||
| + | -fi | ||
| + | + | ||
| + | |||
| + | # Clean up previous openssl install | ||
| + | |||
| + | @@ -131,9 +118,7 @@ rm -fr / | ||
| + | rm -fr / | ||
| + | rm -fr / | ||
| + | |||
| + | -cmake --build . --config RelWithDebInfo --target ext_imagemagick | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_opencv | ||
| + | -cmake --build . --config RelWithDebInfo --target ext_heif | ||
| + | + | ||
| + | |||
| + | ################################################################################################# | ||
| + | |||
| + | diff --git a/ | ||
| + | index 523b1c4c73..92dad7912e 100755 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -123,35 +123,5 @@ cmake --build . --config RelWithDebInfo --target ext_breeze | ||
| + | |||
| + | ################################################################################################# | ||
| + | |||
| + | -if [[ $DK_QTVERSION == 6 ]] ; then | ||
| + | - | ||
| + | - KF6_GITREV_LST=$ORIG_WD/ | ||
| + | - | ||
| + | - echo "List git sub-module revisions in $KF6_GITREV_LST" | ||
| + | - | ||
| + | - if [ -f $KF6_GITREV_LST ] ; then | ||
| + | - rm -f $KF6_GITREV_LST | ||
| + | - fi | ||
| + | - | ||
| + | - currentDate=`date +" | ||
| + | - echo "+KF6 Snapshot $currentDate" | ||
| + | - | ||
| + | - # --- List git revisions for all sub-modules | ||
| + | - | ||
| + | - DIRS=$(find $BUILDING_DIR/ | ||
| + | - | ||
| + | - for ITEM in $DIRS ; do | ||
| + | - | ||
| + | - COMPONENT=(echo $ITEM | cut -d' | ||
| + | - SUBDIR=$BUILDING_DIR/ | ||
| + | - cd $SUBDIR | ||
| + | - echo " | ||
| + | - cd $ORIG_WD | ||
| + | - | ||
| + | - done | ||
| + | - | ||
| + | - cat $KF6_GITREV_LST | ||
| + | - | ||
| + | -fi | ||
| + | |||
| + | | ||
| + | diff --git a/ | ||
| + | index 2bcfca9e7c..d428e12a5e 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -132,17 +132,6 @@ invent.kde.org \ | ||
| + | | ||
| + | " | ||
| + | |||
| + | -if [[ ! -f $HOME/ | ||
| + | - touch $HOME/ | ||
| + | -fi | ||
| + | - | ||
| + | -for server in $SERVER_LIST; | ||
| + | - | ||
| + | - echo " | ||
| + | |||
| + | - ssh-keygen -R $server | ||
| + | - ssh-keyscan -H $server >> $HOME/ | ||
| + | - | ||
| + | -done | ||
| + | |||
| + | } | ||
| + | diff --git a/ | ||
| + | index 8d5722d756..9bfdf91799 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -61,7 +61,7 @@ DK_KA_VERSION=" | ||
| + | | ||
| + | |||
| + | # Option to use QtWebEngine instead QtWebkit | ||
| + | -DK_QTWEBENGINE=1 | ||
| + | +DK_QTWEBENGINE=0 | ||
| + | |||
| + | # Installer sub version to differentiates newer updates of the installer itself, even if the underlying application hasn’t changed. | ||
| + | # | ||
| + | @@ -70,7 +70,7 @@ DK_QTWEBENGINE=1 | ||
| + | | ||
| + | |||
| + | # Upload automatically bundle to files.kde.org (pre-release only). | ||
| + | -DK_UPLOAD=1 | ||
| + | +DK_UPLOAD=0 | ||
| + | | ||
| + | |||
| + | # KDE frameworks version + Upload URL. | ||
| + | diff --git a/ | ||
| + | index 0a283ad98d..989e52afa7 100644 | ||
| + | --- a/ | ||
| + | +++ b/ | ||
| + | @@ -211,11 +211,7 @@ for pkg in ${optional_packages[@]}; | ||
| + | echo " | ||
| + | done | ||
| + | |||
| + | -# Install more recent version of NodeJs for QtWebEngine. | ||
| + | -# https:// | ||
| + | |||
| + | -curl -sL https:// | ||
| + | -sudo apt-get install nodejs | ||
| + | |||
| + | echo -e " | ||
| + | |||
| + | |||
| + | </ | ||
| + | |||
| + | |||
| + | |||
| + | |||
| + | |||
| + | |||
| + | |||
| + | < | ||
| + | # | ||
| + | #set -x | ||
| + | |||
| + | |||
| + | #delete old qet.h | ||
| + | rm sources/ | ||
| + | |||
| + | cd sources | ||
| + | git reset --hard origin/ | ||
| + | |||
| + | cd .. | ||
| + | git pull | ||
| + | sed -i ' | ||
| + | |||
| + | GITCOMMIT=$(git rev-parse --short HEAD) | ||
| + | A=$(git rev-list HEAD --count) | ||
| + | HEAD=$(($A+473)) | ||
| + | |||
| + | VERSION=$(cat sources/ | ||
| + | tagName=$(cat sources/ | ||
| + | |||
| + | |||
| + | # recupere le numero de la nouvelle revision | ||
| + | # | ||
| + | |||
| + | # On recupere le numero de version de l' | ||
| + | tagName=$(sed -n " | ||
| + | |||
| + | |||
| + | # On modifie l' | ||
| + | sed -i ' | ||
| + | |||
| + | |||
| + | rm -Rf build/ | ||
| + | mkdir build && cd build | ||
| + | |||
| + | |||
| + | qmake ../ | ||
| + | make -j48 | ||
| + | |||
| + | |||
| + | |||
| + | cd ../appdir/ | ||
| + | rm qelectrotech/ | ||
| + | rm -Rf qelectrotech/ | ||
| + | rm -Rf qelectrotech/ | ||
| + | |||
| + | cp ../ | ||
| + | cp -r ../ | ||
| + | |||
| + | |||
| + | |||
| + | | ||
| + | rm qelectrotech/ | ||
| + | sed -i ' | ||
| + | cp AppRun qelectrotech/ | ||
| + | rm QElectroTech_*.AppImage | ||
| + | |||
| + | |||
| + | ARCH=x86_64 ./ | ||
| + | chmod -x QElectroTech_0.8-DEV-r$HEAD-x86_64.AppImage | ||
| + | |||
| + | |||
| + | </ | ||
| + | |||
| + | === Flatpak === | ||
| + | |||
| + | < | ||
| + | # | ||
| + | #set -x | ||
| + | |||
| + | |||
| + | #delete old qet.h | ||
| + | rm sources/ | ||
| + | |||
| + | cd sources | ||
| + | git reset --hard origin/ | ||
| + | |||
| + | cd .. | ||
| + | |||
| + | # Fait une mise à jour | ||
| + | git pull | ||
| + | #git checkout test_pugi | ||
| + | |||
| + | sed -i ' | ||
| + | |||
| + | |||
| + | GITCOMMIT=$(git rev-parse --short HEAD) | ||
| + | A=$(git rev-list HEAD --count) | ||
| + | HEAD=$(($A+473)) | ||
| + | |||
| + | VERSION=$(cat sources/ | ||
| + | tagName=$(cat sources/ | ||
| + | |||
| + | |||
| + | # recupere le numero de la nouvelle revision | ||
| + | # | ||
| + | |||
| + | # On recupere le numero de version de l' | ||
| + | tagName=$(sed -n " | ||
| + | |||
| + | |||
| + | # On modifie l' | ||
| + | sed -i ' | ||
| + | |||
| + | cd ~ | ||
| + | flatpak-builder --force-clean --ccache --repo=qet_git/ | ||
| + | flatpak build-update-repo qet_git/ | ||
| + | rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress qet_git/ | ||
| + | </ | ||