GraphicsMagick: Tidy new-lines

changeset e5baf158c822 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=e5baf158c822
summary: Tidy new-lines

diffstat:

 VisualMagick/installer/gm-win32-Q16-dll.iss |   5 ++-
 VisualMagick/installer/gm-win32-Q8-dll.iss  |   5 ++-
 VisualMagick/installer/gm-win64-Q16-dll.iss |   4 +-
 VisualMagick/installer/gm-win64-Q8-dll.iss  |   2 +-
 VisualMagick/installer/inc/body.isx         |  12 +++---
 VisualMagick/installer/inc/files-dlls.isx   |  50 ++++++++++++++--------------
 6 files changed, 43 insertions(+), 35 deletions(-)

diffs (191 lines):

diff -r 9382cb6db1be -r e5baf158c822 VisualMagick/installer/gm-win32-Q16-dll.iss
--- a/VisualMagick/installer/gm-win32-Q16-dll.iss	Sat Sep 23 00:06:45 2023 +0200
+++ b/VisualMagick/installer/gm-win32-Q16-dll.iss	Fri Sep 22 17:14:13 2023 -0500
@@ -1,5 +1,5 @@
 ;
-; Copyright (C) 2003-2017 GraphicsMagick Group
+; Copyright (C) 2003-2023 GraphicsMagick Group
 ;
 ; This program is covered by multiple licenses, which are described in
 ; Copyright.txt. You should have received a copy of Copyright.txt with this
@@ -13,6 +13,9 @@
 #define  public MagickDynamicPackage 1
 #define  public QuantumDepth "16"
 #define  public InstallPerlMagick 0
+;#define  public VC_2010
+;#define  public VC_2013
+
 #include "inc\body.isx"
 
 #ifdef Debug
diff -r 9382cb6db1be -r e5baf158c822 VisualMagick/installer/gm-win32-Q8-dll.iss
--- a/VisualMagick/installer/gm-win32-Q8-dll.iss	Sat Sep 23 00:06:45 2023 +0200
+++ b/VisualMagick/installer/gm-win32-Q8-dll.iss	Fri Sep 22 17:14:13 2023 -0500
@@ -1,5 +1,5 @@
 ;
-; Copyright (C) 2003-2017 GraphicsMagick Group
+; Copyright (C) 2003-2023 GraphicsMagick Group
 ;
 ; This program is covered by multiple licenses, which are described in
 ; Copyright.txt. You should have received a copy of Copyright.txt with this
@@ -13,6 +13,9 @@
 #define  public MagickDynamicPackage 1
 #define  public QuantumDepth "8"
 #define  public InstallPerlMagick 0
+;#define  public VC_2010
+;#define  public VC_2013
+
 #include "inc\body.isx"
 
 #ifdef Debug
diff -r 9382cb6db1be -r e5baf158c822 VisualMagick/installer/gm-win64-Q16-dll.iss
--- a/VisualMagick/installer/gm-win64-Q16-dll.iss	Sat Sep 23 00:06:45 2023 +0200
+++ b/VisualMagick/installer/gm-win64-Q16-dll.iss	Fri Sep 22 17:14:13 2023 -0500
@@ -1,5 +1,5 @@
 ;
-; Copyright (C) 2003-2017 GraphicsMagick Group
+; Copyright (C) 2003-2023 GraphicsMagick Group
 ;
 ; This program is covered by multiple licenses, which are described in
 ; Copyright.txt. You should have received a copy of Copyright.txt with this
@@ -14,6 +14,8 @@
 #define  public QuantumDepth "16"
 #define  public WIN64 1
 #define  public InstallPerlMagick 0
+;#define  public VC_2010
+;#define  public VC_2013
 
 #include "inc\body.isx"
 
diff -r 9382cb6db1be -r e5baf158c822 VisualMagick/installer/gm-win64-Q8-dll.iss
--- a/VisualMagick/installer/gm-win64-Q8-dll.iss	Sat Sep 23 00:06:45 2023 +0200
+++ b/VisualMagick/installer/gm-win64-Q8-dll.iss	Fri Sep 22 17:14:13 2023 -0500
@@ -14,7 +14,7 @@
 #define  public QuantumDepth "8"
 #define  public WIN64 1
 #define  public InstallPerlMagick 0
-;#define  public VC_2010
+;#define  public VC_2010
 ;#define  public VC_2013
 
 #include "inc\body.isx"
diff -r 9382cb6db1be -r e5baf158c822 VisualMagick/installer/inc/body.isx
--- a/VisualMagick/installer/inc/body.isx	Sat Sep 23 00:06:45 2023 +0200
+++ b/VisualMagick/installer/inc/body.isx	Fri Sep 22 17:14:13 2023 -0500
@@ -92,9 +92,9 @@
 
 #include "run-pathtool.isx"
 
