diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-30 23:35:06 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-30 23:35:06 +0200 |
| commit | af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0 (patch) | |
| tree | e02dfd4f2316f26058759ed55e4c12ba0cd590a7 | |
| parent | 94fccd8a5ed11b69e1c849d0a27c9501af861bf7 (diff) | |
| parent | 0cf9d657b7c56e602248d5998a49b7d392b16d39 (diff) | |
| download | forums-af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0.tar forums-af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0.tar.gz forums-af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0.tar.bz2 forums-af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0.tar.xz forums-af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11876] Replace MD5 with SHA256.
[ticket/11876] Move checksum generation from build PHP files to phing build.xml
| -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 f9c4f9c517..31782e6821 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="sha256sum ${filename} > ${filename}.sha256" /> </target> <target name="changelog" depends="prepare"> diff --git a/build/build_diff.php b/build/build_diff.php index 74630232b3..68bac65a66 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 eef6765af6..d05448dfb4 100755 --- a/build/package.php +++ b/build/package.php @@ -287,9 +287,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 @@ -321,8 +318,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'); @@ -365,9 +360,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('..'); } @@ -390,9 +382,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 @@ -400,7 +389,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']); |