Skip to content

Commit 606d6c5

Browse files
peazippeazip
authored
Merge pull request #159 from suve/external-apps-handling
Move and rename APPLICATION consts
2 parents 8e302ce + 4a12399 commit 606d6c5

File tree

2 files changed

+123
-103
lines changed

2 files changed

+123
-103
lines changed

‎peazip-sources/dev/externalprograms.pas

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
unit externalprograms;
2+
3+
{$MODE OBJFPC}{$H+}
4+
5+
interface
6+
7+
const
8+
APPLICATION_PEA = 'Pea 1.26 (LGPLv3, Giorgio Tani)';
9+
10+
{$IFDEF MSWINDOWS}
11+
EXEEXT = '.exe';
12+
UNRARNAME = 'unrar';
13+
APPLICATION_7Z = '7z 25.01 (LGPL, Igor Pavlov), and Tino Reichardt sfx modules and codecs 24.09-v1.5.7-R1 (LGPL)';
14+
{$IFDEF WIN64}
15+
APPLICATION_ZPAQ = 'PAQ8F/JD/L/O, LPAQ1/5/8, Zpaqfranz 62.5 [Matt Mahoney et al. (GPL), Franco Corbelli (Mit)]';
16+
{$ELSE}
17+
APPLICATION_ZPAQ = 'PAQ8F/JD/L/O, LPAQ1/5/8, Zpaq 7.15 [Matt Mahoney et al. (GPL)]';
18+
{$ENDIF}
19+
APPLICATION_STRIP = 'Strip (GPL, GNU binutils), UPX 3.95 (GPL, Markus F.X.J. Oberhumer, Laszlo Molnar and John F. Reiser)';
20+
APPLICATION_QUAD = 'QUAD 1.12 (LGPL) / BALZ 1.15 (Public Domain), BCM 1.0 (Public Domain) (Ilia Muraviev)';
21+
APPLICATION_UNACE = 'UNACEV2.DLL 2.6.0.0 (royalty-free UNACEV2.DLL license, ACE Compression Software)';
22+
APPLICATION_FREEARC = 'FreeArc 0.67 alpha (GPL, Bulat Ziganshin)';
23+
APPLICATION_UNRAR = 'UNRAR 5.21 (freeware, royalty-free, source available with unrar restriction, Alexander Roshal)';
24+
APPLICATION_BROTLI = 'Brotli 1.1.0 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
25+
APPLICATION_ZSTD = 'Zstd 1.5.7 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
26+
{$ENDIF}
27+
28+
{$IFDEF LINUX}
29+
EXEEXT = '';
30+
UNRARNAME = 'unrar-nonfree';
31+
APPLICATION_7Z = 'Linux 7z 25.01 (LGPL, Igor Pavlov), cielavenir/p7zip 24.09.1 (LGPL, T. Yamada)';
32+
APPLICATION_ZSTD = 'Zstd 1.5.7 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
33+
{$IFDEF CPUAARCH64}
34+
APPLICATION_ZPAQ = '';
35+
APPLICATION_STRIP = 'Strip (GPL, GNU binutils)';
36+
APPLICATION_QUAD = '';
37+
APPLICATION_UNACE = '';
38+
APPLICATION_FREEARC = '';
39+
APPLICATION_UNRAR = '';
40+
APPLICATION_BROTLI = 'Brotli 1.1.0 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
41+
{$ELSE}
42+
APPLICATION_ZPAQ = 'PAQ8F/JD/L/O, LPAQ1/5/8, Zpaqfranz 59.8 [Matt Mahoney et al. (GPL), Franco Corbelli (Mit)]';
43+
APPLICATION_STRIP = 'Strip (GPL, GNU binutils), UPX 3.96 (GPL, Markus F.X.J. Oberhumer, Laszlo Molnar and John F. Reiser)';
44+
APPLICATION_QUAD = 'QUAD 1.12 (LGPL) / BALZ 1.15(Public Domain), BCM 1.0 (Public Domain) (Ilia Muraviev)';
45+
APPLICATION_UNACE = 'UNACE (royalty-free UNACE for Linux license, Marcel Lemke, ACE Compression Software)';
46+
APPLICATION_FREEARC = 'FreeArc 0.60 (GPL, Bulat Ziganshin)';
47+
APPLICATION_UNRAR = 'UNRAR 5.21 beta 2 (freeware, royalty-free, source available with unrar restriction, Alexander Roshal, Petr Cech)';
48+
APPLICATION_BROTLI = 'Brotli 1.0.7 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
49+
{$ENDIF}
50+
{$ENDIF}
51+
52+
{$IFDEF FREEBSD}
53+
EXEEXT = '';
54+
UNRARNAME = '';
55+
APPLICATION_7Z = 'BSD 7z 21.07 (LGPL, Igor Pavlov)';
56+
APPLICATION_ZPAQ = '';
57+
APPLICATION_STRIP = 'Strip (GPL, GNU binutils)';
58+
APPLICATION_QUAD = '';
59+
APPLICATION_UNACE = '';
60+
APPLICATION_FREEARC = '';
61+
APPLICATION_UNRAR = '';
62+
APPLICATION_BROTLI = 'Brotli 1.0.9 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
63+
APPLICATION_ZSTD = 'Zstd 1.4.8 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
64+
{$ENDIF}
65+
66+
{$IFDEF NETBSD}
67+
EXEEXT = '';
68+
UNRARNAME = '';
69+
APPLICATION_7Z = 'BSD 7z 21.07 (LGPL, Igor Pavlov)';
70+
APPLICATION_ZPAQ = '';
71+
APPLICATION_STRIP = 'Strip (GPL, GNU binutils)';
72+
APPLICATION_QUAD = '';
73+
APPLICATION_UNACE = '';
74+
APPLICATION_FREEARC = '';
75+
APPLICATION_UNRAR = '';
76+
APPLICATION_BROTLI = 'Brotli 1.0.9 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
77+
APPLICATION_ZSTD = 'Zstd 1.4.8 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
78+
{$ENDIF}
79+
80+
{$IFDEF OPENBSD}
81+
EXEEXT = '';
82+
UNRARNAME = '';
83+
APPLICATION_7Z = 'BSD 7z 21.07 (LGPL, Igor Pavlov)';
84+
APPLICATION_ZPAQ = '';
85+
APPLICATION_STRIP = 'Strip (GPL, GNU binutils)';
86+
APPLICATION_QUAD = '';
87+
APPLICATION_UNACE = '';
88+
APPLICATION_FREEARC = '';
89+
APPLICATION_UNRAR = '';
90+
APPLICATION_BROTLI = 'Brotli 1.0.9 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
91+
APPLICATION_ZSTD = 'Zstd 1.4.8 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
92+
{$ENDIF}
93+
94+
{$IFDEF DARWIN}
95+
EXEEXT = '';
96+
UNRARNAME = '';
97+
APPLICATION_7Z = 'macOS 7z 25.01 (LGPL, Igor Pavlov), cielavenir/p7zip 24.09.1 (LGPL, T. Yamada)';
98+
APPLICATION_ZPAQ = 'Zpaqfranz 61.2 [Matt Mahoney et al. (GPL), Franco Corbelli (Mit)]]';
99+
APPLICATION_STRIP = 'Strip (GPL, GNU binutils)';
100+
APPLICATION_QUAD = '';
101+
APPLICATION_UNACE = '';
102+
APPLICATION_FREEARC = '';
103+
APPLICATION_UNRAR = '';
104+
APPLICATION_BROTLI = 'Brotli 1.1.0 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
105+
APPLICATION_ZSTD = 'Zstd 1.5.2 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
106+
{$ENDIF}
107+
108+
implementation
109+
110+
end.

