mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-04 13:35:13 +02:00
[ticket/12325] Generate the list of the deleted files and folders
https://tracker.phpbb.com/browse/PHPBB3-12325 PHPBB3-12325
This commit is contained in:
parent
324daf72fe
commit
c5f5520013
@ -141,6 +141,7 @@
|
||||
|
||||
<exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} >
|
||||
../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" />
|
||||
<exec dir="build/old_versions" command="LC_ALL=C diff -qr release-${version} release-${newversion} | grep 'Only in release-${version}' > ../new_version/patches/phpBB-${version}_to_${newversion}.deleted" escape="false" />
|
||||
</target>
|
||||
|
||||
<target name="prepare-new-version">
|
||||
|
@ -312,4 +312,38 @@ class build_package
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
function collect_deleted_files($deleted_filename, $package_name)
|
||||
{
|
||||
$result = array();
|
||||
$file_contents = file($deleted_filename);
|
||||
|
||||
foreach ($file_contents as $line)
|
||||
{
|
||||
$line = trim($line);
|
||||
|
||||
if (!$line)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$line = str_replace('Only in ' . $package_name, '', $line);
|
||||
|
||||
if (substr(0, 1, $line) == '/')
|
||||
{
|
||||
$replace = '';
|
||||
}
|
||||
else
|
||||
{
|
||||
$replace = '/';
|
||||
}
|
||||
|
||||
$line = str_replace(': ', $replace, $line);
|
||||
$line = ltrim($line, '/');
|
||||
|
||||
$result[] = $line;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
@ -45,6 +45,10 @@ if (sizeof($package->old_packages))
|
||||
$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch',
|
||||
$_package_name
|
||||
);
|
||||
$diff_file_changes[$_package_name]['deleted'] = $package->collect_deleted_files(
|
||||
$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.deleted',
|
||||
$_package_name
|
||||
);
|
||||
}
|
||||
|
||||
// Now put those files determined within the correct directories
|
||||
@ -292,6 +296,15 @@ $update_info = array(
|
||||
$index_contents .= "\t'binary' => array(),\n";
|
||||
}
|
||||
|
||||
if (sizeof($file_contents['deleted']))
|
||||
{
|
||||
$index_contents .= "\t'deleted' => array(\n\t\t'" . implode("',\n\t\t'", $file_contents['deleted']) . "',\n\t),\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$index_contents .= "\t'deleted' => array(),\n";
|
||||
}
|
||||
|
||||
$index_contents .= ");\n";
|
||||
|
||||
$fp = fopen($dest_filename_dir . '/install/update/index.php', 'wt');
|
||||
|
Loading…
x
Reference in New Issue
Block a user