Windows GUI: Fix installer out path after assets

By normalizing order of lines
MediaArea · Nov 30, 2024 · 8c3d749 · 8c3d749
1 parent a1eea67
commit 8c3d749
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/Source/Install/MediaInfo_GUI_Windows.nsi b/Source/Install/MediaInfo_GUI_Windows.nsi
@@ -136,6 +136,9 @@ Section "SectionPrincipale" SEC01
   SetOutPath "$SMPROGRAMS"
   CreateShortCut "$SMPROGRAMS\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "Convenient unified display of the most relevant technical and tag data for video and audio files"
   SetOutPath "$INSTDIR"
+  File "/oname=History.txt" "..\..\History_GUI.txt"
+  File "..\..\License.html"
+  File "/oname=ReadMe.txt" "..\..\Release\ReadMe_GUI_Windows.txt"
   ${If} ${RunningX64}
     File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe"
     File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll"
@@ -157,9 +160,6 @@ Section "SectionPrincipale" SEC01
     File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll"
     File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL"
   ${EndIf}
-  File "/oname=History.txt" "..\..\History_GUI.txt"
-  File "..\..\License.html"
-  File "/oname=ReadMe.txt" "..\..\Release\ReadMe_GUI_Windows.txt"
   SetOverwrite try
   SetOutPath "$INSTDIR\Plugin\Custom"
   File "..\Resource\Plugin\Custom\*.csv"

diff --git a/Source/Install/MediaInfo_GUI_Windows_i386.nsi b/Source/Install/MediaInfo_GUI_Windows_i386.nsi
@@ -130,14 +130,17 @@ Section "SectionPrincipale" SEC01
   SetOutPath "$SMPROGRAMS"
   CreateShortCut "$SMPROGRAMS\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "Convenient unified display of the most relevant technical and tag data for video and audio files"
   SetOutPath "$INSTDIR"
-  File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe"
-  File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo_InfoTip.dll"
-  File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo.dll"
-  File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll"
-  File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL"
   File "/oname=History.txt" "..\..\History_GUI.txt"
   File "..\..\License.html"
   File "/oname=ReadMe.txt" "..\..\Release\ReadMe_GUI_Windows.txt"
+  ; ${If} ${RunningX64}
+  ; ${Else}
+    File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe"
+    File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo_InfoTip.dll"
+    File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo.dll"
+    File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll"
+    File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL"
+  ; ${EndIf}
   SetOverwrite try
   SetOutPath "$INSTDIR\Plugin\Custom"
   File "..\Resource\Plugin\Custom\*.csv"

diff --git a/Source/Install/MediaInfo_GUI_Windows_x64.nsi b/Source/Install/MediaInfo_GUI_Windows_x64.nsi
@@ -139,22 +139,24 @@ Section "SectionPrincipale" SEC01
   SetOutPath "$SMPROGRAMS"
   CreateShortCut "$SMPROGRAMS\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "Convenient unified display of the most relevant technical and tag data for video and audio files"
   SetOutPath "$INSTDIR"
-  File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe"
-  File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll"
-  File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo.dll"
-  File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll"
-  File "$%BPATH%\Windows\libcurl\x64\Release\LIBCURL.DLL"
   File "/oname=History.txt" "..\..\History_GUI.txt"
   File "..\..\License.html"
   File "/oname=ReadMe.txt" "..\..\Release\ReadMe_GUI_Windows.txt"
-  ${If} ${AtLeastWin11}
-    File "..\..\Project\MSVC2022\x64\Release\MediaInfo_SparsePackage.msix"
-    File "..\..\Project\MSVC2022\x64\Release\MediaInfo_WindowsShellExtension.dll"
-    File "..\..\Project\MSVC2022\win32\Release\MediaInfo_PackageHelper.dll"
-    File "..\WindowsSparsePackage\Resources\resources.pri"
-    SetOutPath "$INSTDIR\Assets"
-    File "..\WindowsSparsePackage\Resources\Assets\*.png"
-  ${EndIf}
+  ; ${If} ${RunningX64}
+    File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe"
+    File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll"
+    File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo.dll"
+    File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll"
+    File "$%BPATH%\Windows\libcurl\x64\Release\LIBCURL.DLL"
+    ${If} ${AtLeastWin11}
+      File "..\..\Project\MSVC2022\x64\Release\MediaInfo_SparsePackage.msix"
+      File "..\..\Project\MSVC2022\x64\Release\MediaInfo_WindowsShellExtension.dll"
+      File "..\..\Project\MSVC2022\win32\Release\MediaInfo_PackageHelper.dll"
+      File "..\WindowsSparsePackage\Resources\resources.pri"
+      SetOutPath "$INSTDIR\Assets"
+      File "..\WindowsSparsePackage\Resources\Assets\*.png"
+    ${EndIf}
+  ; ${EndIf}
   SetOverwrite try
   SetOutPath "$INSTDIR\Plugin\Custom"
   File "..\Resource\Plugin\Custom\*.csv"