‎peazip-sources/dev/peach.pas

Lines changed: 13 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -5805,7 +5805,6 @@ procedure do_extract;
58055805
READE_LIST = '7Z, ACE, ARC/WRC, ARJ, BR, BZ/TBZ, CAB, CHM/CHW/HXS, COMPOUND (MSI, DOC, XLS, PPT), CPIO, GZ/TGZ, ISO, Java (JAR, EAR, WAR), LZH/LHA, Linux (DEB, PET/PUP, RPM, SLP), NSIS, OOo, PAK/PK3/PK4, PAQ/LPAQ/ZPAQ, PEA, QUAD/BALZ/BCM, RAR, TAR, WIM/SWM, XPI, Z/TZ, ZIP, ZST...';
58065806
WRITEE_LIST = '7Z, 7Z-sfx, ARC, ARC-sfx, BR, BZ2, GZ, *PAQ, PEA, QUAD/BALZ/BCM, split, TAR, UPX, WIM, XZ, ZIP, ZST';
58075807
APPMAIN = 'PeaZip';
5808-
APPLICATION1 = 'Pea 1.26 (LGPLv3, Giorgio Tani)';
58095808
STR_7Z = '7Z';
58105809
STR_ARC = 'ARC';
58115810
STR_BROTLI = 'Brotli';
@@ -5836,98 +5835,6 @@ procedure do_extract;
58365835
STR_STOPALL = '.pstopalltmp';
58375836
STR_TMPDROPE = '.pdropetmp';
58385837
STR_TMPERRI = '.perritmp';
5839-
{$IFDEF MSWINDOWS}
5840-
EXEEXT = '.exe';
5841-
UNRARNAME = 'unrar';
5842-
APPLICATION2 = '7z 25.01 (LGPL, Igor Pavlov), and Tino Reichardt sfx modules and codecs 24.09-v1.5.7-R1 (LGPL)';
5843-
{$IFDEF WIN64}
5844-
APPLICATION3 = 'PAQ8F/JD/L/O, LPAQ1/5/8, Zpaqfranz 62.5 [Matt Mahoney et al. (GPL), Franco Corbelli (Mit)]';
5845-
{$ELSE}
5846-
APPLICATION3 = 'PAQ8F/JD/L/O, LPAQ1/5/8, Zpaq 7.15 [Matt Mahoney et al. (GPL)]';
5847-
{$ENDIF}
5848-
APPLICATION4 = 'Strip (GPL, GNU binutils), UPX 3.95 (GPL, Markus F.X.J. Oberhumer, Laszlo Molnar and John F. Reiser)';
5849-
APPLICATION5 = 'QUAD 1.12 (LGPL) / BALZ 1.15 (Public Domain), BCM 1.0 (Public Domain) (Ilia Muraviev)';
5850-
APPLICATION6 = 'UNACEV2.DLL 2.6.0.0 (royalty-free UNACEV2.DLL license, ACE Compression Software)';
5851-
APPLICATION7 = 'FreeArc 0.67 alpha (GPL, Bulat Ziganshin)';
5852-
APPLICATION8 = 'UNRAR 5.21 (freeware, royalty-free, source available with unrar restriction, Alexander Roshal)';
5853-
APPLICATION9 = 'Brotli 1.1.0 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
5854-
APPLICATION10 = 'Zstd 1.5.7 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
5855-
{$ENDIF}
5856-
{$IFDEF LINUX}
5857-
EXEEXT = '';
5858-
UNRARNAME = 'unrar-nonfree';
5859-
APPLICATION2 = 'Linux 7z 25.01 (LGPL, Igor Pavlov), cielavenir/p7zip 24.09.1 (LGPL, T. Yamada)';
5860-
APPLICATION10 = 'Zstd 1.5.7 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
5861-
{$IFDEF CPUAARCH64}
5862-
APPLICATION3 = '';
5863-
APPLICATION4 = 'Strip (GPL, GNU binutils)';
5864-
APPLICATION5 = '';
5865-
APPLICATION6 = '';
5866-
APPLICATION7 = '';
5867-
APPLICATION8 = '';
5868-
APPLICATION9 = 'Brotli 1.1.0 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
5869-
{$ELSE}
5870-
APPLICATION3 = 'PAQ8F/JD/L/O, LPAQ1/5/8, Zpaqfranz 59.8 [Matt Mahoney et al. (GPL), Franco Corbelli (Mit)]';
5871-
APPLICATION4 = 'Strip (GPL, GNU binutils), UPX 3.96 (GPL, Markus F.X.J. Oberhumer, Laszlo Molnar and John F. Reiser)';
5872-
APPLICATION5 = 'QUAD 1.12 (LGPL) / BALZ 1.15(Public Domain), BCM 1.0 (Public Domain) (Ilia Muraviev)';
5873-
APPLICATION6 = 'UNACE (royalty-free UNACE for Linux license, Marcel Lemke, ACE Compression Software)';
5874-
APPLICATION7 = 'FreeArc 0.60 (GPL, Bulat Ziganshin)';
5875-
APPLICATION8 = 'UNRAR 5.21 beta 2 (freeware, royalty-free, source available with unrar restriction, Alexander Roshal, Petr Cech)';
5876-
APPLICATION9 = 'Brotli 1.0.7 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
5877-
{$ENDIF}
5878-
{$ENDIF}
5879-
{$IFDEF FREEBSD}
5880-
EXEEXT = '';
5881-
UNRARNAME = '';
5882-
APPLICATION2 = 'BSD 7z 21.07 (LGPL, Igor Pavlov)';
5883-
APPLICATION3 = '';
5884-
APPLICATION4 = 'Strip (GPL, GNU binutils)';
5885-
APPLICATION5 = '';
5886-
APPLICATION6 = '';
5887-
APPLICATION7 = '';
5888-
APPLICATION8 = '';
5889-
APPLICATION9 = 'Brotli 1.0.9 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
5890-
APPLICATION10 = 'Zstd 1.4.8 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
5891-
{$ENDIF}
5892-
{$IFDEF NETBSD}
5893-
EXEEXT = '';
5894-
UNRARNAME = '';
5895-
APPLICATION2 = 'BSD 7z 21.07 (LGPL, Igor Pavlov)';
5896-
APPLICATION3 = '';
5897-
APPLICATION4 = 'Strip (GPL, GNU binutils)';
5898-
APPLICATION5 = '';
5899-
APPLICATION6 = '';
5900-
APPLICATION7 = '';
5901-
APPLICATION8 = '';
5902-
APPLICATION9 = 'Brotli 1.0.9 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
5903-
APPLICATION10 = 'Zstd 1.4.8 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
5904-
{$ENDIF}
5905-
{$IFDEF OPENBSD}
5906-
EXEEXT = '';
5907-
UNRARNAME = '';
5908-
APPLICATION2 = 'BSD 7z 21.07 (LGPL, Igor Pavlov)';
5909-
APPLICATION3 = '';
5910-
APPLICATION4 = 'Strip (GPL, GNU binutils)';
5911-
APPLICATION5 = '';
5912-
APPLICATION6 = '';
5913-
APPLICATION7 = '';
5914-
APPLICATION8 = '';
5915-
APPLICATION9 = 'Brotli 1.0.9 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
5916-
APPLICATION10 = 'Zstd 1.4.8 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
5917-
{$ENDIF}
5918-
{$IFDEF DARWIN}
5919-
EXEEXT = '';
5920-
UNRARNAME = '';
5921-
APPLICATION2 = 'macOS 7z 25.01 (LGPL, Igor Pavlov), cielavenir/p7zip 24.09.1 (LGPL, T. Yamada)';
5922-
APPLICATION3 = 'Zpaqfranz 61.2 [Matt Mahoney et al. (GPL), Franco Corbelli (Mit)]]';
5923-
APPLICATION4 = 'Strip (GPL, GNU binutils)';
5924-
APPLICATION5 = '';
5925-
APPLICATION6 = '';
5926-
APPLICATION7 = '';
5927-
APPLICATION8 = '';
5928-
APPLICATION9 = 'Brotli 1.1.0 (MIT License, Jyrki Alakuijala, Eugene Kliuchnikov, Robert Obryk, Zoltán Szabadka, Lode Vandevenne)';
5929-
APPLICATION10 = 'Zstd 1.5.2 (Dual license BSD / GPLv2, Yann Collet, Przemysław Skibiński)';
5930-
{$ENDIF}
59315838

