procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 09:53:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Issue #5146: Change Installer ProductInfo in revisions

Browse source 
This allows better versioning control by ITs.
This commit is contained in:
Bruno 2024-06-05 16:15:09 -03:00
parent fb5474ae4d
commit a8b9bedf3c
No known key found for this signature in database
2 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/windows/gitlab-ci/4_dist-gimp-inno.ps1
View file

@ -2,6 +2,7 @@
# Parameters # Parameters
param ($GIMP_VERSION, param ($GIMP_VERSION,
$REVISION,
$GIMP_APP_VERSION, $GIMP_APP_VERSION,
$GIMP_API_VERSION, $GIMP_API_VERSION,
$GIMP_BASE = '..\..\..\', $GIMP_BASE = '..\..\..\',
@ -20,6 +21,11 @@ if (-Not $GIMP_VERSION)
Foreach-Object {$_ -replace '#define GIMP_VERSION "',''} | Foreach-Object {$_ -replace '"',''} Foreach-Object {$_ -replace '#define GIMP_VERSION "',''} | Foreach-Object {$_ -replace '"',''}
} }
if (-Not $REVISION)
{
$REVISION = "0"
}
if (-Not $GIMP_APP_VERSION) if (-Not $GIMP_APP_VERSION)
{ {
$GIMP_APP_VERSION = Get-Content -Path "$CONFIG_PATH" | Select-String 'GIMP_APP_VERSION "' | $GIMP_APP_VERSION = Get-Content -Path "$CONFIG_PATH" | Select-String 'GIMP_APP_VERSION "' |
@ -114,7 +120,7 @@ if (Test-Path -Path $gen_path)
# Construct now the installer # Construct now the installer
Set-Location build/windows/installer Set-Location build/windows/installer
Set-Alias -Name 'iscc' -Value "${INNOPATH}\iscc.exe" Set-Alias -Name 'iscc' -Value "${INNOPATH}\iscc.exe"
iscc -DGIMP_VERSION="$GIMP_VERSION" -DGIMP_APP_VERSION="$GIMP_APP_VERSION" -DGIMP_API_VERSION="$GIMP_API_VERSION" -DGIMP_DIR="$GIMP_BASE" -DDIR32="$GIMP32" -DDIR64="$GIMP64" -DDIRA64="$GIMPA64" -DDEPS_DIR="$GIMP_BASE" -DDDIR32="$GIMP32" -DDDIR64="$GIMP64" -DDDIRA64="$GIMPA64" -DDEBUG_SYMBOLS -DLUA -DPYTHON base_gimp3264.iss iscc -DGIMP_VERSION="$GIMP_VERSION" -DREVISION="$REVISION" -DGIMP_APP_VERSION="$GIMP_APP_VERSION" -DGIMP_API_VERSION="$GIMP_API_VERSION" -DGIMP_DIR="$GIMP_BASE" -DDIR32="$GIMP32" -DDIR64="$GIMP64" -DDIRA64="$GIMPA64" -DDEPS_DIR="$GIMP_BASE" -DDDIR32="$GIMP32" -DDDIR64="$GIMP64" -DDDIRA64="$GIMPA64" -DDEBUG_SYMBOLS -DLUA -DPYTHON base_gimp3264.iss
# Test if the installer was created and return success/failure. # Test if the installer was created and return success/failure.
if (Test-Path -Path "_Output/gimp-${GIMP_VERSION}-setup.exe" -PathType Leaf) if (Test-Path -Path "_Output/gimp-${GIMP_VERSION}-setup.exe" -PathType Leaf)

46
build/windows/installer/base_gimp3264.iss
View file

@ -113,31 +113,38 @@ NotRecognizedMessagesWarning=no
;INSTALLER AND APP INFO ;INSTALLER AND APP INFO
AppName=GIMP AppName=GIMP
#if Defined(GIMP_UNSTABLE) && GIMP_UNSTABLE != "" #if Defined(GIMP_UNSTABLE) && GIMP_UNSTABLE != ""
DefaultDirName={autopf}\GIMP {#GIMP_APP_VERSION} ;Inno installer identifier: https://github.com/jrsoftware/issrc/pull/461
SetupMutex=GIMP-{#GIMP_APP_VERSION}
;Inno installer (default) install location
DefaultDirName={autopf}\GIMP {#GIMP_APP_VERSION}
;Inno uninstaller identifier
AppID=GIMP-{#GIMP_APP_VERSION}
#else #else
DefaultDirName={autopf}\GIMP {#MAJOR} SetupMutex=GIMP-{#MAJOR}
#endif DefaultDirName={autopf}\GIMP {#MAJOR}
#if !defined(REVISION) AppID=GIMP-{#MAJOR}
AppVerName=GIMP {#GIMP_VERSION}
#else
AppVerName=GIMP {#GIMP_VERSION}-{#REVISION}
#endif #endif
VersionInfoVersion={#GIMP_VERSION} #if !defined(REVISION) || REVISION == "0"
AppVersion={#GIMP_VERSION} ;Inno installer file version
#if Defined(GIMP_UNSTABLE) && GIMP_UNSTABLE != "" VersionInfoVersion={#GIMP_VERSION}
;SetupMutex avoids two installers running at the same time but the ;Inno installer product version and ImmersiveControlPanel 'DisplayVersion'
;UX is ultra clunky: https://github.com/jrsoftware/issrc/pull/461 AppVersion={#GIMP_VERSION}.0
SetupMutex=GIMP-{#GIMP_APP_VERSION} ;ImmersiveControlPanel 'DisplayName'
AppID=GIMP-{#GIMP_APP_VERSION} AppVerName=GIMP {#GIMP_VERSION}
#else #else
SetupMutex=GIMP-{#MAJOR} VersionInfoVersion={#GIMP_VERSION}.{#REVISION}
AppID=GIMP-{#MAJOR} AppVersion={#GIMP_VERSION}.{#REVISION}
AppVerName=GIMP {#GIMP_VERSION}.{#REVISION}
#endif #endif
;ImmersiveControlPanel 'Publisher'
AppPublisher=The GIMP Team AppPublisher=The GIMP Team
;ControlPanel 'URLInfoAbout'
AppPublisherURL=https://www.gimp.org/ AppPublisherURL=https://www.gimp.org/
;ControlPanel 'HelpLink'
AppSupportURL=https://www.gimp.org/docs/ AppSupportURL=https://www.gimp.org/docs/
;ControlPanel 'URLUpdateInfo'
AppUpdatesURL=https://www.gimp.org/ AppUpdatesURL=https://www.gimp.org/
@ -193,16 +200,17 @@ LZMANumFastBytes=273
;SignedUninstallerDir=_Uninst ;SignedUninstallerDir=_Uninst
#endif //NOCOMPRESSION #endif //NOCOMPRESSION
#if !defined(REVISION) #if !defined(REVISION) || REVISION == "0"
OutputBaseFileName=gimp-{#GIMP_VERSION}-setup OutputBaseFileName=gimp-{#GIMP_VERSION}-setup
OutputManifestFile=gimp-{#GIMP_VERSION}-setup.txt OutputManifestFile=gimp-{#GIMP_VERSION}-setup.txt
#else #else
OutputBaseFileName=gimp-{#GIMP_VERSION}-{#REVISION}-setup OutputBaseFileName=gimp-{#GIMP_VERSION}.{#REVISION}-setup
OutputManifestFile=gimp-{#GIMP_VERSION}-{#REVISION}-setup.txt OutputManifestFile=gimp-{#GIMP_VERSION}.{#REVISION}-setup.txt
#endif #endif
;UNINSTALLER ;UNINSTALLER
;ImmersiveControlPanel 'DisplayIcon'
UninstallDisplayIcon={app}\bin\gimp-{#GIMP_APP_VERSION}.exe UninstallDisplayIcon={app}\bin\gimp-{#GIMP_APP_VERSION}.exe
UninstallFilesDir={app}\uninst UninstallFilesDir={app}\uninst