FGFS-4.1/fgmeta
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Windows Installer - changing web version to xz compression

Browse Source
This commit is contained in:
Slawek Mikula
2021-04-15 12:15:51 +01:00
committed by Automatic Release Builder
parent 30718abd99
commit 7439f0c79f
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlightGear-files.iss
+3 -6
View File
@@ -36,16 +36,13 @@ Source: "{#FgHarnessPath}\fgdata\*.*"; DestDir: "{app}\data"; Excludes: "{#FGDat
; Web installer for the base package ; Web installer for the base package
#if IncludeWeb == "TRUE" #if IncludeWeb == "TRUE"
; bzip2 ; txz
Source: "{#DecompressDir}\\bunzip2.exe"; Flags: dontcopy Source: "{#DecompressDir}\\xz.exe"; Flags: dontcopy
Source: "{#DecompressDir}\\bzip2.dll"; Flags: dontcopy Source: "{#DecompressDir}\\liblzma.dll"; Flags: dontcopy
; tar ; tar
Source: "{#DecompressDir}\\tar.exe"; Flags: dontcopy Source: "{#DecompressDir}\\tar.exe"; Flags: dontcopy
Source: "{#DecompressDir}\\libiconv-2.dll"; Flags: dontcopy Source: "{#DecompressDir}\\libiconv-2.dll"; Flags: dontcopy
Source: "{#DecompressDir}\\libintl-2.dll"; Flags: dontcopy Source: "{#DecompressDir}\\libintl-2.dll"; Flags: dontcopy
; txz
Source: "{#DecompressDir}\\xzdec.exe"; Flags: dontcopy
Source: "{#DecompressDir}\\liblzma.dll"; Flags: dontcopy
; full code ; full code
Source: "{tmp}\\fgdata-extracted\\fgdata\\*.*"; DestDir: "{app}\data"; Flags: external recursesubdirs Source: "{tmp}\\fgdata-extracted\\fgdata\\*.*"; DestDir: "{app}\data"; Flags: external recursesubdirs
#endif #endif
FlightGear.iss
+9 -9
View File
@@ -119,7 +119,7 @@ Name: "{%USERPROFILE}\FlightGear\Custom Scenery"; Permissions: creatorowner-modi
Name: "{userdesktop}\FlightGear {#FGVersionGroup}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin"; Tasks: desktopicon; Name: "{userdesktop}\FlightGear {#FGVersionGroup}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin"; Tasks: desktopicon;
Name: "{group}\FlightGear {#FGVersionGroup}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin"; Name: "{group}\FlightGear {#FGVersionGroup}"; Filename: "{app}\bin\fgfs.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
Name: "{group}\FlightGear {#FGVersionGroup} - Compositor"; Filename: "{app}\bin\fgfs-compositor.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin"; Name: "{group}\FlightGear {#FGVersionGroup} - Compositor"; Filename: "{app}\bin\fgfs-compositor.exe"; Parameters: "--launcher"; WorkingDir: "{app}\bin";
Name: "{group}\FlightGear Manual"; Filename: "http://flightgear.sourceforge.net/manual/2020.3/" Name: "{group}\FlightGear Manual"; Filename: "http://flightgear.sourceforge.net/manual/{#FGVersionGroup}/"
Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org" Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}" Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}"
Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin" Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin"
@@ -341,11 +341,11 @@ begin
// selecting fgdata installation packages // selecting fgdata installation packages
if (fgDataInstalled = 1) then if (fgDataInstalled = 1) then
begin begin
DownloadPage.Add('https://sourceforge.net/projects/flightgear/files/release-{#FGVersionGroup}/FlightGear-{#FGVersion}-data-delta.tar.bz2/download', 'fgdata-downloaded.tar.bz2', ''); DownloadPage.Add('http://download.flightgear.org/builds/{#FGVersionGroup}/FlightGear-{#FGVersion}-update-data.txz', 'fgdata-downloaded.txz', '');
end end
else else
begin begin
DownloadPage.Add('https://sourceforge.net/projects/flightgear/files/release-{#FGVersionGroup}/FlightGear-{#FGVersion}-data.tar.bz2/download', 'fgdata-downloaded.tar.bz2', ''); DownloadPage.Add('http://download.flightgear.org/builds/{#FGVersionGroup}/FlightGear-{#FGVersion}-data.txz', 'fgdata-downloaded.txz', '');
end; end;
DownloadPage.Show; DownloadPage.Show;
@@ -355,12 +355,12 @@ begin
// show extract progress page // show extract progress page
try try
ExtractDownload.Show; ExtractDownload.Show;
ExtractDownload.SetText(ExpandConstant('{cm:ExtractingDownloadedFile}'), 'fgdata-downloaded.tar.bz2'); ExtractDownload.SetText(ExpandConstant('{cm:ExtractingDownloadedFile}'), 'fgdata-downloaded.txz');
ExtractTemporaryFile('bunzip2.exe'); ExtractTemporaryFile('xz.exe');
ExtractTemporaryFile('bzip2.dll'); ExtractTemporaryFile('liblzma.dll');
if Exec(ExpandConstant('{tmp}\bunzip2.exe'), ExpandConstant('{tmp}\fgdata-downloaded.tar.bz2'), ExpandConstant('{tmp}'), SW_HIDE, ewWaitUntilTerminated, ResultCode) then if Exec(ExpandConstant('{tmp}\xz.exe'), ExpandConstant('-d "{tmp}\fgdata-downloaded.txz"'), ExpandConstant('{tmp}'), SW_HIDE, ewWaitUntilTerminated, ResultCode) then
begin begin
Log(Format('Successfully bunzipped file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.tar.bz2')])); Log(Format('Successfully expanded file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.txz')]));
ExtractDownload.SetText(ExpandConstant('{cm:UntarringDownloadedFile}'), ExpandConstant('fgdata-downloaded.tar')); ExtractDownload.SetText(ExpandConstant('{cm:UntarringDownloadedFile}'), ExpandConstant('fgdata-downloaded.tar'));
ExtractTemporaryFile('tar.exe'); ExtractTemporaryFile('tar.exe');
ExtractTemporaryFile('libiconv-2.dll'); ExtractTemporaryFile('libiconv-2.dll');
@@ -375,7 +375,7 @@ begin
end; end;
end end
else begin else begin
Log(Format('ERROR bunzipping file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.tar.bz2')])); Log(Format('ERROR expanding file: %s', [ExpandConstant('{tmp}\fgdata-downloaded.txz')]));
end; end;
finally finally
ExtractDownload.Hide; ExtractDownload.Hide;