makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6787 from marc1706/ticket/17481

Browse source 
[ticket/17481] Make build package directory version independent
This commit is contained in:
Marc Alexander 2025-04-21 17:27:30 +02:00 • committed by GitHub
commit 68e941ac21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/build.xml
View file

@ -4,7 +4,7 @@
<!-- a few settings for the build --> <!-- a few settings for the build -->
<property name="newversion" value="4.0.0-a1-dev" /> <property name="newversion" value="4.0.0-a1-dev" />
<property name="prevversion" value="3.3.15" /> <property name="prevversion" value="3.3.15" />
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11, 3.3.12, 3.3.13, 3.3.14" /> <property name="olderversions" value="3.1.12, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11, 3.3.12, 3.3.13, 3.3.14" />
<!-- no configuration should be needed beyond this point --> <!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" /> <property name="oldversions" value="${olderversions}, ${prevversion}" />
@ -166,32 +166,32 @@
<target name="prepare-new-version"> <target name="prepare-new-version">
<!-- select the currently checked out commit (HEAD) for packaging --> <!-- select the currently checked out commit (HEAD) for packaging -->
<mkdir dir="build/new_version/phpBB3" /> <mkdir dir="build/new_version/phpBB" />
<phingcall target="export"> <phingcall target="export">
<property name="revision" value="HEAD" /> <property name="revision" value="HEAD" />
<property name="dir" value="build/new_version/phpBB3" /> <property name="dir" value="build/new_version/phpBB" />
</phingcall> </phingcall>
<!-- copy into directory for diffs --> <!-- copy into directory for diffs -->
<exec dir="build" command="cp -rp new_version/phpBB3 old_versions/release-${newversion}" /> <exec dir="build" command="cp -rp new_version/phpBB old_versions/release-${newversion}" />
<!-- and clean up --> <!-- and clean up -->
<phingcall target="clean-diff-dir"> <phingcall target="clean-diff-dir">
<property name="dir" value="build/old_versions/release-${newversion}" /> <property name="dir" value="build/old_versions/release-${newversion}" />
</phingcall> </phingcall>
<!-- create an empty config.php file (not for diffs) --> <!-- create an empty config.php file (not for diffs) -->
<touch file="build/new_version/phpBB3/config.php" /> <touch file="build/new_version/phpBB/config.php" />
<copy file="build/new_version/phpBB3/vendor-ext/.htaccess" tofile="build/new_version/phpBB3/vendor/.htaccess" /> <copy file="build/new_version/phpBB/vendor-ext/.htaccess" tofile="build/new_version/phpBB/vendor/.htaccess" />
</target> </target>
<target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs"> <target name="package" depends="clean,prepare,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" escape="false" <exec dir="build" escape="false"
command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB3/language > command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/language new_version/phpBB/language >
save/phpbb-${prevversion}_to_${newversion}_language.patch" /> save/phpbb-${prevversion}_to_${newversion}_language.patch" />
<exec dir="build" escape="false" <exec dir="build" escape="false"
command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver > command="LC_ALL=C diff -crNEBZbd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB/styles/prosilver >
save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" /> save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
<exec dir="build" escape="false" <exec dir="build" escape="false"

2
build/build_changelog.php
View file

@ -29,7 +29,7 @@ else
{ {
$fixVersion = $_SERVER['argv'][1]; $fixVersion = $_SERVER['argv'][1];
$query = 'project IN (PHPBB3, SECURITY) $query = 'project IN (PHPBB, PHPBB3, SECURITY)
AND resolution = Fixed AND resolution = Fixed
AND fixVersion = "' . $fixVersion . '" AND fixVersion = "' . $fixVersion . '"
AND status IN ("Unverified Fix", Closed)'; AND status IN ("Unverified Fix", Closed)';

2
build/build_helper.php
View file

@ -50,7 +50,7 @@ class build_package
); );
$this->package_infos = array( $this->package_infos = array(
'package_name' => 'phpBB3', 'package_name' => 'phpBB',
'name_prefix' => 'phpbb', 'name_prefix' => 'phpbb',
'simple_name' => 'release-' . $_latest, 'simple_name' => 'release-' . $_latest,
'new_version_number' => $_latest, 'new_version_number' => $_latest,

6
build/compare.sh
View file

@ -19,9 +19,9 @@ do
$command "$1.$ext" $command "$1.$ext"
for file in `find phpBB3 -name '.svn' -prune -o -type f -print` for file in `find phpBB -name '.svn' -prune -o -type f -print`
do do
orig_file="${file/#phpBB3/$orig_dir}" orig_file="${file/#phpBB/$orig_dir}"
diff_result=`diff $orig_file $file` diff_result=`diff $orig_file $file`
if [ -n "$diff_result" ] if [ -n "$diff_result" ]
@ -31,7 +31,7 @@ do
fi fi
done done
rm -rf phpBB3 rm -rf phpBB
done done
cd .. cd ..