From 4e32902c63954ddc0fbe118926553c0fa6e33ce8 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Tue, 8 Jan 2008 01:20:12 +0000
Subject: [PATCH] Update release scripts, also, remove errant space from
 VERSION.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1491 48356398-32a2-884e-a903-53898d9a118a
---
 VERSION                              |  2 +-
 package.php                          |  4 ++--
 release2-strict.php                  | 30 ----------------------------
 release3-tag.php => release2-tag.php |  6 +-----
 svn.php                              |  2 +-
 5 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 release2-strict.php
 rename release3-tag.php => release2-tag.php (58%)

diff --git a/VERSION b/VERSION
index 4a36342f..56fea8a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.0
+3.0.0
\ No newline at end of file
diff --git a/package.php b/package.php
index 580038fe..be7c17ab 100644
--- a/package.php
+++ b/package.php
@@ -18,7 +18,7 @@ $pkg->setOptions(
     )
 );
 
-$pkg->setPackage('HTMLPurifier3');
+$pkg->setPackage('HTMLPurifier');
 $pkg->setLicense('LGPL', 'http://www.gnu.org/licenses/lgpl.html');
 $pkg->setSummary('Standards-compliant HTML filter');
 $pkg->setDescription(
@@ -30,7 +30,7 @@ $pkg->setDescription(
 
 $pkg->addMaintainer('lead', 'ezyang', 'Edward Z. Yang', 'admin@htmlpurifier.org', 'yes');
 
-$version = file_get_contents('VERSION');
+$version = trim(file_get_contents('VERSION'));
 $api_version = substr($version, 0, strrpos($version, '.'));
 
 $pkg->setChannel('htmlpurifier.org');
diff --git a/release2-strict.php b/release2-strict.php
deleted file mode 100644
index 51e8aa98..00000000
--- a/release2-strict.php
+++ /dev/null
@@ -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.'";
-
diff --git a/release3-tag.php b/release2-tag.php
similarity index 58%
rename from release3-tag.php
rename to release2-tag.php
index 3c0a4ee9..b2e718f3 100644
--- a/release3-tag.php
+++ b/release2-tag.php
@@ -9,17 +9,13 @@ 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_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...";
 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");
 
diff --git a/svn.php b/svn.php
index c57e4483..cdfc586c 100644
--- a/svn.php
+++ b/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) {