-#ifdef MagickDynamicPackage
+#ifdef MagickDynamicPackage
   #if InstallPerlMagick
-    #include "run-ppm.isx"
+    #include "run-ppm.isx"
   #endif
 #endif
 #ifdef MSVCProprietary
@@ -103,9 +103,9 @@
 
 [UninstallRun]
 #include "uninstallrun-pathtool.isx"
-#ifdef MagickDynamicPackage
+#ifdef MagickDynamicPackage
   #if InstallPerlMagick
-    #include "uninstallrun-ppm.isx"
+    #include "uninstallrun-ppm.isx"
   #endif
 #endif
 #ifdef MSVCProprietary
@@ -169,7 +169,7 @@
   VC_2013_REDIST_X64_                 = '{A749D8E6-B613-3BE3-8F5F-045C84EBA29B}';
 
 
-function MsiQueryProductState(szProduct: string): INSTALLSTATE; 
+function MsiQueryProductState(szProduct: string): INSTALLSTATE;
   external 'MsiQueryProductState{#AW}@msi.dll stdcall';
 
 function VCVersionInstalled(const ProductID: string): Boolean;
@@ -228,7 +228,7 @@
  if not IsWin64() then begin
    MsgBox('Windows 64 bit distribution should not be installed on WIN 32 system', mbError, MB_OK);
    Result := false;
-   end 
+   end
  else begin
    Result := true;
  end;
diff -r 9382cb6db1be -r e5baf158c822 VisualMagick/installer/inc/files-dlls.isx
--- a/VisualMagick/installer/inc/files-dlls.isx	Sat Sep 23 00:06:45 2023 +0200
+++ b/VisualMagick/installer/inc/files-dlls.isx	Fri Sep 22 17:14:13 2023 -0500
@@ -7,32 +7,32 @@
 ; package; otherwise see http://www.graphicsmagick.org/www/Copyright.html.
 ;
 #endif
-
-;#define  public MSVCRedist "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist"
-
-#ifdef WIN64
- #define  public CPUARCH "amd64"
- #ifdef VC_2010
-  Source: "redist\VC2010SP1\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
- #else
-  #ifdef VC_2013
-   Source: "redist\VC2013\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
-  #else
-   Source: "redist\VC2008SP1\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
-  #endif
- #endif
-#else
-  #define  public CPUARCH "x86"
-  Source: "redist\VC2008SP1\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
-#endif
-
-;
-; MSVC Runtime DLLs and manifests
+
+;#define  public MSVCRedist "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\redist"
+
+#ifdef WIN64
+ #define  public CPUARCH "amd64"
+ #ifdef VC_2010
+  Source: "redist\VC2010SP1\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
+ #else
+  #ifdef VC_2013
+   Source: "redist\VC2013\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
+  #else
+   Source: "redist\VC2008SP1\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
+  #endif
+ #endif
+#else
+  #define  public CPUARCH "x86"
+  Source: "redist\VC2008SP1\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeedsInstall
+#endif
+
 ;
-; C runtime
+; MSVC Runtime DLLs and manifests
+;
+; C runtime
 ;Source: {#MSVCRedist}\{#CPUARCH}\Microsoft.VC90.CRT\msvcr90.dll; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
 
-; C++ standard runtime
+; C++ standard runtime
 ; Source: {#MSVCRedist}\{#CPUARCH}\Microsoft.VC90.CRT\msvcp90.dll; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
 ;Source: {#MSVCRedist}\{#CPUARCH}\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
 
@@ -40,7 +40,7 @@
 ;Source: {#MSVCRedist}\{#CPUARCH}\Microsoft.VC90.OPENMP\vcomp90.dll; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
 ;Source: {#MSVCRedist}\{#CPUARCH}\Microsoft.VC90.OPENMP\Microsoft.VC90.OpenMP.manifest; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
 
-; MFC C++ runtime
+; MFC C++ runtime
 ; Source: {#MSVCRedist}\{#CPUARCH}\Microsoft.VC90.MFC\mfc90.dll;   DestDir: {#MagickLibDirectory}; Flags: ignoreversion
 ; Source: {#MSVCRedist}\{#CPUARCH}\Microsoft.VC90.MFC\Microsoft.VC90.MFC.manifest; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
 
@@ -50,4 +50,4 @@
 Source: "..\bin\analyze.dll"; DestDir: {#MagickFiltersDirectory}; Flags: ignoreversion
 ; X11 is no longer included in the Windows installer from the GraphicsMagick Group.
 ;; Source: "..\bin\X11.dll"; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
-;; Source: "..\bin\Xext.dll"; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
\ No newline at end of file
+;; Source: "..\bin\Xext.dll"; DestDir: {#MagickLibDirectory}; Flags: ignoreversion