mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-04 13:18:00 +02:00
Code Issues Releases Wiki Activity

- Fix tagging script to work off of php4

Browse Source 
- Fix svn.php to not clobber svn extension
- Update NEWS

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/php4@1743 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-05-18 20:12:17 +00:00
parent 487fcd55ea
commit 864cb9e136
4 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -14,6 +14,9 @@ ERRATA
If you desire to use it, please use it with the latest, PHP5-only version of If you desire to use it, please use it with the latest, PHP5-only version of
HTML Purifier. HTML Purifier.
2.1.5, unknown release date
2.1.4, released 2008-05-18 2.1.4, released 2008-05-18
! DefinitionCacheFactory now can register new implementations ! DefinitionCacheFactory now can register new implementations
! CSS properties are now case-insensitive ! CSS properties are now case-insensitive

30
release2-strict.php
View File

@@ -1,30 +0,0 @@
<?php
// Merges in changes from trunk to strict branch
// WORKING COPY MUST BE POINTED TO STRICT BRANCH
if (php_sapi_name() != 'cli') {
echo 'Release script cannot be called from web-browser.';
exit;
}
require 'svn.php';
$svn_info = svn_info('.');
$last_rev = (int) $svn_info['Last Changed Rev'];
$trunk_url = $svn_info['Repository Root'] . '/htmlpurifier/trunk';
echo "Last revision was $last_rev, merging from $last_rev to head.\n";
$merge_cmd = "svn merge -r $last_rev:HEAD $trunk_url .";
$out = explode("\n", shell_exec($merge_cmd));
echo "Conflicted files:\n";
foreach ($out as $line) {
if (empty($line)) continue;
if ($line{0} === 'C' || $line{1} === 'C') echo $line . "\n";
}
$version = trim(file_get_contents('VERSION'));
echo "Resolve conflicts and then commit as 'Release $version, merged in $last_rev to HEAD.'";

11
release3-tag.php
View File

@@ -9,17 +9,12 @@ if (php_sapi_name() != 'cli') {
require 'svn.php'; require 'svn.php';
$svn_info = svn_info('.'); $svn_info = my_svn_info('.');
$version = trim(file_get_contents('VERSION')); $version = trim(file_get_contents('VERSION'));
$trunk_url = $svn_info['Repository Root'] . '/htmlpurifier/trunk'; $trunk_url = $svn_info['Repository Root'] . '/htmlpurifier/branches/php4';
$strict_url = $svn_info['Repository Root'] . '/htmlpurifier/branches/strict';
$trunk_tag_url = $svn_info['Repository Root'] . '/htmlpurifier/tags/' . $version; $trunk_tag_url = $svn_info['Repository Root'] . '/htmlpurifier/tags/' . $version;
$strict_tag_url = $svn_info['Repository Root'] . '/htmlpurifier/tags/' . $version . '-strict';
echo "Tagging trunk to tags/$version..."; echo "Tagging php4 branch to tags/$version...";
passthru("svn copy --message \"Tag $version release.\" $trunk_url $trunk_tag_url"); passthru("svn copy --message \"Tag $version release.\" $trunk_url $trunk_tag_url");
echo "Tagging strict to tags/$version-strict...";
passthru("svn copy --message \"Tag $version-strict release.\" $strict_url $strict_tag_url");

2
svn.php
View File

@@ -1,6 +1,6 @@
<?php <?php
function svn_info($dir) { function my_svn_info($dir) {
$raw = explode("\n", shell_exec("svn info $dir")); $raw = explode("\n", shell_exec("svn info $dir"));
$svn_info = array(); $svn_info = array();
foreach ($raw as $r) { foreach ($raw as $r) {