diff --git a/create_log.py b/create_log.py
index 5d37dd2..c0ce0c7 100755
--- a/create_log.py
+++ b/create_log.py
@@ -1,149 +1,149 @@
#!/usr/bin/env python2
import os
import subprocess
def getVersionFrom(repo):
f = open(versionsDir + '/' + repo)
return f.readlines()[1].strip()
f = open('modules.git')
#srcdir="/d/kde/src/5/"
srcdir="/data/devel/kde/release/"
repos=[]
for line in f:
line = line[:line.find(" ")]
repos.append(line)
repos.sort()
versionsDir = os.getcwd() + "/versions"
print ""
for repo in repos:
toVersion = getVersionFrom(repo)
os.chdir(srcdir+repo)
- fromVersion = "v17.12.1"
+ fromVersion = "v19.04.3"
p = subprocess.Popen('git fetch', shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
retval = p.wait()
if retval != 0:
raise NameError('git fetch failed')
p = subprocess.Popen('git rev-parse '+fromVersion, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
retval = p.wait()
if retval != 0:
print "
"
print ""
continue
p = subprocess.Popen('git diff '+fromVersion+'..'+toVersion, shell=True, stdout=subprocess.PIPE)
diffOutput = p.stdout.readlines()
retval = p.wait()
if retval != 0:
raise NameError('git diff failed', repo, fromVersion, toVersion)
if len(diffOutput):
p = subprocess.Popen('git log '+fromVersion+'..'+toVersion, shell=True, stdout=subprocess.PIPE)
commit = []
commits = []
for line in p.stdout.readlines():
if line.startswith("commit"):
if len(commit) > 1 and not ignoreCommit:
commits.append(commit)
commitHash = line[7:].strip()
ignoreCommit = False
commit = [commitHash]
elif line.startswith("Author"):
pass
elif line.startswith("Date"):
pass
elif line.startswith("Merge"):
pass
else:
line = line.strip()
if line.startswith("Merge remote-tracking branch"):
ignoreCommit = True
elif line.startswith("SVN_SILENT"):
ignoreCommit = True
elif line.startswith("GIT_SILENT"):
ignoreCommit = True
elif line.startswith("Merge branch"):
ignoreCommit = True
elif line:
commit.append(line)
# Add the last commit
if len(commit) > 1 and not ignoreCommit:
commits.append(commit)
if len(commits):
print ""
print ""
for commit in commits:
extra = ""
clog = ""
changelog = commit[1]
for line in commit:
if line.startswith("BUGS:"):
bugNumbers = line[line.find(":") + 1:].strip()
for bugNumber in bugNumbers.split(","):
if bugNumber.isdigit():
if extra:
extra += ". "
extra += "Fixes bug #" + bugNumber + ""
elif line.startswith("BUG:"):
bugNumber = line[line.find(":") + 1:].strip()
if bugNumber.isdigit():
if extra:
extra += ". "
extra += "Fixes bug #" + bugNumber + ""
elif line.startswith("REVIEW:"):
if extra:
extra += ". "
reviewNumber = line[line.find(":") + 1:].strip()
extra += "Code review #" + reviewNumber + ""
elif line.startswith("CCBUG:"):
if extra:
extra += ". "
bugNumber = line[line.find(":") + 1:].strip()
extra += "See bug #" + bugNumber + ""
elif line.startswith("FEATURE:"):
feature = line[line.find(":") + 1:].strip()
if feature.isdigit():
if extra:
extra += ". "
extra += "Implements feature #" + feature + ""
else:
if feature and not clog:
changelog = feature
elif line.startswith("CHANGELOG:"):
clog = line[line.find(":") + 1:].strip()
if clog:
changelog = clog
commitHash = commit[0]
if not changelog.endswith("."):
changelog = changelog + "."
capitalizedChangelog = changelog[0].capitalize() + changelog[1:]
print "- " + capitalizedChangelog + " Commit. " + extra + "
"
print "
"
retval = p.wait()
if retval != 0:
raise NameError('git log failed', repo, fromVersion, toVersion)
diff --git a/create_sources_inc b/create_sources_inc
index 45948e3..58debe0 100755
--- a/create_sources_inc
+++ b/create_sources_inc
@@ -1,42 +1,42 @@
#!/bin/bash
. version
process_folder()
{
for i in $1/*.tar.xz; do
filename=`basename $i`
echo ''
l=`echo $filename | sed -e "s#.tar.xz##"`
- echo ' '$l' | '
+ echo ' '$l' | '
size=`stat -c "%s" $i`
size=`echo "$size / 1024" | bc`
if test "$size" -lt 1024; then
size="$size"kB
else
size=`echo "($size * 10) / 1024" | bc`
if test "$size" -lt 100; then
size=`echo "$size"MB | sed -e "s#\(.\)MB#.\1MB#"`
else
size=`echo "$size"MB | sed -e "s#\(.\)MB#MB#"`
fi
fi
echo ' '$size' | '
sha1=`sha1sum $i | cut -f1 -d' '`
echo ' '$sha1' | '
echo '
'
echo ''
done
}
echo ''
echo ''
echo ' Location | '
echo ' Size | '
echo ' Sha1 Sum | '
echo '
'
process_folder "sources" "src"
echo '
'
diff --git a/version b/version
index 1b75e74..0290d68 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version=19.07.90
+version=19.08.0