Skip to content

Commit f0d4a9a

Browse files
dlemstradlemstra
committed
Use a variable for the root directory in the inno installer.
1 parent e45aaf1 commit f0d4a9a

File tree

7 files changed

+67
-66
lines changed

7 files changed

+67
-66
lines changed

‎Installer/Inno/config.isx.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
#define public MagickPackageFullVersionText "@MAGICK_LIB_VERSION_TEXT@@PACKAGE_VERSION_ADDENDUM@"
55
#define public MagickPackageReleaseDate "@PACKAGE_RELEASE_DATE@"
66
#define public QuantumDepth "@QUANTUM_DEPTH@"
7+
#define public RootDirectory "..\..\..\"

‎Installer/Inno/inc/files-base.isx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818

1919
; Executables
2020
#ifdef MagickVersion7
21-
Source: "..\..\Artifacts\bin\magick.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
21+
Source: "{#RootDirectory}Artifacts\bin\magick.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
2222
#ifdef MagickDynamicPackage
23-
Source: "..\..\Artifacts\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
24-
Source: "..\..\Artifacts\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
25-
Source: "..\..\Artifacts\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
26-
Source: "..\..\Artifacts\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
27-
Source: "..\..\Artifacts\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
28-
Source: "..\..\Artifacts\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
29-
Source: "..\..\Artifacts\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
23+
Source: "{#RootDirectory}Artifacts\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
24+
Source: "{#RootDirectory}Artifacts\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
25+
Source: "{#RootDirectory}Artifacts\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
26+
Source: "{#RootDirectory}Artifacts\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
27+
Source: "{#RootDirectory}Artifacts\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
28+
Source: "{#RootDirectory}Artifacts\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
29+
Source: "{#RootDirectory}Artifacts\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
3030
#endif
3131
#else
32-
Source: "..\..\Artifacts\bin\convert.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
33-
Source: "..\..\Artifacts\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
34-
Source: "..\..\Artifacts\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
35-
Source: "..\..\Artifacts\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
36-
Source: "..\..\Artifacts\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
37-
Source: "..\..\Artifacts\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
38-
Source: "..\..\Artifacts\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
39-
Source: "..\..\Artifacts\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
32+
Source: "{#RootDirectory}Artifacts\bin\convert.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
33+
Source: "{#RootDirectory}Artifacts\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
34+
Source: "{#RootDirectory}Artifacts\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
35+
Source: "{#RootDirectory}Artifacts\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
36+
Source: "{#RootDirectory}Artifacts\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
37+
Source: "{#RootDirectory}Artifacts\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
38+
Source: "{#RootDirectory}Artifacts\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
39+
Source: "{#RootDirectory}Artifacts\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
4040
#endif
4141

4242
; Path Tool

‎Installer/Inno/inc/files-configs.isx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
#endif
1818

1919
; Configuration files
20-
Source: "..\..\Artifacts\bin\colors.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
21-
Source: "..\..\Artifacts\bin\configure.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
22-
Source: "..\..\Artifacts\bin\english.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
23-
Source: "..\..\Artifacts\bin\delegates.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
24-
Source: "..\..\Artifacts\bin\locale.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
25-
Source: "..\..\Artifacts\bin\log.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
26-
Source: "..\..\Artifacts\bin\mime.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
27-
Source: "..\..\Artifacts\bin\policy.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
28-
Source: "..\..\Artifacts\bin\sRGB.icc"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
29-
Source: "..\..\Artifacts\bin\thresholds.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
30-
Source: "..\..\Artifacts\bin\type.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
31-
Source: "..\..\Artifacts\bin\type-ghostscript.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
20+
Source: "{#RootDirectory}Artifacts\bin\colors.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
21+
Source: "{#RootDirectory}Artifacts\bin\configure.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
22+
Source: "{#RootDirectory}Artifacts\bin\english.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
23+
Source: "{#RootDirectory}Artifacts\bin\delegates.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
24+
Source: "{#RootDirectory}Artifacts\bin\locale.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
25+
Source: "{#RootDirectory}Artifacts\bin\log.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
26+
Source: "{#RootDirectory}Artifacts\bin\mime.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
27+
Source: "{#RootDirectory}Artifacts\bin\policy.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
28+
Source: "{#RootDirectory}Artifacts\bin\sRGB.icc"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
29+
Source: "{#RootDirectory}Artifacts\bin\thresholds.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
30+
Source: "{#RootDirectory}Artifacts\bin\type.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
31+
Source: "{#RootDirectory}Artifacts\bin\type-ghostscript.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite

‎Installer/Inno/inc/files-development.isx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,33 @@
1717
#endif
1818

1919
; Development libraries
20-
Source: "..\..\Artifacts\lib\CORE_RL_Magick++_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
20+
Source: "{#RootDirectory}Artifacts\lib\CORE_RL_Magick++_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
2121
#ifdef MagickVersion7
22-
Source: "..\..\Artifacts\lib\CORE_RL_MagickCore_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
23-
Source: "..\..\Artifacts\lib\CORE_RL_MagickWand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
22+
Source: "{#RootDirectory}Artifacts\lib\CORE_RL_MagickCore_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
23+
Source: "{#RootDirectory}Artifacts\lib\CORE_RL_MagickWand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
2424
#else
25-
Source: "..\..\Artifacts\lib\CORE_RL_magick_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
26-
Source: "..\..\Artifacts\lib\CORE_RL_wand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
25+
Source: "{#RootDirectory}Artifacts\lib\CORE_RL_magick_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
26+
Source: "{#RootDirectory}Artifacts\lib\CORE_RL_wand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
2727
#endif
2828
; Development headers
2929
#ifdef MagickVersion7
30-
Source: "..\..\ImageMagick\MagickCore\*.h"; DestDir: "{app}\include\MagickCore"; Tasks: install_Devel; Flags: ignoreversion
30+
Source: "{#RootDirectory}ImageMagick\MagickCore\*.h"; DestDir: "{app}\include\MagickCore"; Tasks: install_Devel; Flags: ignoreversion
3131
#else
32-
Source: "..\..\ImageMagick\magick\*.h"; DestDir: "{app}\include\magick"; Tasks: install_Devel; Flags: ignoreversion
32+
Source: "{#RootDirectory}ImageMagick\magick\*.h"; DestDir: "{app}\include\magick"; Tasks: install_Devel; Flags: ignoreversion
3333
#endif
3434
; MagickWand headers
3535
#ifdef MagickVersion7
36-
Source: "..\..\ImageMagick\MagickWand\*.h"; DestDir: "{app}\include\MagickWand"; Tasks: install_Devel; Flags: ignoreversion
36+
Source: "{#RootDirectory}ImageMagick\MagickWand\*.h"; DestDir: "{app}\include\MagickWand"; Tasks: install_Devel; Flags: ignoreversion
3737
#else
38-
Source: "..\..\ImageMagick\wand\*.h"; DestDir: "{app}\include\wand"; Tasks: install_Devel; Flags: ignoreversion
38+
Source: "{#RootDirectory}ImageMagick\wand\*.h"; DestDir: "{app}\include\wand"; Tasks: install_Devel; Flags: ignoreversion
3939
#endif
4040
; Magick++ headers
41-
Source: "..\..\ImageMagick\Magick++\lib\Magick++.h"; DestDir: "{app}\include"; Tasks: install_Devel; Flags: ignoreversion
42-
Source: "..\..\ImageMagick\Magick++\lib\Magick++\*.h"; DestDir: "{app}\include\Magick++"; Tasks: install_Devel; Flags: ignoreversion
41+
Source: "{#RootDirectory}ImageMagick\Magick++\lib\Magick++.h"; DestDir: "{app}\include"; Tasks: install_Devel; Flags: ignoreversion
42+
Source: "{#RootDirectory}ImageMagick\Magick++\lib\Magick++\*.h"; DestDir: "{app}\include\Magick++"; Tasks: install_Devel; Flags: ignoreversion
4343
; Magick++ demos
4444
Source: "Magick++_Demo\*.dsw"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion
4545
Source: "Magick++_Demo\*.dsp"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion
4646
Source: "Magick++_Demo\*.bat"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion
4747
Source: "Magick++_Demo\README.txt"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion
48-
Source: "..\..\ImageMagick\Magick++\demo\*.cpp"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion
49-
Source: "..\..\ImageMagick\Magick++\demo\*.miff"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion
48+
Source: "{#RootDirectory}ImageMagick\Magick++\demo\*.cpp"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion
49+
Source: "{#RootDirectory}ImageMagick\Magick++\demo\*.miff"; DestDir: "{app}\Magick++_Demo"; Tasks: install_Devel; Flags: ignoreversion

