[Windows] Let's actually package the available add-ons in the installer

2 files changed, 34 insertions, 0 deletions

diff --git a/project/Win32BuildSetup/genNsisIncludes.bat b/project/Win32BuildSetup/genNsisIncludes.bat
index af5e4cc002..8d06e0b48a 100644
--- a/project/Win32BuildSetup/genNsisIncludes.bat
+++ b/project/Win32BuildSetup/genNsisIncludes.bat
@@ -108,6 +108,38 @@ IF EXIST BUILD_WIN32\addons\screensaver.* (
 )
 
 SET Counter=1
+IF EXIST BUILD_WIN32\addons\imagedecoder.* (
+  ECHO SectionGroup "Image decoder Add-ons" SecImageDecoderAddons >> imagedecoder-addons.nsi
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\imagedecoder.*') DO (
+    FOR /f "delims=<" %%N in ('powershell.exe -noprofile -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecImageDecoderAddons!Counter! >> imagedecoder-addons.nsi
+      ECHO SectionIn 1 2 3 >> imagedecoder-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> imagedecoder-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> imagedecoder-addons.nsi
+      ECHO SectionEnd >> imagedecoder-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
+    )
+  ECHO SectionGroupEnd >> imagedecoder-addons.nsi
+)
+
+SET Counter=1
+IF EXIST BUILD_WIN32\addons\vfs.* (
+  ECHO SectionGroup "VFS Add-ons" SecVFSAddons >> vfs-addons.nsi
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\vfs.*') DO (
+    FOR /f "delims=<" %%N in ('powershell.exe -noprofile -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecVFSAddons!Counter! >> vfs-addons.nsi
+      ECHO SectionIn 1 2 3 >> vfs-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> vfs-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> vfs-addons.nsi
+      ECHO SectionEnd >> vfs-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
+    )
+  ECHO SectionGroupEnd >> vfs-addons.nsi
+)
+
+SET Counter=1
 IF EXIST BUILD_WIN32\addons\visualization.* (
   ECHO SectionGroup "Visualization Add-ons" SecVisualizationAddons >> visualization-addons.nsi
   FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\visualization.*') DO (
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index e33f6cfe5a..b1ef34e419 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -236,9 +236,11 @@ SectionEnd
 !include /nonfatal "audioencoder-addons.nsi"
 !include /nonfatal "audiodsp-addons.nsi"
 !include /nonfatal "game-addons.nsi"
+!include /nonfatal "imagedecoder-addons.nsi"
 !include /nonfatal "inputstream-addons.nsi"
 !include /nonfatal "pvr-addons.nsi"
 !include /nonfatal "screensaver-addons.nsi"
+!include /nonfatal "vfs-addons.nsi"
 !include /nonfatal "visualization-addons.nsi"
 
 ;--------------------------------