diff options
Diffstat (limited to 'build')
-rwxr-xr-x | build/build_diff.php | 4 | ||||
-rwxr-xr-x | build/compare.sh | 39 | ||||
-rwxr-xr-x | build/package.php | 7 |
3 files changed, 47 insertions, 3 deletions
diff --git a/build/build_diff.php b/build/build_diff.php index 9cd99bdb72..c8a40f4f5e 100755 --- a/build/build_diff.php +++ b/build/build_diff.php @@ -11,9 +11,9 @@ // CONFIG - Begin $substitute_old = '3.0.6'; -$substitute_new = '3.0.7-RC2'; +$substitute_new = '3.0.7'; $simple_name_old = 'phpbb306'; -$simple_name_new = 'phpbb307-RC2'; +$simple_name_new = 'phpbb307'; $echo_changes = false; // Set this to true to just compress the changes and do not build them again // This should be used for building custom modified txt file. ;) diff --git a/build/compare.sh b/build/compare.sh new file mode 100755 index 0000000000..df442fd4c7 --- /dev/null +++ b/build/compare.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +orig_dir="../../phpBB" + + +rm -rf test_release_files +mkdir test_release_files +cd test_release_files + +for ext in "tar.bz2" "zip" +do + cp "../new_version/release_files/$1.$ext" ./ + + if [ "$ext" = "tar.bz2" ] + then + command="tar -xjf" + else + command="unzip -q" + fi + + $command "$1.$ext" + + for file in `find phpBB3 -name '.svn' -prune -o -type f -print` + do + orig_file="${file/#phpBB3/$orig_dir}" + diff_result=`diff $orig_file $file` + + if [ -n "$diff_result" ] + then + echo "Difference in package $1.$ext" + echo $diff_result + fi + done + + rm -rf phpBB3 +done + +cd .. +rm -rf test_release_files + diff --git a/build/package.php b/build/package.php index 68bdfb5a13..e04750d4be 100755 --- a/build/package.php +++ b/build/package.php @@ -15,7 +15,7 @@ // If RC8 drops remove the install/data directory //$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3'); //$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7'); -$versions = array('3.0.2', '3.0.3-RC1', '3.0.3', '3.0.4-RC1', '3.0.4', '3.0.5-RC1', '3.0.5', '3.0.6-RC1', '3.0.6-RC2', '3.0.6-RC3', '3.0.6-RC4', '3.0.6', '3.0.7-RC1', '3.0.7-RC2'); +$versions = array('3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6', '3.0.7-RC1', '3.0.7-RC2', '3.0.7'); $verbose = false; require('build_helper.php'); @@ -518,4 +518,9 @@ foreach ($compress_programs as $extension => $compress_command) $package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5'); } +// verify results +chdir($package->locations['root']); +$package->begin_status('********** Verifying packages **********'); +$package->run_command('./compare.sh ' . $package->package_infos['release_filename']); + echo "Done.\n"; |