59325839
var
59335840
Form_peach: TForm_peach;
@@ -6362,6 +6269,9 @@ procedure do_extract;
63626269

63636270
implementation
63646271

6272+
uses
6273+
externalprograms;
6274+
63656275
{ TForm_peach }
63666276

63676277
function CloneMenuItem(Src: TMenuItem): TMenuItem;//generic cloning method modified for PeaZip's main menu as source
@@ -6700,19 +6610,19 @@ procedure updatepluginstatus;
67006610
+langstrhint+char($0d)+char($0a)
67016611
+char($0d)+char($0a)
67026612
+txt_using+char($0d)+char($0a)
6703-
+APPLICATION1+char($0d)+char($0a)
6704-
+APPLICATION2+char($0d)+char($0a)
6705-
+APPLICATION3+char($0d)+char($0a)
6706-
+APPLICATION4+char($0d)+char($0a)
6707-
+APPLICATION5+char($0d)+char($0a)
6708-
+APPLICATION7+char($0d)+char($0a)
6709-
+APPLICATION9+char($0d)+char($0a)
6710-
+APPLICATION10+char($0d)+char($0a)
6613+
+APPLICATION_PEA+char($0d)+char($0a)
6614+
+APPLICATION_7Z+char($0d)+char($0a)
6615+
+APPLICATION_ZPAQ+char($0d)+char($0a)
6616+
+APPLICATION_STRIP+char($0d)+char($0a)
6617+
+APPLICATION_QUAD+char($0d)+char($0a)
6618+
+APPLICATION_FREEARC+char($0d)+char($0a)
6619+
+APPLICATION_BROTLI+char($0d)+char($0a)
6620+
+APPLICATION_ZSTD+char($0d)+char($0a)
67116621
+char($0d)+char($0a)
67126622
+'Plugin:'+char($0d)+char($0a)
67136623
+'PeaZip Additional Formats Plugin (LGPLv3) - '+addformatspluginstatus+char($0d)+char($0a)
6714-
+APPLICATION6+' - '+unacepluginstatus+char($0d)+char($0a)
6715-
+APPLICATION8+' - '+unrar5pluginstatus+char($0d)+char($0a);
6624+
+APPLICATION_UNACE+' - '+unacepluginstatus+char($0d)+char($0a)
6625+
+APPLICATION_UNRAR+' - '+unrar5pluginstatus+char($0d)+char($0a);
67166626
end;
67176627

67186628
procedure setlabelpanel_options(var a: Tlabel);

0 commit comments

Comments
 (0)