Merge pull request #9321 from MartijnKaijser/win32_adoonsinstaller

Update win32 installer with inputstream and Peripheral addons

2 files changed, 34 insertions, 17 deletions

diff --git a/project/Win32BuildSetup/genNsisIncludes.bat b/project/Win32BuildSetup/genNsisIncludes.bat
index 5ccaef5c57..037a9fcdbf 100644
--- a/project/Win32BuildSetup/genNsisIncludes.bat
+++ b/project/Win32BuildSetup/genNsisIncludes.bat
@@ -79,30 +79,30 @@ SET Counter=1
 IF EXIST BUILD_WIN32\addons\screensaver.* (
   ECHO SectionGroup "Screensaver Add-ons" SecScreensaverAddons >> screensaver-addons.nsi
   FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\screensaver.*') DO (
-    SET "output=%%P"
-    SET output=!output:screensaver.=!
-    ECHO Section "!output!" SecScreensaverAddons!Counter! >> screensaver-addons.nsi
-    ECHO SectionIn 1 2 3 #section is in installtype Full >> screensaver-addons.nsi
-    ECHO SetOutPath "$INSTDIR\addons\%%P" >> screensaver-addons.nsi
-    ECHO File /r "${app_root}\addons\%%P\*.*" >> screensaver-addons.nsi
-    ECHO SectionEnd >> screensaver-addons.nsi
-    SET /A Counter = !Counter! + 1
+    FOR /f "delims=<" %%N in ('powershell.exe -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecScreensaverAddons!Counter! >> screensaver-addons.nsi
+      ECHO SectionIn 1 2 3 >> screensaver-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> screensaver-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> screensaver-addons.nsi
+      ECHO SectionEnd >> screensaver-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
     )
   ECHO SectionGroupEnd >> screensaver-addons.nsi
 )
 
 SET Counter=1
 IF EXIST BUILD_WIN32\addons\visualization.* (
-  ECHO SectionGroup "Music Visualization Add-ons" SecVisualizationAddons >> visualization-addons.nsi
+  ECHO SectionGroup "Visualization Add-ons" SecVisualizationAddons >> visualization-addons.nsi
   FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\visualization.*') DO (
-    SET "output=%%P"
-    SET output=!output:visualization.=!
-    ECHO Section "!output!" SecVisualizationAddons!Counter! >> visualization-addons.nsi
-    ECHO SectionIn 1 2 3 #section is in installtype Full >> visualization-addons.nsi
-    ECHO SetOutPath "$INSTDIR\addons\%%P" >> visualization-addons.nsi
-    ECHO File /r "${app_root}\addons\%%P\*.*" >> visualization-addons.nsi
-    ECHO SectionEnd >> visualization-addons.nsi
-    SET /A Counter = !Counter! + 1
+    FOR /f "delims=<" %%N in ('powershell.exe -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecVisualizationAddons!Counter! >> visualization-addons.nsi
+      ECHO SectionIn 1 2 3 >> visualization-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> visualization-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> visualization-addons.nsi
+      ECHO SectionEnd >> visualization-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
     )
   ECHO SectionGroupEnd >> visualization-addons.nsi
 )
@@ -123,4 +123,20 @@ IF EXIST BUILD_WIN32\addons\skin.* (
   ECHO SectionGroupEnd >> skin-addons.nsi
 )
 
+SET Counter=1
+IF EXIST BUILD_WIN32\addons\inputstream.* (
+  ECHO SectionGroup "Inputstream Add-ons" SecInputstreamAddons >> inputstream-addons.nsi
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\inputstream.*') DO (
+    FOR /f "delims=<" %%N in ('powershell.exe -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecInputstreamAddons!Counter! >> inputstream-addons.nsi
+      ECHO SectionIn 1 2 >> inputstream-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> inputstream-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> inputstream-addons.nsi
+      ECHO SectionEnd >> inputstream-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
+    )
+  ECHO SectionGroupEnd >> inputstream-addons.nsi
+)
+
 ENDLOCAL
\ No newline at end of file
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index 75ddeba04e..341ad5916e 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -282,6 +282,7 @@ SectionEnd
 !include /nonfatal "audiodecoder-addons.nsi"
 !include /nonfatal "audioencoder-addons.nsi"
 !include /nonfatal "audiodsp-addons.nsi"
+!include /nonfatal "inputstream-addons.nsi"
 !include /nonfatal "pvr-addons.nsi"
 !include /nonfatal "skin-addons.nsi"
 !include /nonfatal "screensaver-addons.nsi"