[OMPT-svn-commit] OpenMPT r21017 - in trunk/OpenMPT: build common installer

[<sv...@op...>]

Author: manx
Date: Tue Jun 11 16:11:22 2024
New Revision: 21017
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21017

Log:
[Var] InnoSetup: Update to 6.3.1. Fixes <https://bugs.openmpt.org/view.php?id=1788>.
[Fix] build/download_externals: Use InnoSetup portable mode to extract the files instead of relying on innounp. This is supported since InnoSetup 6.0.1.
[Ref] installer: Rename x64 to x64os due to InnoSetup changing things.
[Reg] installer: Remove ia64 installer option. This is unsupported by InnoSetup now.
[Mod] OpenMPT: Version is now 1.32.00.18

Modified:
   trunk/OpenMPT/build/download_externals.cmd
   trunk/OpenMPT/build/download_externals.txt
   trunk/OpenMPT/common/versionNumber.h
   trunk/OpenMPT/installer/install-multi-arch.iss

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Tue Jun 11 08:29:13 2024	(r21016)
+++ trunk/OpenMPT/build/download_externals.cmd	Tue Jun 11 16:11:22 2024	(r21017)
@@ -49,11 +49,14 @@
 
 call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.4-embed-amd64.zip" "." || goto error
 
-call :killdir "build\tools\innounp"   || goto error
+
 call :killdir "build\tools\innosetup" || goto error
+mkdir "build\tools\innosetup" || goto error
+"build\externals\innosetup-6.3.1.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error
+
+call :killdir "build\tools\innounp"   || goto error
 call :killdir "build\tools\innosetup5" || goto error
 call build\scriptlib\unpack.cmd "build\tools\innounp" "build\externals\innounp050.rar" "." || goto error
-build\tools\innounp\innounp.exe -x -dbuild\tools\innosetup "build\externals\innosetup-6.2.2.exe" || goto error
 build\tools\innounp\innounp.exe -x -dbuild\tools\innosetup5 "build\externals\isetup-5.5.8-unicode.exe" || goto error
 
 call build\scriptlib\unpack.cmd "packageTemplate\ExampleSongs" "build\externals\example_songs_ompt_1_30.7z" "." || goto error

Modified: trunk/OpenMPT/build/download_externals.txt
==============================================================================
--- trunk/OpenMPT/build/download_externals.txt	Tue Jun 11 08:29:13 2024	(r21016)
+++ trunk/OpenMPT/build/download_externals.txt	Tue Jun 11 16:11:22 2024	(r21017)
@@ -6,7 +6,7 @@
 "build/externals/htmlhelp.exe"                   3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe"
 "build/externals/python-3.12.4-embed-amd64.zip" 11065736 f07be8d84645f2411d061262b378d783498f23a961a9eb3dc3cf5c785af75de551cd4f413c385f47219601d2b09fa6ae88242226b1e31cf009929d3ff5d6673e "https://www.python.org/ftp/python/3.12.4/python-3.12.4-embed-amd64.zip"
 "build/externals/innounp050.rar"                  141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar"
-"build/externals/innosetup-6.2.2.exe"            4722512 496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe"
+"build/externals/innosetup-6.3.1.exe"            5251664 65d8b14febd0f8003c89c468966912f8fd799e48986fee8bd5f0549936f6cb9cd5ff11c5429e0b2587215140e595fcacbc129b6f81cccc09ca518758da4d86bc "https://files.jrsoftware.org/is/6/innosetup-6.3.1.exe"
 "build/externals/isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe"
 "build/externals/example_songs_ompt_1_30.7z"     4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z"
 "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip"

Modified: trunk/OpenMPT/common/versionNumber.h
==============================================================================
--- trunk/OpenMPT/common/versionNumber.h	Tue Jun 11 08:29:13 2024	(r21016)
+++ trunk/OpenMPT/common/versionNumber.h	Tue Jun 11 16:11:22 2024	(r21017)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      32
 #define VER_MINOR      00
-#define VER_MINORMINOR 17
+#define VER_MINORMINOR 18
 
 OPENMPT_NAMESPACE_END

Modified: trunk/OpenMPT/installer/install-multi-arch.iss
==============================================================================
--- trunk/OpenMPT/installer/install-multi-arch.iss	Tue Jun 11 08:29:13 2024	(r21016)
+++ trunk/OpenMPT/installer/install-multi-arch.iss	Tue Jun 11 16:11:22 2024	(r21017)
@@ -26,7 +26,7 @@
 AppPublisherURL=https://openmpt.org/
 AppSupportURL=https://forum.openmpt.org/
 AppUpdatesURL=https://openmpt.org/
-ArchitecturesInstallIn64BitMode=x64 arm64 ia64
+ArchitecturesInstallIn64BitMode=x64os arm64
 ChangesAssociations=yes
 Compression=lzma2/ultra64
 ;DefaultDirName={autopf}\OpenMPT
@@ -244,10 +244,6 @@
 			begin
 				WizardSelectComponents('archx86,archamd64,!archarm,!archarm64');
 			end;
-		paIA64:
-			begin
-				WizardSelectComponents('archx86,!archamd64,!archarm,!archarm64');
-			end;
 		paARM64:
 			begin
 				WizardSelectComponents('archx86,archamd64,archarm,archarm64');
@@ -271,10 +267,6 @@
 			begin
 				Result := 'amd64';
 			end;
-		paIA64:
-			begin
-				Result := 'x86';
-			end;
 		paARM64:
 			begin
 				Result := 'arm64';