diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 20:57:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 20:57:00 +0200 |
| commit | 69eb563e1821d8c27f5beae2adc0abeed61ffec2 (patch) | |
| tree | f32f1a43bbc3c60b36c9cc94b71f6d29a12a7b75 /build | |
| parent | 832c9f64e04ad22dce1d51e72f3c65df4894c0eb (diff) | |
| parent | 2c65b9b133ffc3ee958ce9d5a579f7d58741292d (diff) | |
| download | forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.gz forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.bz2 forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.xz forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.zip | |
Merge branch 'prep-release-3.1.5' into 3.1.x
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 10 | ||||
| -rw-r--r-- | build/build_helper.php | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/build/build.xml b/build/build.xml index 59170ab75f..c3f23b4386 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.1.5-dev" /> + <property name="newversion" value="3.1.5-RC1" /> <property name="prevversion" value="3.1.4" /> <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3" /> <!-- no configuration should be needed beyond this point --> @@ -149,7 +149,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" /> <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> @@ -177,13 +177,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 35e8cd744b..3ff1b89eab 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -22,11 +22,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; |