Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Alvaro Lopez Ortega authored October 13, 2011
17,001  ChangeLog.20090621
0 additions, 17001 deletions not shown
17,214  ChangeLog.20101116
0 additions, 17214 deletions not shown
3  Makefile.am
@@ -81,9 +81,6 @@ SUNWcherokee.spec               \
81 81
 pam.d_cherokee                  \
82 82
 cherokee.pc.in                  \
83 83
 developers.py                   \
84  
-svnlog2changelog.py             \
85  
-gitlog2changelog.py             \
86  
-changelog-update.sh             \
87 84
 $(m4data_DATA)                  \
88 85
 $(XMLS_PRE)                     \
89 86
 $(CONFS_PRE)                    \
3  autogen.sh
@@ -67,9 +67,6 @@ if test "$DIE" -eq 1; then
67 67
     exit 1
68 68
 fi
69 69
 
70  
-# Build the Changelog file
71  
-./changelog-update.sh
72  
-
73 70
 # Update the POTFILES.in
74 71
 echo "Generating a fresh po/admin/POTFILES.in file.."
75 72
 po/admin/generate_POTFILESin.py > po/admin/POTFILES.in
100  changelog-update.sh
... ...
@@ -1,100 +0,0 @@
1  
-#!/bin/sh
2  
-
3  
-# Renders a ChangeLog file by using the Subversion or Git commit logs
4  
-#
5  
-# Author: Alvaro Lopez Ortega <alvaro@alobbs.com>
6  
-
7  
-TZ=UTC
8  
-
9  
-# The current ChangeLog file starts at revision number..
10  
-FIRST_REV="5776"
11  
-FIRST_ID="b3593eabf88c4c5a74953881563ac44c14227297"
12  
-
13  
-# Local vars
14  
-srcdir=`dirname $0`
15  
-test -z "$srcdir" && srcdir=.
16  
-test -z "$SVN" && SVN=svn
17  
-test -z "$GIT" && GIT=git
18  
-
19  
-
20  
-go_git()
21  
-{
22  
-   # Figure last ChangeLog entry
23  
-   LAST_COMMIT_ID=`head -n 3 ChangeLog 2>/dev/null | grep 'svn=' | sed 's/ *svn=.* git=\(.*\)/\1/'`
24  
-
25  
-   if [ "x$LAST_COMMIT_ID" = "x" ]; then
26  
-	  LAST_COMMIT_ID="$FIRST_ID"
27  
-	  echo " * Creating a brand new ChangeLog file"
28  
-   else
29  
-	  echo " * Last commit in the ChangeLog: $LAST_COMMIT_ID"
30  
-   fi
31  
-
32  
-   # New log
33  
-   echo " * Appending commits since: $LAST_COMMIT_ID"
34  
-   $GIT log --stat --no-merges --date=short $LAST_COMMIT_ID..HEAD | python $srcdir/gitlog2changelog.py > $srcdir/ChangeLog.new
35  
-
36  
-   if test ! -s $srcdir/ChangeLog.new ; then
37  
-	  echo " * Changelog is already up-to-date."
38  
-   else
39  
-	  if test -f $srcdir/ChangeLog ; then
40  
-		 echo " * Merging new entries.."
41  
-		 mv $srcdir/ChangeLog $srcdir/ChangeLog.prev
42  
-		 cat $srcdir/ChangeLog.new $srcdir/ChangeLog.prev > ChangeLog
43  
-	  else
44  
-		 echo " * No previous entries.."
45  
-		 mv $srcdir/ChangeLog.new $srcdir/ChangeLog
46  
-	  fi
47  
-   fi
48  
-
49  
-   echo " * Cleaning up"
50  
-   rm -f $srcdir/ChangeLog.new $srcdir/ChangeLog.prev
51  
-}
52  
-
53  
-
54  
-go_svn()
55  
-{
56  
-   # FOR THE RECORD:
57  
-   # Commit log messages can be modified by running (replace $REV):
58  
-   #  svn propedit svn:log --revprop -r$REV .
59  
-
60  
-   # Check what the latest revision of the ChangeLog file is
61  
-   if [ -e $srcdir/ChangeLog ]; then
62  
-       CHANGELOG_VERSION=`head -n 2 $srcdir/ChangeLog | tail -n 1 | awk {'print $2'} | sed 's|r||g; s|,||g'`
63  
-   else
64  
-       touch ChangeLog
65  
-   fi
66  
-
67  
-   if [ x$CHANGELOG_VERSION = x ]; then
68  
-       CHANGELOG_VERSION=$FIRST_REV
69  
-   fi
70  
-
71  
-   # Find the latest revision in the SVN
72  
-   SVN_VERSION=`svnversion -c . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`
73  
-   if [ x$SVN_VERSION = x ]; then
74  
-        echo
75  
-   	   echo "WARNING: Couldn't get svn revision number."
76  
-   	   echo "         Is svn or the .svn directories missing?"
77  
-	   echo
78  
-   else
79  
-	  if [ x$SVN_VERSION = x$CHANGELOG_VERSION ]; then
80  
-		 echo "ChangeLog is already up-to-date."
81  
-	  else
82  
-		 echo "Updating ChangeLog from version $CHANGELOG_VERSION to $SVN_VERSION..."
83  
-		 mv $srcdir/ChangeLog $srcdir/ChangeLog.prev
84  
-		 $SVN log -v --xml -r $SVN_VERSION:$((CHANGELOG_VERSION+1)) $srcdir | python $srcdir/svnlog2changelog.py > $srcdir/ChangeLog
85  
-		 cat $srcdir/ChangeLog.prev >> $srcdir/ChangeLog
86  
-		 rm -f $srcdir/ChangeLog.prev
87  
-	  fi
88  
-   fi
89  
-}
90  
-
91  
-
92  
-# main
93  
-if [ -d .git ]; then
94  
-    go_git
95  
-elif [ -d .svn ]; then
96  
-    go_svn
97  
-else
98  
-    echo "The ChangeLog file is not being updated."
99  
-    echo
100  
-fi
85  gitlog2changelog.py
... ...
@@ -1,85 +0,0 @@
1  
-#!/usr/bin/env python
2  
-
3  
-##
4  
-## Cherokee SVNlog2Changelog script
5  
-##
6  
-## Copyright: Alvaro Lopez Ortega <alvaro@alobbs.com>
7  
-## Licensed: GPL v2
8  
-##
9  
-
10  
-import re
11  
-import sys
12  
-import time
13  
-
14  
-from sys import stdin
15  
-from developers import DEVELOPERS
16  
-
17  
-
18  
-def get_commits():
19  
-    chunk   = ''
20  
-    commits = []
21  
-
22  
-    while True:
23  
-        line = stdin.readline()
24  
-        if not line:
25  
-            break
26  
-        elif line.startswith("commit"):
27  
-            if not chunk:
28  
-                chunk += "%s" %(line)
29  
-            else:
30  
-                commits.append (chunk)
31  
-                chunk = "%s" %(line)
32  
-        else:
33  
-            chunk += "%s" %(line)
34  
-
35  
-    if chunk:
36  
-        commits.append(chunk)
37  
-
38  
-    return commits
39  
-
40  
-
41  
-def format_body (body):
42  
-    result     = ""
43  
-    prev_blank = False
44  
-
45  
-    for line in body.splitlines():
46  
-        if "git-svn-id: svn://" in line:
47  
-            continue
48  
-
49  
-        if not line.strip():
50  
-            if prev_blank:
51  
-                continue
52  
-            else:
53  
-                result += "%s\n"%(line)
54  
-                prev_blank = True
55  
-        else:
56  
-            result += "%s\n"%(line)
57  
-            prev_blank = False
58  
-
59  
-    return result
60  
-
61  
-
62  
-def do_parse():
63  
-    for entry in get_commits():
64  
-        commit = re.findall(r"commit (\w+)", entry)[0]
65  
-        author = re.findall(r"Author: +(.+) \<", entry)[0]
66  
-        date   = re.findall(r"Date: +(.+)", entry)[0]
67  
-
68  
-        if not "git-svn-id:" in entry:
69  
-            print >> sys.stderr, "Unpushed commit: %s, %s - %s" % (author, date, commit)
70  
-            continue
71  
-
72  
-        svn_id = re.findall(r"git-svn-id: svn://cherokee-project.com/.+@(.+) ", entry)[0]
73  
-
74  
-        header_end = entry.index('\n\n')
75  
-        if header_end == -1:
76  
-            continue
77  
-
78  
-        print ("%s  %s" %(date, DEVELOPERS.get(author, author)))
79  
-        print ("            svn=%s git=%s" %(svn_id, commit))
80  
-        print ("")
81  
-        print (format_body(entry[header_end + 2:]))
82  
-
83  
-
84  
-if __name__ == "__main__":
85  
-    do_parse()
79  svnlog2changelog.py
... ...
@@ -1,79 +0,0 @@
1  
-#!/usr/bin/env python
2  
-
3  
-##
4  
-## Cherokee SVNlog2Changelog script
5  
-##
6  
-## Copyright: Alvaro Lopez Ortega <alvaro@alobbs.com>
7  
-## Licensed: GPL v2
8  
-##
9  
-
10  
-import time
11  
-import xml.dom.minidom
12  
-
13  
-from sys import stdin
14  
-from developers import DEVELOPERS
15  
-
16  
-
17  
-def get_text (nodelist):
18  
-    for node in nodelist:
19  
-        if node.nodeType == node.TEXT_NODE:
20  
-            return node.data
21  
-
22  
-def entry_get_val (entry, key):
23  
-    dom_element = entry.getElementsByTagName(key)[0]
24  
-    nodelist    = dom_element.childNodes
25  
-    return get_text(nodelist)
26  
-
27  
-def reformat_msg (msg):
28  
-    if not msg:
29  
-        return ''
30  
-
31  
-    txts = []
32  
-    for l in msg.split('\n'):
33  
-        if not txts:
34  
-            txts.append('\t* %s'%(l))
35  
-        else:
36  
-            txts.append('\t%s'%(l))
37  
-    return '\n'.join(txts)
38  
-
39  
-def render_paths (entry):
40  
-    txt = ''
41  
-    for paths in entry.getElementsByTagName('paths'):
42  
-        for path in entry.getElementsByTagName('path'):
43  
-            action = path.getAttribute('action')
44  
-            txt += "\t%s %s\n"%(action, get_text(path.childNodes))
45  
-    return txt
46  
-
47  
-def do_parse():
48  
-    try:
49  
-        dom = xml.dom.minidom.parseString (stdin.read())
50  
-    except xml.parsers.expat.ExpatError, e:
51  
-        print ("ERROR: Could update ChangeLog. The XML arser reported: ")
52  
-        print ('       "%s2"' %(e))
53  
-        print ('')
54  
-        raise SystemExit
55  
-
56  
-    log = dom.getElementsByTagName('log')[0]
57  
-
58  
-    for entry in log.getElementsByTagName('logentry'):
59  
-        revision = entry.getAttribute('revision')
60  
-        date     = entry_get_val (entry, 'date').split('T')[0]
61  
-        time     = entry_get_val (entry, 'date').split('T')[1].split('.')[0]
62  
-        dev      = entry_get_val (entry, 'author')
63  
-        msg      = reformat_msg(entry_get_val (entry, 'msg'))
64  
-        author   = DEVELOPERS[dev]
65  
-        paths    = render_paths(entry)
66  
-
67  
-        print ("%s  %s" %(str(date), author))
68  
-        print (" "*12 + "svn=%s" %(revision))
69  
-        print ("")
70  
-        if msg:
71  
-            print (msg.encode("utf-8")),
72  
-
73  
-        if paths:
74  
-            print ("")
75  
-            print (paths)
76  
-
77  
-if __name__ == "__main__":
78  
-    do_parse()
79  
-

0 notes on commit c3b3a42

Please sign in to comment.
Something went wrong with that request. Please try again.