‎Installer/Inno/inc/files-dlls.isx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Source: {#MSVCRedist}\{#MagickArchitecture}\Microsoft.VC143.MFC\mfc140u.dll; Des
4545

4646
; DLLs
4747
#ifdef MagickDynamicPackage
48-
Source: "..\..\Artifacts\bin\CORE_RL*.dll"; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
49-
Source: "..\..\Artifacts\bin\IM_MOD_RL*.dll"; DestDir: {#MagickCodersDirectory}; Flags: ignoreversion
50-
Source: "..\..\Artifacts\bin\FILTER_*.dll"; DestDir: {#MagickFiltersDirectory}; Flags: ignoreversion
48+
Source: "{#RootDirectory}Artifacts\bin\CORE_RL*.dll"; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
49+
Source: "{#RootDirectory}Artifacts\bin\IM_MOD_RL*.dll"; DestDir: {#MagickCodersDirectory}; Flags: ignoreversion
50+
Source: "{#RootDirectory}Artifacts\bin\FILTER_*.dll"; DestDir: {#MagickFiltersDirectory}; Flags: ignoreversion
5151
#endif

‎Installer/Inno/inc/files-documentation.isx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
#endif
1818

1919
; Release documentation files
20-
Source: "..\..\ImageMagick\ChangeLog.md"; DestDir: "{app}"; Flags: ignoreversion; DestName: "ChangeLog.md"
21-
Source: "..\..\ImageMagick\LICENSE"; DestDir: "{app}"; Flags: ignoreversion; DestName: "License.txt"
22-
Source: "..\..\Artifacts\NOTICE.txt"; DestDir: "{app}"; Flags: ignoreversion;
20+
Source: "{#RootDirectory}ImageMagick\ChangeLog.md"; DestDir: "{app}"; Flags: ignoreversion; DestName: "ChangeLog.md"
21+
Source: "{#RootDirectory}ImageMagick\LICENSE"; DestDir: "{app}"; Flags: ignoreversion; DestName: "License.txt"
22+
Source: "{#RootDirectory}Artifacts\NOTICE.txt"; DestDir: "{app}"; Flags: ignoreversion;
2323
; Web pages
24-
Source: "..\..\ImageMagick\index.html"; DestDir: "{app}"; Flags: ignoreversion isreadme
25-
Source: "..\..\ImageMagick\images\*.gif"; DestDir: "{app}\images"; Flags: ignoreversion
26-
Source: "..\..\ImageMagick\images\*.ico"; DestDir: "{app}\images"; Flags: ignoreversion
27-
Source: "..\..\ImageMagick\images\*.jpg"; DestDir: "{app}\images"; Flags: ignoreversion
28-
Source: "..\..\ImageMagick\images\*.png"; DestDir: "{app}\images"; Flags: ignoreversion
29-
Source: "..\..\ImageMagick\images\patterns\*.png"; DestDir: "{app}\images\patterns"; Flags: ignoreversion
30-
Source: "..\..\ImageMagick\www\source\*.*"; DestDir: "{app}\www\source"; Flags: ignoreversion
31-
Source: "..\..\ImageMagick\www\assets\*.*"; DestDir: "{app}\www\assets"; Flags: ignoreversion
32-
Source: "..\..\ImageMagick\www\*.ico"; DestDir: "{app}\www"; Flags: ignoreversion
33-
Source: "..\..\ImageMagick\www\*.html"; DestDir: "{app}\www"; Flags: ignoreversion
34-
Source: "..\..\ImageMagick\www\Magick++\*.html"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
35-
Source: "..\..\ImageMagick\www\Magick++\*.jpg"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
36-
Source: "..\..\ImageMagick\www\Magick++\*.png"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
37-
Source: "..\..\ImageMagick\www\Magick++\COPYING"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion; DestName: "Copyright.txt"
38-
Source: "..\..\ImageMagick\www\Magick++\README.txt"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
39-
Source: "..\..\ImageMagick\www\api\*.html"; DestDir: "{app}\www\api"; Flags: ignoreversion
24+
Source: "{#RootDirectory}ImageMagick\index.html"; DestDir: "{app}"; Flags: ignoreversion isreadme
25+
Source: "{#RootDirectory}ImageMagick\images\*.gif"; DestDir: "{app}\images"; Flags: ignoreversion
26+
Source: "{#RootDirectory}ImageMagick\images\*.ico"; DestDir: "{app}\images"; Flags: ignoreversion
27+
Source: "{#RootDirectory}ImageMagick\images\*.jpg"; DestDir: "{app}\images"; Flags: ignoreversion
28+
Source: "{#RootDirectory}ImageMagick\images\*.png"; DestDir: "{app}\images"; Flags: ignoreversion
29+
Source: "{#RootDirectory}ImageMagick\images\patterns\*.png"; DestDir: "{app}\images\patterns"; Flags: ignoreversion
30+
Source: "{#RootDirectory}ImageMagick\www\source\*.*"; DestDir: "{app}\www\source"; Flags: ignoreversion
31+
Source: "{#RootDirectory}ImageMagick\www\assets\*.*"; DestDir: "{app}\www\assets"; Flags: ignoreversion
32+
Source: "{#RootDirectory}ImageMagick\www\*.ico"; DestDir: "{app}\www"; Flags: ignoreversion
33+
Source: "{#RootDirectory}ImageMagick\www\*.html"; DestDir: "{app}\www"; Flags: ignoreversion
34+
Source: "{#RootDirectory}ImageMagick\www\Magick++\*.html"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
35+
Source: "{#RootDirectory}ImageMagick\www\Magick++\*.jpg"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
36+
Source: "{#RootDirectory}ImageMagick\www\Magick++\*.png"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
37+
Source: "{#RootDirectory}ImageMagick\www\Magick++\COPYING"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion; DestName: "Copyright.txt"
38+
Source: "{#RootDirectory}ImageMagick\www\Magick++\README.txt"; DestDir: "{app}\www\Magick++"; Flags: ignoreversion
39+
Source: "{#RootDirectory}ImageMagick\www\api\*.html"; DestDir: "{app}\www\api"; Flags: ignoreversion

‎Installer/Inno/inc/files-perlmagick.isx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#endif
2424

2525
; PerlMagick Perl module
26-
Source: "..\..\ImageMagick\PerlMagick\Image-Magick.ppd"; DestDir: "{app}\PerlMagick"; Tasks: install_PerlMagick; Flags: ignoreversion
27-
Source: "..\..\ImageMagick\PerlMagick\{#MagickArchitecture}\Image-Magick.zip"; DestDir: "{app}\PerlMagick\{#MagickArchitecture}"; Tasks: install_PerlMagick; Flags: ignoreversion
28-
Source: "..\..\ImageMagick\PerlMagick\demo\*"; DestDir: "{app}\PerlMagick\demo"; Tasks: install_PerlMagick; Flags: ignoreversion
26+
Source: "{#RootDirectory}ImageMagick\PerlMagick\Image-Magick.ppd"; DestDir: "{app}\PerlMagick"; Tasks: install_PerlMagick; Flags: ignoreversion
27+
Source: "{#RootDirectory}ImageMagick\PerlMagick\{#MagickArchitecture}\Image-Magick.zip"; DestDir: "{app}\PerlMagick\{#MagickArchitecture}"; Tasks: install_PerlMagick; Flags: ignoreversion
28+
Source: "{#RootDirectory}ImageMagick\PerlMagick\demo\*"; DestDir: "{app}\PerlMagick\demo"; Tasks: install_PerlMagick; Flags: ignoreversion
2929
Source: "PerlMagick-PPM.txt"; DestDir: "{app}\PerlMagick"; DestName: "README.txt"; Tasks: install_PerlMagick; Flags: ignoreversion

0 commit comments

Comments
 (0)