- Fix tagging script to work off of php4

- 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

NEWS

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

release2-strict.php

@@ -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.'";
-

release3-tag.php

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

svn.php

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