Skip to content

Commit 59a00fc

Browse files
committed
Remove bit suffix renaming
WebKit for Windows has dropped x86 support so stop renaming.
1 parent 9255a78 commit 59a00fc

3 files changed

+24
-90
lines changed

Package-Requirements.ps1

-39
This file was deleted.

Release-Requirements.ps1

+24-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
11
<#
22
.Synopsis
3-
Creates a WebKitRequirements release.
4-
.Details
5-
Calls the individual scripts for preparing a release.
3+
Packages the requirements into a zip file for release.
64
.Parameter Triplet
75
The vcpkg triplet to use.
6+
.Parameter Output
7+
The filename to output to. Defaults to the form
8+
`WebKitRequirements${Platform}.zip`.
89
#>
910

1011
param(
1112
[Parameter(Mandatory)]
12-
[string]$triplet
13+
[string]$triplet,
14+
[Parameter()]
15+
[string]$output
1316
)
1417

1518
$ErrorActionPreference = 'Stop';
1619

17-
$tripletSplit = $triplet -split '-',3;
18-
$platform = $tripletSplit[1];
20+
if (!$ouput) {
21+
$tripletSplit = $triplet -split '-',3;
22+
$arch = $tripletSplit[0];
23+
$platform = $tripletSplit[1];
1924

20-
if ($platform -eq 'windows') {
21-
$command = ('Rename-WithBitSuffix.ps1 -triplet {0}' -f $triplet);
22-
Write-Host $command;
23-
Invoke-Expression -Command ('{0}/{1}' -f $PSScriptRoot,$command);
24-
} else {
25-
Write-Error ('Unknown triplet {0}' -f $triplet);
26-
return;
25+
if ($platform -eq 'windows') {
26+
if ($arch -eq 'x64') {
27+
$suffix = 'Win64';
28+
} else {
29+
$suffix = 'Win32';
30+
}
31+
} else {
32+
Write-Error ('Unknown triplet {0}' -f $libraries);
33+
}
34+
35+
$output = ('WebKitRequirements{0}.zip' -f $suffix);
2736
}
2837

29-
$command = ('Package-Requirements.ps1 -triplet {0}' -f $triplet);
30-
Write-Host $command;
31-
Invoke-Expression -Command ('{0}/{1}' -f $PSScriptRoot,$command);
38+
Write-Host ('Creating archive {0}' -f $output)
39+
Compress-7Zip -ArchiveFileName $output -Path ('{0}/installed/{1}' -f $PSScriptRoot,$triplet)

Rename-WithBitSuffix.ps1

-35
This file was deleted.

0 commit comments

Comments
 (0)