From b3a599e8c216da6ed0777eea6587f710904826ac Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Sat, 5 May 2007 22:40:51 +0000
Subject: [PATCH] Add some more release scripts.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1033 48356398-32a2-884e-a903-53898d9a118a
---
 release2-strict.php | 26 ++++++++++++++++++++++++++
 release3-tag.php    | 21 +++++++++++++++++++++
 svn.php             | 14 ++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 release2-strict.php
 create mode 100644 release3-tag.php
 create mode 100644 svn.php

diff --git a/release2-strict.php b/release2-strict.php
new file mode 100644
index 00000000..06218cb3
--- /dev/null
+++ b/release2-strict.php
@@ -0,0 +1,26 @@
+<?php
+
+// Merges in changes from trunk to strict branch
+// WORKING COPY MUST BE POINTED TO STRICT BRANCH
+
+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.'";
+
+?>
\ No newline at end of file
diff --git a/release3-tag.php b/release3-tag.php
new file mode 100644
index 00000000..fea7e649
--- /dev/null
+++ b/release3-tag.php
@@ -0,0 +1,21 @@
+<?php
+
+// Tags releases
+
+require 'svn.php';
+
+$svn_info = 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");
+
+?>
\ No newline at end of file
diff --git a/svn.php b/svn.php
new file mode 100644
index 00000000..db588754
--- /dev/null
+++ b/svn.php
@@ -0,0 +1,14 @@
+<?php
+
+function svn_info($dir) {
+    $raw = explode("\n", shell_exec("svn info $dir"));
+    $svn_info = array();
+    foreach ($raw as $r) {
+        if (empty($r)) continue;
+        list($k, $v) = explode(': ', $r, 2);
+        $svn_info[$k] = $v;
+    }
+    return $svn_info;
+}
+
+?>
\ No newline at end of file