Skip to content

[5.3] Fix build.php to create zstd packages on macOS #45535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 2 commits into from
May 29, 2025
Merged

[5.3] Fix build.php to create zstd packages on macOS #45535

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07ddfc5
Fix build.php to create zstd packages on macOS
muhme May 28, 2025
37327e3
php-cs-fixer
muhme May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 57 additions & 37 deletions build/build.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,39 @@ function clean_composer(string $dir)
chdir($cwd);
}

/**
* Executes a system command to build a package file.
* Shows a start and a finish message and terminates if an error occurs.
* Captures all outputs (stdout+stderr) and only displays them if an error has occurred.
*
* @param string $packageName Name of the package file to be created.
* @param string $command The full system command to execute.
*
* @return void
*/
function build_and_check(string $packageName, string $command): void
{
echo "Building {$packageName} ... ";

// Redirect stderr to stdout
$fullCommand = $command . ' 2>&1';
$output = [];
$exitCode = 0;

exec($fullCommand, $output, $exitCode);

if ($exitCode !== 0) {
echo "failed.\n";
fwrite(STDERR, "ERROR: Command failed ($exitCode): $command\n");
if (!empty($output)) {
fwrite(STDERR, "Output:\n" . implode("\n", $output) . "\n");
}
exit($exitCode);
}

echo "done.\n";
}

$time = time();

// Set path to git binary (e.g., /usr/local/git/bin/git or /usr/bin/git)
Expand Down Expand Up @@ -563,34 +596,29 @@ function clean_composer(string $dir)
if (!$excludeZip) {
$packageName = 'Joomla_' . $version . '.' . $fromName . '_to_' . $fullVersion . '-' . $packageStability . '-Patch_Package.zip';
echo "Building " . $packageName . "... ";
chdir($time);
system('zip ../packages/' . $packageName . ' -@ < ../diffconvert/' . $version . '.' . $num . '> /dev/null');
chdir('..');
echo "done.\n";
$command = "cd {$time} && zip ../packages/{$packageName} -@ < ../diffconvert/{$version}.{$num}";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeGzip) {
$packageName = 'Joomla_' . $version . '.' . $fromName . '_to_' . $fullVersion . '-' . $packageStability . '-Patch_Package.tar.gz';
echo "Building " . $packageName . "... ";
system('tar --create --gzip --no-recursion --directory ' . $time . ' --file packages/' . $packageName . ' --files-from diffconvert/' . $version . '.' . $num . '> /dev/null');
echo "done.\n";
$command = "tar --create --gzip --no-recursion --directory {$time} --file packages/{$packageName} --files-from diffconvert/{$version}.{$num}";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeBzip2) {
$packageName = 'Joomla_' . $version . '.' . $fromName . '_to_' . $fullVersion . '-' . $packageStability . '-Patch_Package.tar.bz2';
echo "Building " . $packageName . "... ";
system('tar --create --bzip2 --no-recursion --directory ' . $time . ' --file packages/' . $packageName . ' --files-from diffconvert/' . $version . '.' . $num . '> /dev/null');
echo "done.\n";
$command = "tar --create --bzip2 --no-recursion --directory {$time} --file packages/{$packageName} --files-from diffconvert/{$version}.{$num}";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeZstd) {
$packageName = 'Joomla_' . $version . '.' . $fromName . '_to_' . $fullVersion . '-' . $packageStability . '-Patch_Package.tar.zst';
echo "Building " . $packageName . "... ";
system('tar "-I zstd --ultra -22" --create --no-recursion --directory ' . $time . ' --file packages/' . $packageName . ' --files-from diffconvert/' . $version . '.' . $num . '> /dev/null');
echo "done.\n";
$command = "tar --create --no-recursion --directory {$time} --files-from diffconvert/{$version}.{$num} | zstd --ultra -22 -o packages/{$packageName}";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}
}
Expand All @@ -601,33 +629,29 @@ function clean_composer(string $dir)
// Create full archive packages.
if (!$excludeZip) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Full_Package.zip';
echo "Building " . $packageName . "... ";
system('zip -r ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "zip -r ../packages/{$packageName} *";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeGzip) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Full_Package.tar.gz';
echo "Building " . $packageName . "... ";
system('tar --create --gzip --file ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "tar --create --gzip --file ../packages/{$packageName} *";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeBzip2) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Full_Package.tar.bz2';
echo "Building " . $packageName . "... ";
system('tar --create --bzip2 --file ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "tar --create --bzip2 --file ../packages/{$packageName} *";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeZstd) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Full_Package.tar.zst';
echo "Building " . $packageName . "... ";
system('tar "-I zstd --ultra -22" --create --file ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "tar --create * | zstd --ultra -22 -o ../packages/{$packageName}";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

Expand All @@ -644,33 +668,29 @@ function clean_composer(string $dir)

if (!$excludeZip) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Update_Package.zip';
echo "Building " . $packageName . "... ";
system('zip -r ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "zip -r ../packages/{$packageName} *";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeGzip) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Update_Package.tar.gz';
echo "Building " . $packageName . "... ";
system('tar --create --gzip --file ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "tar --create --gzip --file ../packages/{$packageName} *";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeBzip2) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Update_Package.tar.bz2';
echo "Building " . $packageName . "... ";
system('tar --create --bzip2 --file ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "tar --create --bzip2 --file ../packages/{$packageName} *";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}

if (!$excludeZstd) {
$packageName = 'Joomla_' . $fullVersion . '-' . $packageStability . '-Update_Package.tar.zst';
echo "Building " . $packageName . "... ";
system('tar "-I zstd --ultra -22" --create --file ../packages/' . $packageName . ' * > /dev/null');
echo "done.\n";
$command = "tar --create * | zstd --ultra -22 -o ../packages/{$packageName}";
build_and_check($packageName, $command);
$checksums[$packageName] = [];
}
}
Expand Down