mirror of
https://github.com/RetroShare/RetroShare.git
synced 2026-09-12 19:50:17 +05:00
Merge 797d3242ba into f8553d2fd9
This commit is contained in:
jolavillette
GitHub
commit
5313d18ff3
@ -15,20 +15,20 @@
|
||||
# ==============================================================================
|
||||
set -e
|
||||
|
||||
# Toujours travailler depuis la racine du dépôt (ce script vit sous
|
||||
# build_scripts/Windows-msys2/), sinon les chemins relatifs (retroshare-gui/src,
|
||||
# libbitdht, ...) sont muets et produisent un paquet incomplet sans erreur.
|
||||
# Always operate from the repository root (this script lives under
|
||||
# build_scripts/Windows-msys2/); otherwise the relative paths (retroshare-gui/src,
|
||||
# libbitdht, ...) resolve to nothing and silently produce an incomplete package.
|
||||
cd "$(dirname "$0")/../.." || exit 1
|
||||
|
||||
# Build directory (override with: BUILD_DIR=mydir ./build_scripts/Windows-msys2/deploy-windows.sh)
|
||||
BUILD_DIR="${BUILD_DIR:-Build-cmake}"
|
||||
|
||||
# Préfixe de l'environnement MSYS2 utilisé pour la compilation
|
||||
# (mingw64 / ucrt64 / clang64). Indispensable pour retrouver le runtime
|
||||
# compilateur et les plugins Qt quel que soit l'environnement employé.
|
||||
# Prefix of the MSYS2 environment used for the build
|
||||
# (mingw64 / ucrt64 / clang64). Required to locate the compiler runtime
|
||||
# and the Qt plugins whatever environment is used.
|
||||
MINGW_PREFIX="${MSYSTEM_PREFIX:-/mingw64}"
|
||||
|
||||
# 1. Vérifications initiales du dossier de build
|
||||
# 1. Initial checks on the build directory
|
||||
if [ ! -d "$BUILD_DIR" ]; then
|
||||
echo "ERROR: Build directory '$BUILD_DIR' not found. Please compile the project first!"
|
||||
exit 1
|
||||
@ -38,84 +38,140 @@ echo "==========================================================================
|
||||
echo " RETROSHARE WINDOWS DEPLOYMENT GENERATOR"
|
||||
echo "================================================================================"
|
||||
|
||||
# 2. Détermination dynamique des variables de version (inspiré de qmake)
|
||||
# 2. Dynamically determine the version variables (inspired by qmake)
|
||||
echo ">>> Extracting versioning info from Git and environment..."
|
||||
|
||||
# Date au format YYYYMMDD
|
||||
# Date in YYYYMMDD format
|
||||
DATE_STR=$(date +%Y%m%d)
|
||||
|
||||
# Récupération du describe de Git (ex: v0.6.7.2-892-g5341b777d-dirty)
|
||||
# Get the Git describe (e.g. v0.6.7.2-892-g5341b777d-dirty)
|
||||
GIT_DESC=$(git describe --tags --always --dirty 2>/dev/null || echo "0.6.7-unknown")
|
||||
CLEAN_DESC=${GIT_DESC#v} # Enlève le 'v' initial
|
||||
CLEAN_DESC=${GIT_DESC#v} # Strip the leading 'v'
|
||||
|
||||
# Valeurs par défaut
|
||||
# Default values
|
||||
VERSION="$CLEAN_DESC"
|
||||
GIT_SUFFIX=""
|
||||
REVISION_VAL="0"
|
||||
|
||||
if [[ "$CLEAN_DESC" == *-* ]]; then
|
||||
# Format: tag-commits-hash[-dirty] (ex: 0.6.7.2-892-g5341b777d-dirty)
|
||||
# Format: tag-commits-hash[-dirty] (e.g. 0.6.7.2-892-g5341b777d-dirty)
|
||||
VERSION=$(echo "$CLEAN_DESC" | cut -d'-' -f1)
|
||||
COMMIT_INFO=$(echo "$CLEAN_DESC" | cut -d'-' -f2-)
|
||||
GIT_SUFFIX="-${DATE_STR}-${COMMIT_INFO}"
|
||||
REVISION_VAL="${COMMIT_INFO}"
|
||||
else
|
||||
# Si on est pile sur un tag
|
||||
# Exactly on a tag
|
||||
GIT_SUFFIX="-${DATE_STR}"
|
||||
fi
|
||||
|
||||
# Recherche de l'exécutable windeployqt adéquat
|
||||
# ------------------------------------------------------------------------------
|
||||
# Detect the MAJOR Qt version actually used by the build. We extract it from the
|
||||
# compiled binary's imports (objdump), NOT from whichever qmake happens to be
|
||||
# first in PATH: on an MSYS2 install where Qt5 AND Qt6 coexist, `qmake` may point
|
||||
# to Qt6 while the binary is linked against Qt5 (or vice versa). If deployment is
|
||||
# not locked to the right version, windeployqt and the fallback plugins
|
||||
# (platforms/qwindows.dll...) are taken from the wrong Qt, causing the
|
||||
# "no Qt platform plugin could be initialized" crash at startup.
|
||||
# ------------------------------------------------------------------------------
|
||||
QT_MAJOR=""
|
||||
GUI_EXE_SRC=$(find "$BUILD_DIR" -path '*Portable*' -prune -o -name "retroshare-gui.exe" -print 2>/dev/null | head -n 1)
|
||||
if [ -n "$GUI_EXE_SRC" ] && command -v objdump &> /dev/null; then
|
||||
if objdump -p "$GUI_EXE_SRC" 2>/dev/null | grep -qiE 'Qt6(Core|Gui|Widgets)\.dll'; then
|
||||
QT_MAJOR=6
|
||||
elif objdump -p "$GUI_EXE_SRC" 2>/dev/null | grep -qiE 'Qt5(Core|Gui|Widgets)\.dll'; then
|
||||
QT_MAJOR=5
|
||||
fi
|
||||
fi
|
||||
if [ -z "$QT_MAJOR" ]; then
|
||||
echo " WARNING: Could not detect the Qt major version from the binary; defaulting to 6."
|
||||
QT_MAJOR=6
|
||||
fi
|
||||
echo " Qt major version linked by the build: Qt${QT_MAJOR}"
|
||||
|
||||
# Find the windeployqt matching THIS major version. We validate the version
|
||||
# returned by --version: the bare `windeployqt` may belong to the other Qt on a
|
||||
# mixed install.
|
||||
if [ "$QT_MAJOR" = "6" ]; then
|
||||
WINDEPLOYQT_CANDIDATES="windeployqt6 windeployqt-qt6 windeployqt"
|
||||
else
|
||||
WINDEPLOYQT_CANDIDATES="windeployqt-qt5 windeployqt"
|
||||
fi
|
||||
WINDEPLOYQT_CMD=""
|
||||
for cmd in windeployqt windeployqt-qt5 windeployqt-qt6; do
|
||||
for cmd in $WINDEPLOYQT_CANDIDATES; do
|
||||
if command -v "$cmd" &> /dev/null; then
|
||||
WINDEPLOYQT_CMD="$cmd"
|
||||
break
|
||||
cand_ver=$("$cmd" --version 2>/dev/null | grep -o -E '[0-9]+\.[0-9]+\.[0-9]+' | head -n 1)
|
||||
if [[ "$cand_ver" == "${QT_MAJOR}."* ]]; then
|
||||
WINDEPLOYQT_CMD="$cmd"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Détection de la version de Qt
|
||||
# Detect the full Qt version via the qmake of the RIGHT major version.
|
||||
QT_VERSION=""
|
||||
if command -v qmake &> /dev/null; then
|
||||
QT_VERSION=$(qmake -query QT_VERSION 2>/dev/null)
|
||||
if [ "$QT_MAJOR" = "6" ]; then
|
||||
QMAKE_CANDIDATES="qmake6 qmake-qt6 qmake"
|
||||
else
|
||||
QMAKE_CANDIDATES="qmake-qt5 qmake"
|
||||
fi
|
||||
for q in $QMAKE_CANDIDATES; do
|
||||
if command -v "$q" &> /dev/null; then
|
||||
v=$("$q" -query QT_VERSION 2>/dev/null)
|
||||
if [[ "$v" == "${QT_MAJOR}."* ]]; then
|
||||
QT_VERSION="$v"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Si qmake n'a pas donné de version propre, on cherche avec windeployqt
|
||||
# If qmake returned nothing, fall back to windeployqt (already filtered by version).
|
||||
if [[ ! "$QT_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && [ -n "$WINDEPLOYQT_CMD" ]; then
|
||||
QT_VERSION=$("$WINDEPLOYQT_CMD" --version 2>/dev/null | grep -o -E '[0-9]+\.[0-9]+\.[0-9]+' | head -n 1 || echo "")
|
||||
fi
|
||||
|
||||
# Valeur de secours si rien n'a été détecté ou si la version est invalide
|
||||
# Fallback value consistent with the detected major version.
|
||||
if [[ ! "$QT_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
QT_VERSION="5.15.18"
|
||||
if [ "$QT_MAJOR" = "6" ]; then QT_VERSION="6.0.0"; else QT_VERSION="5.15.18"; fi
|
||||
fi
|
||||
|
||||
# Nom de base de l'archive finale
|
||||
ARCHIVE_BASE="RetroShare-${VERSION}-Windows-Portable${GIT_SUFFIX}-Qt-${QT_VERSION}-mingw64-msys2"
|
||||
# Base name of the final archive. The environment tag reflects the MSYS2 shell
|
||||
# actually used (ucrt64 / mingw64 / clang64) instead of a hard-coded 'mingw64'
|
||||
# that lied on UCRT64/CLANG64 builds.
|
||||
#
|
||||
# Naming mirrors the Linux AppImage scheme:
|
||||
# RetroShare-v<ver>-<YYYYMMDD>-<count>-g<hash>-Qt-<qtver>-<env>-msys2-x86_64
|
||||
# GIT_SUFFIX already carries "-<YYYYMMDD>-<count>-g<hash>" (or just the date when
|
||||
# exactly on a tag). The runtime slot is the MSYS2 environment (ucrt64-msys2),
|
||||
# the Windows analog of the AppImage's glibc-<ver>.
|
||||
ENV_TAG=$(echo "${MSYSTEM:-mingw64}" | tr '[:upper:]' '[:lower:]')
|
||||
ARCHIVE_BASE="RetroShare-v${VERSION}${GIT_SUFFIX}-Qt-${QT_VERSION}-${ENV_TAG}-msys2-x86_64"
|
||||
DEPLOY_DIR="${BUILD_DIR}/${ARCHIVE_BASE}"
|
||||
|
||||
echo " Target Package Name: ${ARCHIVE_BASE}"
|
||||
echo " Deploy Directory: ${DEPLOY_DIR}"
|
||||
|
||||
# Nettoyage des anciennes générations de déploiement
|
||||
# Clean up previous deployment generations
|
||||
echo ">>> Cleaning up previous deployment directories..."
|
||||
# Ne supprimer que les anciens RÉPERTOIRES de déploiement, pas les archives
|
||||
# .7z / .zip produites lors des runs précédents (qui matchent le même motif).
|
||||
# Only remove old deployment DIRECTORIES, not the .7z / .zip archives produced
|
||||
# by previous runs (which match the same pattern).
|
||||
find "$BUILD_DIR" -maxdepth 1 -type d -name "RetroShare-*-Windows-Portable*" -exec rm -rf {} + 2>/dev/null || true
|
||||
mkdir -p "$DEPLOY_DIR"
|
||||
|
||||
# 3. Création de l'arborescence complète attendue par RetroShare
|
||||
# 3. Create the full directory tree expected by RetroShare
|
||||
echo ">>> Creating target directory layout..."
|
||||
mkdir -p "$DEPLOY_DIR/Data/extensions6" # Répertoire pour les plugins de RetroShare
|
||||
mkdir -p "$DEPLOY_DIR/qss" # Feuilles de style de l'interface
|
||||
mkdir -p "$DEPLOY_DIR/stylesheets" # Feuilles de style de la messagerie
|
||||
mkdir -p "$DEPLOY_DIR/sounds" # Sons système de l'interface
|
||||
mkdir -p "$DEPLOY_DIR/translations" # Fichiers de traductions (RetroShare + Qt)
|
||||
mkdir -p "$DEPLOY_DIR/license" # Fichiers de licences
|
||||
mkdir -p "$DEPLOY_DIR/log" # Dossier de logs de fonctionnement
|
||||
mkdir -p "$DEPLOY_DIR/Data/extensions6" # Directory for RetroShare plugins
|
||||
mkdir -p "$DEPLOY_DIR/qss" # UI stylesheets
|
||||
mkdir -p "$DEPLOY_DIR/stylesheets" # Chat stylesheets
|
||||
mkdir -p "$DEPLOY_DIR/sounds" # UI system sounds
|
||||
mkdir -p "$DEPLOY_DIR/translations" # Translation files (RetroShare + Qt)
|
||||
mkdir -p "$DEPLOY_DIR/license" # License files
|
||||
mkdir -p "$DEPLOY_DIR/log" # Runtime log directory
|
||||
|
||||
# 4. Création du fichier témoin 'portable'
|
||||
# 4. Create the 'portable' marker file
|
||||
echo ">>> Creating 'portable' mode indicator file..."
|
||||
touch "$DEPLOY_DIR/portable"
|
||||
|
||||
# 5. Copie des exécutables et DLL générées par la compilation
|
||||
# 5. Copy the executables and DLLs produced by the build
|
||||
echo ">>> Copying compiled binaries..."
|
||||
for exe in retroshare-gui.exe retroshare-service.exe retroshare-friendserver.exe; do
|
||||
found_exe=$(find "$BUILD_DIR" -path "$DEPLOY_DIR" -prune -o -name "$exe" -print | head -n 1)
|
||||
@ -128,9 +184,9 @@ for exe in retroshare-gui.exe retroshare-service.exe retroshare-friendserver.exe
|
||||
done
|
||||
|
||||
echo ">>> Copying local build libraries (DLLs)..."
|
||||
# Recherche et copie des DLL compilées en interne dans le projet (RNP, CMark, RetroShare, Restbed)
|
||||
# NB: on élague "$DEPLOY_DIR" (situé sous "$BUILD_DIR") pour éviter de re-trouver
|
||||
# les DLL déjà copiées et de déployer par erreur une variante stale.
|
||||
# Find and copy the DLLs built internally by the project (RNP, CMark, RetroShare, Restbed)
|
||||
# NB: we prune "$DEPLOY_DIR" (located under "$BUILD_DIR") to avoid re-finding the
|
||||
# DLLs already copied and mistakenly deploying a stale variant.
|
||||
find "$BUILD_DIR" -path "$DEPLOY_DIR" -prune -o -name "libcmark.dll" -exec cp {} "$DEPLOY_DIR/" \; 2>/dev/null || true
|
||||
find "$BUILD_DIR" -path "$DEPLOY_DIR" -prune -o -name "*retroshare.dll" -exec cp {} "$DEPLOY_DIR/" \; 2>/dev/null || true
|
||||
find "$BUILD_DIR" -path "$DEPLOY_DIR" -prune -o -name "*restbed*.dll" -exec cp {} "$DEPLOY_DIR/" \; 2>/dev/null || true
|
||||
@ -147,7 +203,7 @@ else
|
||||
echo " WARNING: Plugins directory not found. Skipping plugins."
|
||||
fi
|
||||
|
||||
# 6. Copie des ressources statiques de RetroShare (QSS, sons, etc.)
|
||||
# 6. Copy RetroShare's static assets (QSS, sounds, etc.)
|
||||
echo ">>> Copying RetroShare static assets..."
|
||||
|
||||
if [ -d "retroshare-gui/src/qss" ]; then
|
||||
@ -156,7 +212,7 @@ fi
|
||||
|
||||
if [ -d "retroshare-gui/src/gui/qss/chat" ]; then
|
||||
cp -r retroshare-gui/src/gui/qss/chat/* "$DEPLOY_DIR/stylesheets/" 2>/dev/null || true
|
||||
# Supprime les répertoires inutiles d'après le pack.bat historique
|
||||
# Remove the useless directories, following the historical pack.bat
|
||||
rm -rf "$DEPLOY_DIR/stylesheets/compact" "$DEPLOY_DIR/stylesheets/standard"
|
||||
fi
|
||||
|
||||
@ -173,24 +229,26 @@ if [ -f "libbitdht/src/bitdht/bdboot.txt" ]; then
|
||||
echo " Copied bdboot.txt"
|
||||
fi
|
||||
|
||||
# 7. Copie des fichiers de traduction
|
||||
# 7. Copy the translation files
|
||||
echo ">>> Copying translations (RetroShare + Qt system)..."
|
||||
if [ -d "retroshare-gui/src/translations" ]; then
|
||||
find "retroshare-gui/src/translations" -name "*.qm" -exec cp {} "$DEPLOY_DIR/translations/" \; 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# Copie des traductions Qt de l'environnement MSYS2 MinGW64
|
||||
QT_TRANS_DIR="$MINGW_PREFIX/share/qt5/translations"
|
||||
if [ -d "$QT_TRANS_DIR" ]; then
|
||||
cp "$QT_TRANS_DIR"/qt_*.qm "$DEPLOY_DIR/translations/" 2>/dev/null || true
|
||||
fi
|
||||
QT6_TRANS_DIR="$MINGW_PREFIX/share/qt6/translations"
|
||||
if [ -d "$QT6_TRANS_DIR" ]; then
|
||||
cp "$QT6_TRANS_DIR"/qt_*.qm "$DEPLOY_DIR/translations/" 2>/dev/null || true
|
||||
cp "$QT6_TRANS_DIR"/qtbase_*.qm "$DEPLOY_DIR/translations/" 2>/dev/null || true
|
||||
fi
|
||||
# Qt translations of the RIGHT major version only (do not mix Qt5 and Qt6 .qm
|
||||
# files in the same package).
|
||||
for tdir in \
|
||||
"$MINGW_PREFIX/share/qt${QT_MAJOR}/translations" \
|
||||
"$MINGW_PREFIX/lib/qt${QT_MAJOR}/translations" \
|
||||
"$MINGW_PREFIX/qt${QT_MAJOR}/translations"; do
|
||||
if [ -d "$tdir" ]; then
|
||||
cp "$tdir"/qt_*.qm "$DEPLOY_DIR/translations/" 2>/dev/null || true
|
||||
cp "$tdir"/qtbase_*.qm "$DEPLOY_DIR/translations/" 2>/dev/null || true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# 8. Déploiement des dépendances Qt via windeployqt
|
||||
# 8. Deploy the Qt dependencies via windeployqt
|
||||
if [ -f "$DEPLOY_DIR/retroshare-gui.exe" ]; then
|
||||
if [ -n "$WINDEPLOYQT_CMD" ]; then
|
||||
echo ">>> Running $WINDEPLOYQT_CMD on retroshare-gui.exe..."
|
||||
@ -207,76 +265,70 @@ if [ -f "$DEPLOY_DIR/retroshare-gui.exe" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# Fallback manuel pour les plugins Qt essentiels (comme 'platforms' et 'styles')
|
||||
# Indispensable si windeployqt a échoué ou n'était pas présent.
|
||||
# Manual fallback for the essential Qt plugins (such as 'platforms' and 'styles').
|
||||
# Required if windeployqt failed or was not present.
|
||||
# NB: every fallback plugin below is taken EXCLUSIVELY from the directory of the
|
||||
# detected major version (qt${QT_MAJOR}). Mixing a Qt6 qwindows.dll with Qt5*.dll
|
||||
# (or vice versa) causes the "no Qt platform plugin could be initialized" crash.
|
||||
QT_PLUGIN_DIRS=( \
|
||||
"$MINGW_PREFIX/share/qt${QT_MAJOR}/plugins" \
|
||||
"$MINGW_PREFIX/lib/qt${QT_MAJOR}/plugins" \
|
||||
"$MINGW_PREFIX/qt${QT_MAJOR}/plugins" )
|
||||
|
||||
if [ ! -d "$DEPLOY_DIR/platforms" ] || [ ! -f "$DEPLOY_DIR/platforms/qwindows.dll" ]; then
|
||||
echo ">>> Manual fallback: Copying Qt 'platforms' directory (qwindows.dll)..."
|
||||
echo ">>> Manual fallback: Copying Qt${QT_MAJOR} 'platforms' plugin (qwindows.dll)..."
|
||||
mkdir -p "$DEPLOY_DIR/platforms"
|
||||
COPIED_PLATFORMS=false
|
||||
for path in \
|
||||
"$MINGW_PREFIX/share/qt6/plugins/platforms/qwindows.dll" \
|
||||
"$MINGW_PREFIX/share/qt5/plugins/platforms/qwindows.dll" \
|
||||
"$MINGW_PREFIX/lib/qt6/plugins/platforms/qwindows.dll" \
|
||||
"$MINGW_PREFIX/lib/qt5/plugins/platforms/qwindows.dll"; do
|
||||
if [ -f "$path" ]; then
|
||||
echo " Found platforms plugin at: $path"
|
||||
cp "$path" "$DEPLOY_DIR/platforms/"
|
||||
for base in "${QT_PLUGIN_DIRS[@]}"; do
|
||||
if [ -f "$base/platforms/qwindows.dll" ]; then
|
||||
echo " Found platforms plugin at: $base/platforms/qwindows.dll"
|
||||
cp "$base/platforms/qwindows.dll" "$DEPLOY_DIR/platforms/"
|
||||
COPIED_PLATFORMS=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ "$COPIED_PLATFORMS" = false ]; then
|
||||
echo " WARNING: Could not find qwindows.dll in standard MSYS2 paths!"
|
||||
echo " WARNING: Could not find Qt${QT_MAJOR} qwindows.dll in standard MSYS2 paths!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -d "$DEPLOY_DIR/styles" ] || [ ! -f "$DEPLOY_DIR/styles/qwindowsvistastyle.dll" ]; then
|
||||
echo ">>> Manual fallback: Copying Qt 'styles' directory (qwindowsvistastyle.dll)..."
|
||||
mkdir -p "$DEPLOY_DIR/styles"
|
||||
for path in \
|
||||
"$MINGW_PREFIX/share/qt6/plugins/styles/qwindowsvistastyle.dll" \
|
||||
"$MINGW_PREFIX/share/qt5/plugins/styles/qwindowsvistastyle.dll" \
|
||||
"$MINGW_PREFIX/lib/qt6/plugins/styles/qwindowsvistastyle.dll" \
|
||||
"$MINGW_PREFIX/lib/qt5/plugins/styles/qwindowsvistastyle.dll"; do
|
||||
if [ -f "$path" ]; then
|
||||
echo " Found styles plugin at: $path"
|
||||
cp "$path" "$DEPLOY_DIR/styles/"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
echo ">>> Deploying Qt${QT_MAJOR} 'styles' plugins..."
|
||||
mkdir -p "$DEPLOY_DIR/styles"
|
||||
for base in "${QT_PLUGIN_DIRS[@]}"; do
|
||||
if [ -d "$base/styles" ]; then
|
||||
echo " Found styles plugin directory at: $base/styles"
|
||||
cp -r "$base/styles"/* "$DEPLOY_DIR/styles/" 2>/dev/null || true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
echo ">>> Deploying Qt 'imageformats' directory (essential for SVG/ICO icons)..."
|
||||
echo ">>> Deploying Qt${QT_MAJOR} 'imageformats' plugins (essential for SVG/ICO icons)..."
|
||||
mkdir -p "$DEPLOY_DIR/imageformats"
|
||||
COPIED_IMAGEFORMATS=false
|
||||
for path in \
|
||||
"$MINGW_PREFIX/share/qt6/plugins/imageformats" \
|
||||
"$MINGW_PREFIX/share/qt5/plugins/imageformats" \
|
||||
"$MINGW_PREFIX/lib/qt6/plugins/imageformats" \
|
||||
"$MINGW_PREFIX/lib/qt5/plugins/imageformats"; do
|
||||
if [ -d "$path" ]; then
|
||||
echo " Found imageformats plugin directory at: $path"
|
||||
cp -r "$path"/* "$DEPLOY_DIR/imageformats/" 2>/dev/null || true
|
||||
for base in "${QT_PLUGIN_DIRS[@]}"; do
|
||||
if [ -d "$base/imageformats" ]; then
|
||||
echo " Found imageformats plugin directory at: $base/imageformats"
|
||||
cp -r "$base/imageformats"/* "$DEPLOY_DIR/imageformats/" 2>/dev/null || true
|
||||
COPIED_IMAGEFORMATS=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ "$COPIED_IMAGEFORMATS" = false ]; then
|
||||
echo " WARNING: Could not find imageformats directory in standard MSYS2 paths!"
|
||||
echo " WARNING: Could not find Qt${QT_MAJOR} imageformats directory in standard MSYS2 paths!"
|
||||
fi
|
||||
|
||||
|
||||
# 9. Résolution dynamique des dépendances MinGW (ldd)
|
||||
# 9. Dynamically resolve MinGW dependencies (ldd)
|
||||
echo ">>> Resolving system and 3rd party DLL dependencies using ldd..."
|
||||
TEMP_DEPENDENCY_LIST=$(mktemp)
|
||||
trap 'rm -f "$TEMP_DEPENDENCY_LIST"' EXIT
|
||||
|
||||
PREV_COUNT=0
|
||||
while true; do
|
||||
# Scanner tous les exe et dll présents dans le dossier de déploiement
|
||||
# Scan every exe and dll present in the deployment folder
|
||||
find "$DEPLOY_DIR" \( -name "*.exe" -o -name "*.dll" \) -exec ldd {} \; 2>/dev/null \
|
||||
| grep -i "$MINGW_PREFIX/bin" | awk '{print $3}' | sort -u > "$TEMP_DEPENDENCY_LIST"
|
||||
|
||||
|
||||
CURR_COUNT=$(wc -l < "$TEMP_DEPENDENCY_LIST")
|
||||
if [ "$CURR_COUNT" -eq "$PREV_COUNT" ]; then
|
||||
break
|
||||
@ -286,7 +338,7 @@ while true; do
|
||||
while read -r dll_path; do
|
||||
if [ -f "$dll_path" ]; then
|
||||
dll_name=$(basename "$dll_path")
|
||||
# Ne pas écraser les DLL déjà présentes (Qt ou compilées localement)
|
||||
# Do not overwrite DLLs already present (Qt or locally built)
|
||||
if [ ! -f "$DEPLOY_DIR/$dll_name" ]; then
|
||||
echo " Deploying dependency: $dll_name"
|
||||
cp "$dll_path" "$DEPLOY_DIR/"
|
||||
@ -338,7 +390,7 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
# 10. Déploiement de la WebUI (si présente)
|
||||
# 10. Deploy the WebUI (if present)
|
||||
echo ">>> Deploying WebUI static assets..."
|
||||
if [ -d "retroshare-webui/src" ]; then
|
||||
mkdir -p "$DEPLOY_DIR/webui"
|
||||
@ -348,7 +400,7 @@ else
|
||||
echo " WebUI source folder not found. Skipping WebUI packaging."
|
||||
fi
|
||||
|
||||
# 11. Création de l'archive finale (7z en priorité, zip en fallback)
|
||||
# 11. Create the final archive (7z preferred, zip as fallback)
|
||||
echo ">>> Packaging final compressed archive..."
|
||||
(
|
||||
cd "$BUILD_DIR" || exit 1
|
||||
@ -372,3 +424,73 @@ echo ">>> Packaging final compressed archive..."
|
||||
echo "================================================================================"
|
||||
fi
|
||||
)
|
||||
|
||||
# 12. Create the setup installer if NSIS (makensis) is available
|
||||
MAKENSIS_CMD=""
|
||||
if command -v makensis &> /dev/null; then
|
||||
MAKENSIS_CMD="makensis"
|
||||
else
|
||||
# Fallback to standard MSYS2 MinGW paths if it's not in the active PATH
|
||||
for prefix in "${MINGW_PREFIX}" "/ucrt64" "/mingw64" "/clang64" "/mingw32"; do
|
||||
if [ -f "${prefix}/bin/makensis" ]; then
|
||||
MAKENSIS_CMD="${prefix}/bin/makensis"
|
||||
break
|
||||
elif [ -f "${prefix}/bin/makensis.exe" ]; then
|
||||
MAKENSIS_CMD="${prefix}/bin/makensis.exe"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [ -n "$MAKENSIS_CMD" ]; then
|
||||
echo ""
|
||||
echo ">>> Generating Windows Installer using NSIS ($MAKENSIS_CMD)..."
|
||||
|
||||
# Resolve absolute Windows paths (NSIS requires absolute paths for DEPLOYDIR and OUTDIR
|
||||
# because it resolves relative paths relative to the .nsi file's directory).
|
||||
if command -v cygpath &> /dev/null; then
|
||||
WIN_DEPLOY_DIR=$(cygpath -w "$(pwd)/${DEPLOY_DIR}")
|
||||
WIN_OUT_DIR=$(cygpath -w "$(pwd)/${BUILD_DIR}")
|
||||
else
|
||||
if command -v realpath &> /dev/null; then
|
||||
WIN_DEPLOY_DIR=$(realpath "${DEPLOY_DIR}")
|
||||
WIN_OUT_DIR=$(realpath "${BUILD_DIR}")
|
||||
else
|
||||
WIN_DEPLOY_DIR="$(pwd)/${DEPLOY_DIR}"
|
||||
WIN_OUT_DIR="$(pwd)/${BUILD_DIR}"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# Determine architecture
|
||||
if [[ "$ENV_TAG" == *64 ]]; then
|
||||
ARCH="x64"
|
||||
else
|
||||
ARCH="x86"
|
||||
fi
|
||||
|
||||
# Run makensis with correct parameters
|
||||
# MSYS2_ARG_CONV_EXCL="/D" prevents MSYS2 from translating "/D..." options as Unix paths
|
||||
MSYS2_ARG_CONV_EXCL="/D" "$MAKENSIS_CMD" \
|
||||
/DDEPLOYDIR="${WIN_DEPLOY_DIR}" \
|
||||
/DOUTDIR="${WIN_OUT_DIR}" \
|
||||
/DVERSION="${VERSION}" \
|
||||
/DARCHITECTURE="${ARCH}" \
|
||||
/DTOOLCHAIN="${ENV_TAG}" \
|
||||
/DREVISION="${REVISION_VAL}" \
|
||||
/DQTVERSION="${QT_VERSION}" \
|
||||
/DEXE_NAME="retroshare-gui.exe" \
|
||||
build_scripts/Windows-msys2/installer/retroshare.nsi
|
||||
|
||||
echo "================================================================================"
|
||||
echo "SUCCESS: Installer package created under: ${BUILD_DIR}/"
|
||||
echo "================================================================================"
|
||||
else
|
||||
echo ""
|
||||
echo ">>> NSIS (makensis) not found. Skipping installer generation."
|
||||
echo " To build the installer, install NSIS:"
|
||||
echo " UCRT64: pacman -S mingw-w64-ucrt-x86_64-nsis"
|
||||
echo " MINGW64: pacman -S mingw-w64-x86_64-nsis"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; Script generated with the Venis Install Wizard & modified by defnax
|
||||
; Script generated with the Venis Install Wizard & modified by defnax
|
||||
; Reworked by Thunder
|
||||
; Adapted to msys2 and 64 bit by anmo
|
||||
|
||||
@ -14,6 +14,9 @@
|
||||
# Optional defines
|
||||
;!define OUTDIR ""
|
||||
;!define INSTALLERADD ""
|
||||
!ifndef EXE_NAME
|
||||
!define EXE_NAME "retroshare-gui.exe"
|
||||
!endif
|
||||
|
||||
# Check needed defines
|
||||
!ifndef DEPLOYDIR
|
||||
@ -42,9 +45,11 @@
|
||||
!define SOURCEDIR "..\..\.."
|
||||
|
||||
# Get version from executable
|
||||
!GetDllVersion "${DEPLOYDIR}\retroshare.exe" VERSION_
|
||||
!ifndef VERSION
|
||||
!GetDllVersion "${DEPLOYDIR}\${EXE_NAME}" VERSION_
|
||||
!define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}
|
||||
;!define REVISION ${VERSION_4}
|
||||
!endif
|
||||
|
||||
# Check version
|
||||
!ifndef REVISION
|
||||
@ -76,7 +81,7 @@ ${!defineifexist} TOR_EXISTS "${DEPLOYDIR}\tor.exe"
|
||||
# Main Install settings
|
||||
Name "${APPNAMEANDVERSION}"
|
||||
InstallDirRegKey HKLM "Software\${APPNAME}" ""
|
||||
OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-Qt-${QTVERSION}-${TOOLCHAIN}-msys2${RSTYPE}${INSTALLERADD}-setup.exe"
|
||||
OutFile "${OUTDIR_}RetroShare-v${VERSION}-${Date}-${REVISION}-Qt-${QTVERSION}-${TOOLCHAIN}-msys2-x86_64${RSTYPE}${INSTALLERADD}-setup.exe"
|
||||
BrandingText "${APPNAMEANDVERSION}"
|
||||
RequestExecutionlevel highest
|
||||
# Use compression
|
||||
@ -107,7 +112,7 @@ Var StyleSheetDir
|
||||
!define MUI_COMPONENTSPAGE_SMALLDESC
|
||||
!define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support"
|
||||
!define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/"
|
||||
!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe"
|
||||
!define MUI_FINISHPAGE_RUN "$INSTDIR\${EXE_NAME}"
|
||||
!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt
|
||||
!define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt
|
||||
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
|
||||
@ -233,7 +238,7 @@ SectionEnd
|
||||
; WriteRegStr HKCR retroshare "" "PQI File"
|
||||
; WriteRegBin HKCR retroshare EditFlags 00000100
|
||||
; WriteRegStr HKCR "retroshare\shell" "" open
|
||||
; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare.exe" "%1"`
|
||||
; WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\${EXE_NAME}" "%1"`
|
||||
;SectionEnd
|
||||
|
||||
# Shortcuts
|
||||
@ -242,24 +247,24 @@ Section $(Section_StartMenu) Section_StartMenu
|
||||
SetOutPath "$INSTDIR"
|
||||
CreateDirectory "$SMPROGRAMS\${APPNAME}"
|
||||
CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
|
||||
CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
|
||||
CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\${EXE_NAME}" "" "$INSTDIR\${EXE_NAME}" 0
|
||||
SectionEnd
|
||||
|
||||
Section $(Section_Desktop) Section_Desktop
|
||||
CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
|
||||
CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\${EXE_NAME}" "" "$INSTDIR\${EXE_NAME}" 0
|
||||
SectionEnd
|
||||
|
||||
Section $(Section_QuickLaunch) Section_QuickLaunch
|
||||
CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
|
||||
CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\${EXE_NAME}" "" "$INSTDIR\${EXE_NAME}" 0
|
||||
SectionEnd
|
||||
SectionGroupEnd
|
||||
|
||||
Section $(Section_AutoStart) Section_AutoStart
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "RetroShare" "$INSTDIR\retroshare.exe -m"
|
||||
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "RetroShare" "$INSTDIR\${EXE_NAME} -m"
|
||||
SectionEnd
|
||||
|
||||
;Section $(Section_AutoStart) Section_AutoStart
|
||||
; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe -m" 0
|
||||
; CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\${EXE_NAME}" "" "$INSTDIR\${EXE_NAME} -m" 0
|
||||
;SectionEnd
|
||||
|
||||
Section -FinishSection
|
||||
@ -268,7 +273,7 @@ Section -FinishSection
|
||||
WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare.exe"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\${EXE_NAME}"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1"
|
||||
@ -289,9 +294,15 @@ SectionEnd
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${Section_StartMenu} $(Section_StartMenu_Desc)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${Section_Desktop} $(Section_Desktop_Desc)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${Section_QuickLaunch} $(Section_QuickLaunch_Desc)
|
||||
!ifdef PLUGIN_EXISTS
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugins} $(Section_Plugins_Desc)
|
||||
!endif
|
||||
!ifdef PLUGIN_FEEDREADER_EXISTS
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugin_FeedReader} $(Section_Plugin_FeedReader_Desc)
|
||||
!endif
|
||||
!ifdef PLUGIN_VOIP_EXISTS
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${Section_Plugin_VOIP} $(Section_Plugin_VOIP_Desc)
|
||||
!endif
|
||||
; !insertmacro MUI_DESCRIPTION_TEXT ${Section_Link} $(Section_Link_Desc)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${Section_AutoStart} $(Section_AutoStart_Desc)
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
|
||||
Loading…
Reference in New Issue
Block a user