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édentesRévision précédente
Prochaine révision		Révision précédente
doc:packaging_debian [03/10/2020 06:29] – [Notes] scorpio810doc:packaging_debian [17/01/2024 16:36] (Version actuelle) – scorpio810
Ligne 16: Ligne 16:
    deb-src​ http://​debian.qelectrotech.org/​qet/​debian/​ stable main    deb-src​ http://​debian.qelectrotech.org/​qet/​debian/​ stable main
        
-[[http://download.tuxfamily.org/qet/debian/]]+[[https://download.qelectrotech.org/qet/debian/]]
   
 === Git Debian package ==== === Git Debian package ====
Ligne 258: Ligne 258:
 echo -e "\033[1;31mrsync to TF password ssh and TF\033[m" echo -e "\033[1;31mrsync to TF password ssh and TF\033[m"
 cd $DEFAULT_DIR/script 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/ +rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/apt/ server:download.qelectrotech.org/qet/qet-repository/debian/ 
 if [ $? != 0 ]; then if [ $? != 0 ]; then
 { {
 echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " 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/+rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress --exclude-from=ExclusionRSync ~/apt/ server:download.qelectrotech.org/qet/qet-repository/debian/
 } fi } fi
  
Ligne 533: Ligne 533:
 read a read a
 if [[ $a == "Y" || $a == "y" ]]; then 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/ +rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress  /home/laurent/builds/nightly/ server:download.qelectrotech.org/qet/qet-repository/builds/nightly/ 
 if [ $? != 0 ]; then if [ $? != 0 ]; then
 { {
 echo "RSYNC ERROR: problem syncing qelectrotech-$VERSION.r$HEAD " 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/ +rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress  /home/laurent/builds/nightly/ server:download.qelectrotech.org/qet/qet-repository/builds/nightly/ 
 } fi } fi
  
Ligne 557: Ligne 557:
  
 === AppImage === === 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://invent.kde.org/graphics/digikam/-/tree/master/project/bundles/appimage \\
 +First read the README file: \\
 +https://invent.kde.org/graphics/digikam/-/blob/master/project/bundles/appimage/README
 +
 +We only use __01-build-host.sh__  script__ to build MacOS Macports environment for QET builds. 
 +
 +<code>
 +git clone https://invent.kde.org/graphics/digikam.git
 +cd digikam/project/bundles/appimage</code>
 +
 +
 +
 +<code=diff>
 +diff --git a/project/bundles/3rdparty/ext_qt5/CMakeLists.txt b/project/bundles/3rdparty/ext_qt5/CMakeLists.txt
 +index a362363309..8548419442 100644
 +--- a/project/bundles/3rdparty/ext_qt5/CMakeLists.txt
 ++++ b/project/bundles/3rdparty/ext_qt5/CMakeLists.txt
 +@@ -38,7 +38,7 @@ ExternalProject_Add(ext_qt5
 +                   -release
 +                   -opensource
 +                   -confirm-license
 +-                  -sql-sqlite                       # Compile Sqlite SQL plugin
 ++                  -system-sqlite                      # We use Sqlite3-dev deb package 
 +                   -sql-mysql                        # Compile Mysql SQL plugin
 + #                  -iconv                            # International string conversion
 +                   -icu
 +diff --git a/project/bundles/appimage/01-build-host.sh b/project/bundles/appimage/01-build-host.sh
 +index f8c317f336..77e1247fb3 100755
 +--- a/project/bundles/appimage/01-build-host.sh
 ++++ b/project/bundles/appimage/01-build-host.sh
 +@@ -80,19 +80,10 @@ cmake $ORIG_WD/../3rdparty \
 +       -DEXTERNALS_DOWNLOAD_DIR=$DOWNLOAD_DIR \
 +       -DKA_VERSION=$DK_KA_VERSION \
 +       -DKP_VERSION=$DK_KP_VERSION \
 +-      -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           -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_jasper          -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_libde265        -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_libjxl          -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_libaom          -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_libavif         -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_ffmpeg          -- -j$CPU_CORES
 + 
 + #################################################################################################
 + 
 +@@ -107,9 +98,7 @@ cmake $ORIG_WD/../3rdparty \
 +       -DKA_VERSION=$DK_KA_VERSION \
 +       -DKP_VERSION=$DK_KP_VERSION \
 +       -DKDE_VERSION=$DK_KDE_VERSION \
 +-      -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         -- -j$CPU_C
 + 
 + cmake --build . --config RelWithDebInfo --target ext_qt$DK_QTVERSION -- -j$CPU_CORES    # depend of tiff, png, jpeg
 + 
 +-if [[ $DK_QTWEBENGINE = 0 ]] ; then
 +-    cmake --build . --config RelWithDebInfo --target ext_qtwebkit    -- -j$CPU_CORES    # depend of Qt and libicu
 +-fi
 ++
 + 
 + # Clean up previous openssl install
 + 
 +@@ -131,9 +118,7 @@ rm -fr /usr/local/lib/libssl.a    || true
 + rm -fr /usr/local/lib/libcrypto.a || true
 + rm -fr /usr/local/include/openssl || true
 + 
 +-cmake --build . --config RelWithDebInfo --target ext_imagemagick     -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_opencv          -- -j$CPU_CORES
 +-cmake --build . --config RelWithDebInfo --target ext_heif            -- -j$CPU_CORES
 ++
 + 
 + #################################################################################################
 + 
 +diff --git a/project/bundles/appimage/02-build-extralibs.sh b/project/bundles/appimage/02-build-extralibs.sh
 +index 523b1c4c73..92dad7912e 100755
 +--- a/project/bundles/appimage/02-build-extralibs.sh
 ++++ b/project/bundles/appimage/02-build-extralibs.sh
 +@@ -123,35 +123,5 @@ cmake --build . --config RelWithDebInfo --target ext_breeze
 + 
 + #################################################################################################
 + 
 +-if [[ $DK_QTVERSION == 6 ]] ; then
 +-
 +-    KF6_GITREV_LST=$ORIG_WD/data/kf6_manifest.txt
 +-
 +-    echo "List git sub-module revisions in $KF6_GITREV_LST"
 +-
 +-    if [ -f $KF6_GITREV_LST ] ; then
 +-        rm -f $KF6_GITREV_LST
 +-    fi
 +-
 +-    currentDate=`date +"%Y-%m-%d"`
 +-    echo "+KF6 Snapshot $currentDate" > $KF6_GITREV_LST
 +-
 +-    # --- List git revisions for all sub-modules
 +-
 +-    DIRS=$(find $BUILDING_DIR/ext_kf6/ -name "ext_*-prefix")
 +-
 +-    for ITEM in $DIRS ; do
 +-
 +-        COMPONENT=(echo $ITEM | cut -d'_' -f 1 | cut -d'-' -f 2)
 +-        SUBDIR=$BUILDING_DIR/ext_kf6/$ITEM/src/$COMPONENT
 +-        cd $SUBDIR
 +-        echo "$(basename "$SUBDIR"):$(git rev-parse HEAD)" >> $KF6_GITREV_LST
 +-        cd $ORIG_WD
 +-
 +-    done
 +-
 +-    cat $KF6_GITREV_LST
 +-
 +-fi
 + 
 + TerminateScript
 +diff --git a/project/bundles/appimage/common.sh b/project/bundles/appimage/common.sh
 +index 2bcfca9e7c..d428e12a5e 100644
 +--- a/project/bundles/appimage/common.sh
 ++++ b/project/bundles/appimage/common.sh
 +@@ -132,17 +132,6 @@ invent.kde.org \
 + tinami.kde.org \
 + "
 + 
 +-if [[ ! -f $HOME/.ssh/known_hosts ]] ; then
 +-    touch $HOME/.ssh/known_hosts
 +-fi
 +-
 +-for server in $SERVER_LIST; do
 +-
 +-    echo "Register $server"
 + 
 +-    ssh-keygen -R $server
 +-    ssh-keyscan -H $server >> $HOME/.ssh/known_hosts
 +-
 +-done
 + 
 + }
 +diff --git a/project/bundles/appimage/config.sh b/project/bundles/appimage/config.sh
 +index 8d5722d756..9bfdf91799 100644
 +--- a/project/bundles/appimage/config.sh
 ++++ b/project/bundles/appimage/config.sh
 +@@ -61,7 +61,7 @@ DK_KA_VERSION="23.08.4"
 + DK_DEBUG=0
 + 
 + # 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.
 + #DK_SUBVER="-01"
 +@@ -70,7 +70,7 @@ DK_QTWEBENGINE=1
 + DK_SIGN=0
 + 
 + # Upload automatically bundle to files.kde.org (pre-release only).
 +-DK_UPLOAD=1
 ++DK_UPLOAD=0
 + DK_UPLOADURL="digikam@tinami.kde.org"
 + 
 + # KDE frameworks version + Upload URL.
 +diff --git a/project/bundles/appimage/host_ubuntu.inc b/project/bundles/appimage/host_ubuntu.inc
 +index 0a283ad98d..989e52afa7 100644
 +--- a/project/bundles/appimage/host_ubuntu.inc
 ++++ b/project/bundles/appimage/host_ubuntu.inc
 +@@ -211,11 +211,7 @@ for pkg in ${optional_packages[@]}; do
 +     echo "-------------------------------------------------------------------"
 + done
 + 
 +-# Install more recent version of NodeJs for QtWebEngine.
 +-# https://learnubuntu.com/update-node-js/
 + 
 +-curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
 +-sudo apt-get install nodejs
 + 
 + echo -e "---------- Clean-up Old Packages\n"
 + 
 +
 +</code>
 +
 +
 +
 +
 +
 +
  
 <code=bash> <code=bash>
 #!/bin/bash  #!/bin/bash 
-#nettoyage des chroots +#set -x
-set -x+
  
  
Ligne 578: Ligne 773:
 HEAD=$(($A+473)) HEAD=$(($A+473))
  
-VERSION=$(cat 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 GIT sources/qet.h 
-tagName=$(cat 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 GIT sources/qet.h
  
  
Ligne 589: Ligne 784:
  
  
-# On modifie l'originale avec le numero de revision du depot svn+# On modifie l'originale avec le numéro de révision du dépôt GIT
 sed -i 's/'"const QString displayedVersion =.*/const QString displayedVersion = \"$tagName+$GITCOMMIT\";"'/' sources/qet.h sed -i 's/'"const QString displayedVersion =.*/const QString displayedVersion = \"$tagName+$GITCOMMIT\";"'/' sources/qet.h
  
Ligne 598: Ligne 793:
  
 qmake ../qelectrotech.pro qmake ../qelectrotech.pro
-make -j16+make -j48
  
  
Ligne 624: Ligne 819:
  
 </code> </code>
- + 
 +=== Flatpak === 
 + 
 +<code=bash> 
 +#!/bin/bash  
 +#set -x 
 + 
 + 
 +#delete old qet.h 
 +rm sources/qet.h 
 + 
 +cd sources 
 +git reset --hard origin/master 
 + 
 +cd .. 
 + 
 +# Fait une mise à jour 
 +git pull 
 +#git checkout test_pugi 
 + 
 +sed -i 's/DEFINES += QET_EXPORT_PROJECT_DB/#DEFINES += QET_EXPORT_PROJECT_DB/' qelectrotech.pro  
 + 
 + 
 +GITCOMMIT=$(git rev-parse --short HEAD) 
 +A=$(git rev-list HEAD --count) 
 +HEAD=$(($A+473)) 
 + 
 +VERSION=$(cat sources/qet.h | grep "const QString version" |  cut -d\" -f2 | cut -d\" -f1)          #Find version tag in GIT sources/qet.h 
 +tagName=$(cat sources/qet.h | grep displayedVersion |  cut -d\" -f2 | cut -d\" -f1)                 #Find displayedVersion tag in GIT sources/qet.h 
 + 
 + 
 +# recupere le numero de la nouvelle revision 
 +#revAp=$(svnversion | cut -d : -f 2 | tr -d '[:alpha:]') 
 + 
 +# On recupere le numero de version de l'originale  
 +tagName=$(sed -n "s/const QString displayedVersion =\(.*\)/\1/p" sources/qet.h  | cut -d\" -f2 | cut -d\" -f1 ) 
 + 
 + 
 +# On modifie l'originale avec le numero de revision du depot svn 
 +sed -i 's/'"const QString displayedVersion =.*/const QString displayedVersion = \"$tagName+$GITCOMMIT\";"'/' sources/qet.h 
 + 
 +cd ~ 
 +flatpak-builder --force-clean --ccache --repo=qet_git/0.8-dev qet_git/build-dir qet_git/build-aux/flatpak/org.qelectrotech.QElectroTech.json --gpg-sign=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX   --gpg-homedir=gpg 
 +flatpak build-update-repo qet_git/0.8-dev --title="Development builds of QElectroTech" --prune --prune-depth=4  --generate-static-deltas --gpg-sign=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX   --gpg-homedir=gpg 
 +rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress qet_git/0.8-dev/ server:download.qelectrotech.org/qet/qet-repository/builds/Flatpak/ 
 +</code>
Imprimer/exporter