Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

We are no longer including ChangeLog files within the releases of

Cherokee. All that information is available in the source code
repository.
  • Loading branch information...
commit c3b3a42e551eaddff0252ad4c20adefa754aeb3f 1 parent 155f9f7
@alobbs alobbs authored
View
17,001 ChangeLog.20090621
0 additions, 17,001 deletions not shown
View
17,214 ChangeLog.20101116
0 additions, 17,214 deletions not shown
View
3  Makefile.am
@@ -81,9 +81,6 @@ SUNWcherokee.spec \
pam.d_cherokee \
cherokee.pc.in \
developers.py \
-svnlog2changelog.py \
-gitlog2changelog.py \
-changelog-update.sh \
$(m4data_DATA) \
$(XMLS_PRE) \
$(CONFS_PRE) \
View
3  autogen.sh
@@ -67,9 +67,6 @@ if test "$DIE" -eq 1; then
exit 1
fi
-# Build the Changelog file
-./changelog-update.sh
-
# Update the POTFILES.in
echo "Generating a fresh po/admin/POTFILES.in file.."
po/admin/generate_POTFILESin.py > po/admin/POTFILES.in
View
100 changelog-update.sh
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Renders a ChangeLog file by using the Subversion or Git commit logs
-#
-# Author: Alvaro Lopez Ortega <alvaro@alobbs.com>
-
-TZ=UTC
-
-# The current ChangeLog file starts at revision number..
-FIRST_REV="5776"
-FIRST_ID="b3593eabf88c4c5a74953881563ac44c14227297"
-
-# Local vars
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-test -z "$SVN" && SVN=svn
-test -z "$GIT" && GIT=git
-
-
-go_git()
-{
- # Figure last ChangeLog entry
- LAST_COMMIT_ID=`head -n 3 ChangeLog 2>/dev/null | grep 'svn=' | sed 's/ *svn=.* git=\(.*\)/\1/'`
-
- if [ "x$LAST_COMMIT_ID" = "x" ]; then
- LAST_COMMIT_ID="$FIRST_ID"
- echo " * Creating a brand new ChangeLog file"
- else
- echo " * Last commit in the ChangeLog: $LAST_COMMIT_ID"
- fi
-
- # New log
- echo " * Appending commits since: $LAST_COMMIT_ID"
- $GIT log --stat --no-merges --date=short $LAST_COMMIT_ID..HEAD | python $srcdir/gitlog2changelog.py > $srcdir/ChangeLog.new
-
- if test ! -s $srcdir/ChangeLog.new ; then
- echo " * Changelog is already up-to-date."
- else
- if test -f $srcdir/ChangeLog ; then
- echo " * Merging new entries.."
- mv $srcdir/ChangeLog $srcdir/ChangeLog.prev
- cat $srcdir/ChangeLog.new $srcdir/ChangeLog.prev > ChangeLog
- else
- echo " * No previous entries.."
- mv $srcdir/ChangeLog.new $srcdir/ChangeLog
- fi
- fi
-
- echo " * Cleaning up"
- rm -f $srcdir/ChangeLog.new $srcdir/ChangeLog.prev
-}
-
-
-go_svn()
-{
- # FOR THE RECORD:
- # Commit log messages can be modified by running (replace $REV):
- # svn propedit svn:log --revprop -r$REV .
-
- # Check what the latest revision of the ChangeLog file is
- if [ -e $srcdir/ChangeLog ]; then
- CHANGELOG_VERSION=`head -n 2 $srcdir/ChangeLog | tail -n 1 | awk {'print $2'} | sed 's|r||g; s|,||g'`
- else
- touch ChangeLog
- fi
-
- if [ x$CHANGELOG_VERSION = x ]; then
- CHANGELOG_VERSION=$FIRST_REV
- fi
-
- # Find the latest revision in the SVN
- SVN_VERSION=`svnversion -c . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`
- if [ x$SVN_VERSION = x ]; then
- echo
- echo "WARNING: Couldn't get svn revision number."
- echo " Is svn or the .svn directories missing?"
- echo
- else
- if [ x$SVN_VERSION = x$CHANGELOG_VERSION ]; then
- echo "ChangeLog is already up-to-date."
- else
- echo "Updating ChangeLog from version $CHANGELOG_VERSION to $SVN_VERSION..."
- mv $srcdir/ChangeLog $srcdir/ChangeLog.prev
- $SVN log -v --xml -r $SVN_VERSION:$((CHANGELOG_VERSION+1)) $srcdir | python $srcdir/svnlog2changelog.py > $srcdir/ChangeLog
- cat $srcdir/ChangeLog.prev >> $srcdir/ChangeLog
- rm -f $srcdir/ChangeLog.prev
- fi
- fi
-}
-
-
-# main
-if [ -d .git ]; then
- go_git
-elif [ -d .svn ]; then
- go_svn
-else
- echo "The ChangeLog file is not being updated."
- echo
-fi
View
85 gitlog2changelog.py
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-
-##
-## Cherokee SVNlog2Changelog script
-##
-## Copyright: Alvaro Lopez Ortega <alvaro@alobbs.com>
-## Licensed: GPL v2
-##
-
-import re
-import sys
-import time
-
-from sys import stdin
-from developers import DEVELOPERS
-
-
-def get_commits():
- chunk = ''
- commits = []
-
- while True:
- line = stdin.readline()
- if not line:
- break
- elif line.startswith("commit"):
- if not chunk:
- chunk += "%s" %(line)
- else:
- commits.append (chunk)
- chunk = "%s" %(line)
- else:
- chunk += "%s" %(line)
-
- if chunk:
- commits.append(chunk)
-
- return commits
-
-
-def format_body (body):
- result = ""
- prev_blank = False
-
- for line in body.splitlines():
- if "git-svn-id: svn://" in line:
- continue
-
- if not line.strip():
- if prev_blank:
- continue
- else:
- result += "%s\n"%(line)
- prev_blank = True
- else:
- result += "%s\n"%(line)
- prev_blank = False
-
- return result
-
-
-def do_parse():
- for entry in get_commits():
- commit = re.findall(r"commit (\w+)", entry)[0]
- author = re.findall(r"Author: +(.+) \<", entry)[0]
- date = re.findall(r"Date: +(.+)", entry)[0]
-
- if not "git-svn-id:" in entry:
- print >> sys.stderr, "Unpushed commit: %s, %s - %s" % (author, date, commit)
- continue
-
- svn_id = re.findall(r"git-svn-id: svn://cherokee-project.com/.+@(.+) ", entry)[0]
-
- header_end = entry.index('\n\n')
- if header_end == -1:
- continue
-
- print ("%s %s" %(date, DEVELOPERS.get(author, author)))
- print (" svn=%s git=%s" %(svn_id, commit))
- print ("")
- print (format_body(entry[header_end + 2:]))
-
-
-if __name__ == "__main__":
- do_parse()
View
79 svnlog2changelog.py
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-
-##
-## Cherokee SVNlog2Changelog script
-##
-## Copyright: Alvaro Lopez Ortega <alvaro@alobbs.com>
-## Licensed: GPL v2
-##
-
-import time
-import xml.dom.minidom
-
-from sys import stdin
-from developers import DEVELOPERS
-
-
-def get_text (nodelist):
- for node in nodelist:
- if node.nodeType == node.TEXT_NODE:
- return node.data
-
-def entry_get_val (entry, key):
- dom_element = entry.getElementsByTagName(key)[0]
- nodelist = dom_element.childNodes
- return get_text(nodelist)
-
-def reformat_msg (msg):
- if not msg:
- return ''
-
- txts = []
- for l in msg.split('\n'):
- if not txts:
- txts.append('\t* %s'%(l))
- else:
- txts.append('\t%s'%(l))
- return '\n'.join(txts)
-
-def render_paths (entry):
- txt = ''
- for paths in entry.getElementsByTagName('paths'):
- for path in entry.getElementsByTagName('path'):
- action = path.getAttribute('action')
- txt += "\t%s %s\n"%(action, get_text(path.childNodes))
- return txt
-
-def do_parse():
- try:
- dom = xml.dom.minidom.parseString (stdin.read())
- except xml.parsers.expat.ExpatError, e:
- print ("ERROR: Could update ChangeLog. The XML arser reported: ")
- print (' "%s2"' %(e))
- print ('')
- raise SystemExit
-
- log = dom.getElementsByTagName('log')[0]
-
- for entry in log.getElementsByTagName('logentry'):
- revision = entry.getAttribute('revision')
- date = entry_get_val (entry, 'date').split('T')[0]
- time = entry_get_val (entry, 'date').split('T')[1].split('.')[0]
- dev = entry_get_val (entry, 'author')
- msg = reformat_msg(entry_get_val (entry, 'msg'))
- author = DEVELOPERS[dev]
- paths = render_paths(entry)
-
- print ("%s %s" %(str(date), author))
- print (" "*12 + "svn=%s" %(revision))
- print ("")
- if msg:
- print (msg.encode("utf-8")),
-
- if paths:
- print ("")
- print (paths)
-
-if __name__ == "__main__":
- do_parse()
-
Please sign in to comment.
Something went wrong with that request. Please try again.