makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3700 from Nicofuma/ticket/13823

Browse source 
[ticket/13823] Change diff options while packaging to not ignore all whitespaces
This commit is contained in:
Joas Schilling 2015-06-10 22:22:52 +02:00
commit 0d349a82ca
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/build.xml
View file

@ -105,7 +105,7 @@
<property name="dir" value="build/old_versions/release-${version}" /> <property name="dir" value="build/old_versions/release-${version}" />
</phingcall> </phingcall>
<exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} > <exec dir="build/old_versions" command="LC_ALL=C diff -crNEBZbd release-${version} release-${newversion} >
../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" /> ../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" />
</target> </target>
@ -132,13 +132,13 @@
<target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs"> <target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs">
<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" /> <exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
<exec dir="build" escape="false" <exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language > command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB3/language >
save/phpbb-${prevversion}_to_${newversion}_language.patch" /> save/phpbb-${prevversion}_to_${newversion}_language.patch" />
<exec dir="build" escape="false" <exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver > command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" /> save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
<exec dir="build" escape="false" <exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 > command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
save/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" /> save/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
<exec dir="build" escape="false" <exec dir="build" escape="false"

6
build/build_helper.php
View file

@ -18,11 +18,11 @@ class build_package
// -r - compare recursive // -r - compare recursive
// -N - Treat missing files as empty // -N - Treat missing files as empty
// -E - Ignore tab expansions // -E - Ignore tab expansions
// not used: -b - Ignore space changes. // -Z - Ignore white space at line end.
// -w - Ignore all whitespace // -b - Ignore changes in the amount of white space.
// -B - Ignore blank lines // -B - Ignore blank lines
// -d - Try to find smaller set of changes // -d - Try to find smaller set of changes
var $diff_options = '-crNEBwd'; var $diff_options = '-crNEBZbd';
var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;) var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;)
var $verbose = false; var $verbose = false;