mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2024-12-22 08:21:52 +00:00
Update release scripts, also, remove errant space from VERSION.
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1491 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
parent
02658df8b2
commit
4e32902c63
@ -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');
|
||||
|
@ -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.'";
|
||||
|
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user