diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-10 22:22:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-10 22:22:52 +0200 |
| commit | 0d349a82ca646cc2eebbfaf9a573ab1c8e32b6f6 (patch) | |
| tree | bc26f19366f621f1195da02b60e30faf697f4a73 | |
| parent | 88d16b47a408640a4e46096b3633ca05a791a8af (diff) | |
| parent | cdf580ee376c2b1b75a102e326c9d41a679d2e89 (diff) | |
| download | forums-0d349a82ca646cc2eebbfaf9a573ab1c8e32b6f6.tar forums-0d349a82ca646cc2eebbfaf9a573ab1c8e32b6f6.tar.gz forums-0d349a82ca646cc2eebbfaf9a573ab1c8e32b6f6.tar.bz2 forums-0d349a82ca646cc2eebbfaf9a573ab1c8e32b6f6.tar.xz forums-0d349a82ca646cc2eebbfaf9a573ab1c8e32b6f6.zip | |
Merge pull request #3700 from Nicofuma/ticket/13823
[ticket/13823] Change diff options while packaging to not ignore all whitespaces
| -rw-r--r-- | build/build.xml | 8 | ||||
| -rw-r--r-- | build/build_helper.php | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build/build.xml b/build/build.xml index 71fdecad49..94aa1bf699 100644 --- a/build/build.xml +++ b/build/build.xml @@ -105,7 +105,7 @@ <property name="dir" value="build/old_versions/release-${version}" /> </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" /> </target> @@ -132,13 +132,13 @@ <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" 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" /> <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" /> <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" /> <exec dir="build" escape="false" diff --git a/build/build_helper.php b/build/build_helper.php index d6169b913b..c8b9ea2bca 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -18,11 +18,11 @@ class build_package // -r - compare recursive // -N - Treat missing files as empty // -E - Ignore tab expansions - // not used: -b - Ignore space changes. - // -w - Ignore all whitespace + // -Z - Ignore white space at line end. + // -b - Ignore changes in the amount of white space. // -B - Ignore blank lines // -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 $verbose = false; |