diff options
| -rw-r--r-- | build/build.xml | 9 | ||||
| -rwxr-xr-x | build/build_diff.php | 31 |
2 files changed, 26 insertions, 14 deletions
diff --git a/build/build.xml b/build/build.xml index 9517c33a8e..04dca6cafa 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,9 +3,11 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> <property name="newversion" value="3.0.8" /> - <property name="oldversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7-PL1" /> + <property name="prevversion" value="3.0.7-PL1" /> + <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6" /> <!-- no configuration should be needed beyond this point --> + <property name="oldversions" value="${olderversions}, ${prevversion}" /> <property name="versions" value="${oldversions}, ${newversion}" /> <!-- These are the main targets which you will probably want to use --> @@ -25,6 +27,7 @@ <mkdir dir="build/new_version/release_files" /> <mkdir dir="build/new_version/update" /> <mkdir dir="build/old_versions" /> + <mkdir dir="build/save" /> </target> <target name="clean"> @@ -36,6 +39,7 @@ <delete dir="build/dependencies" /> <delete dir="build/new_version" /> <delete dir="build/old_versions" /> + <delete dir="build/save" /> </target> <target name="test"> @@ -104,7 +108,8 @@ </target> <target name="create-package" depends="prepare-new-version,old-version-diffs"> - <exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false"/> + <exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" /> + <exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" /> </target> <!-- diff --git a/build/build_diff.php b/build/build_diff.php index ef815bc0c3..6a6070228f 100755 --- a/build/build_diff.php +++ b/build/build_diff.php @@ -9,16 +9,26 @@ * */ -// CONFIG - Begin -$substitute_old = '3.0.6'; -$substitute_new = '3.0.7-PL1'; -$simple_name_old = 'phpbb306'; -$simple_name_new = 'phpbb307-PL1'; +if ($_SERVER['argc'] != 3) +{ + die("Please specify the previous and current version as arguments (e.g. build_diff.php '1.0.2' '1.0.3')."); +} + +$old_version = trim($_SERVER['argv'][1]); +$new_version = trim($_SERVER['argv'][2]); + +$substitute_old = $old_version; +$substitute_new = $new_version; +$simple_name_old = 'release-' . $old_version; +$simple_name_new = 'release-' . $new_version; $echo_changes = false; + +// DO NOT EVER USE THE FOLLOWING! Fix the script to generate proper changes, +// do NOT manually create them. + // 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. ;) $package_changed_files = false; -// CONFIG - End //$debug_file = 'includes/functions_user.php'; //'styles/prosilver/style.cfg'; $debug_file = false; @@ -36,9 +46,6 @@ if (!$package_changed_files) { if (!$echo_changes) { - // Cleanup... - run_command("rm -R $location/save/*"); - // Create directory... run_command("mkdir $location/save/{$s_name}"); run_command("mkdir $location/save/{$s_name}/language"); @@ -72,14 +79,14 @@ if (!$echo_changes) foreach ($compress_programs as $extension => $compress_command) { echo "Packaging code changes for $extension\n"; - run_command("rm ./../../release_files/{$code_changes_filename}.{$extension}"); + run_command("rm ./../../new_version/release_files/{$code_changes_filename}.{$extension}"); flush(); // Build Package - run_command("$compress_command ./../../release_files/{$code_changes_filename}.{$extension} *"); + run_command("$compress_command ./../../new_version/release_files/{$code_changes_filename}.{$extension} *"); // Build MD5 Sum - run_command("md5sum ./../../release_files/{$code_changes_filename}.{$extension} > ./../../release_files/{$code_changes_filename}.{$extension}.md5"); + run_command("md5sum ./../../new_version/release_files/{$code_changes_filename}.{$extension} > ./../../new_version/release_files/{$code_changes_filename}.{$extension}.md5"); flush(); } } |