From 33de245e6493df2047ac2776692a8e228002135c Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 27 Feb 2010 22:08:43 +0000
Subject: [PATCH] Merge r10549 into 3.0.7: After generating all packages go
 through the full installs and make sure the files do not contain any errors
 [Bug #58255]

3.0.7-RC2 contains an image file missing one byte (icon_textbox_search.gif) you can take it from an previous phpBB3 release, it was not changed.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10550 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 build/compare.sh  | 39 +++++++++++++++++++++++++++++++++++++++
 build/package.php |  5 +++++
 2 files changed, 44 insertions(+)
 create mode 100755 build/compare.sh

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..0b56705784 100755
--- a/build/package.php
+++ b/build/package.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";