diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-30 18:04:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-30 18:08:42 +0200 |
| commit | da9756ba2553abdcc87130ec892e589ded1c1256 (patch) | |
| tree | ad9004035e415b2cb41b1cef4fb357fc97865e74 | |
| parent | ac4736db0887e986a322f7f92429430333525a24 (diff) | |
| download | forums-da9756ba2553abdcc87130ec892e589ded1c1256.tar forums-da9756ba2553abdcc87130ec892e589ded1c1256.tar.gz forums-da9756ba2553abdcc87130ec892e589ded1c1256.tar.bz2 forums-da9756ba2553abdcc87130ec892e589ded1c1256.tar.xz forums-da9756ba2553abdcc87130ec892e589ded1c1256.zip | |
[ticket/11876] Move checksum generation from build PHP files to phing build.xml
This also removes paths from the checksum files.
PHPBB3-11876
| -rw-r--r-- | build/build.xml | 18 | ||||
| -rwxr-xr-x | build/build_diff.php | 3 | ||||
| -rwxr-xr-x | build/package.php | 12 |
3 files changed, 18 insertions, 15 deletions
diff --git a/build/build.xml b/build/build.xml index 40d875cb95..a861ebc205 100644 --- a/build/build.xml +++ b/build/build.xml @@ -149,6 +149,24 @@ <exec dir="build" escape="false" command="git diff --stat release-${prevversion}...HEAD > save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" /> + + <phingcall target="checksum-dir"> + <property name="dir" value="build/new_version/release_files" /> + </phingcall> + </target> + + <target name="checksum-dir"> + <foreach param="filename" absparam="absfilename" target="checksum-file"> + <fileset dir="${dir}"> + <type type="file" /> + </fileset> + </foreach> + </target> + + <target name="checksum-file"> + <echo msg="Creating checksum file for ${absfilename}" /> + <php function="dirname" returnProperty="dir"><param value="${absfilename}"/></php> + <exec dir="${dir}" command="md5sum ${filename} > ${filename}.md5" /> </target> <target name="changelog" depends="prepare"> diff --git a/build/build_diff.php b/build/build_diff.php index 0824b53caa..d264ecf493 100755 --- a/build/build_diff.php +++ b/build/build_diff.php @@ -83,9 +83,6 @@ if (!$echo_changes) // Build Package run_command("$compress_command ./../../new_version/release_files/{$code_changes_filename}.{$extension} *"); - - // Build MD5 Sum - run_command("md5sum ./../../new_version/release_files/{$code_changes_filename}.{$extension} > ./../../new_version/release_files/{$code_changes_filename}.{$extension}.md5"); flush(); } } diff --git a/build/package.php b/build/package.php index 48f42b3572..22ea4e52af 100755 --- a/build/package.php +++ b/build/package.php @@ -285,9 +285,6 @@ if (sizeof($package->old_packages)) // Build Package $package->run_command($compress_command . ' ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' *'); - - // Build MD5 Sum - $package->run_command('md5sum ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' > ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . '.md5'); } // Build Files Package @@ -319,8 +316,6 @@ if (sizeof($package->old_packages)) chdir('./release'); $package->run_command("$compress_command ../../release_files/" . $package->get('release_filename') . '-files.' . $extension . ' *'); - // Build MD5 Sum - $package->run_command('md5sum ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . ' > ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . '.md5'); chdir('..'); $package->run_command('rm -Rv ' . $package->get('files_directory') . '/release'); @@ -363,9 +358,6 @@ if (sizeof($package->old_packages)) // Copy last package over... $package->run_command('rm -v ../release_files/phpBB-' . $last_version . ".$extension"); $package->run_command("$compress_command ../../release_files/phpBB-$last_version.$extension *"); - - // Build MD5 Sum - $package->run_command("md5sum ../../release_files/phpBB-$last_version.$extension > ../../release_files/phpBB-$last_version.$extension.md5"); chdir('..'); } @@ -388,9 +380,6 @@ foreach ($compress_programs as $extension => $compress_command) // Build Package $package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name')); - - // Build MD5 Sum - $package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5'); } // Microsoft Web PI packaging @@ -398,7 +387,6 @@ $package->begin_status('Packaging phpBB for Microsoft WebPI'); $file = './release_files/' . $package->get('release_filename') . '.webpi.zip'; $package->run_command('cp -p ./release_files/' . $package->get('release_filename') . ".zip $file"); $package->run_command('cd ./../webpi && ' . $compress_programs['zip'] . " ./../new_version/$file *"); -$package->run_command("md5sum $file > $file.md5"); // verify results chdir($package->locations['root']); |