Move some stuff around.

7 files changed, 0 insertions, 151 deletions

diff --git a/build-all-ffmpeg b/hacks/build-all-ffmpeg
index a3d197c28..a3d197c28 100755
--- a/build-all-ffmpeg
+++ b/hacks/build-all-ffmpeg
diff --git a/optimise/8proc.log b/hacks/optimise/8proc.log
index edc40d97a..edc40d97a 100644
--- a/optimise/8proc.log
+++ b/hacks/optimise/8proc.log
diff --git a/optimise/analog b/hacks/optimise/analog
index 174300810..174300810 100755
--- a/optimise/analog
+++ b/hacks/optimise/analog
diff --git a/optimise/plotlog b/hacks/optimise/plotlog
index 55b6fb871..55b6fb871 100755
--- a/optimise/plotlog
+++ b/hacks/optimise/plotlog
diff --git a/splitchapters b/hacks/splitchapters
index 1e5cff084..1e5cff084 100755
--- a/splitchapters
+++ b/hacks/splitchapters
diff --git a/version-test.py b/version-test.py
deleted file mode 100644
index 47b4159fc..000000000
--- a/version-test.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-
-import version
-
-a = version.Version("0.51")
-assert(a.major == 0)
-assert(a.minor == 51)
-assert(a.pre == False)
-assert(a.beta == None)
-assert(str(a) == "0.51")
-
-a.bump_and_to_pre()
-assert(a.major == 0)
-assert(a.minor == 52)
-assert(a.pre == True)
-assert(a.beta == None)
-assert(str(a) == "0.52pre")
-
-a.bump()
-assert(a.major == 0)
-assert(a.minor == 53)
-assert(a.pre == False)
-assert(a.beta == None)
-assert(str(a) == "0.53")
-
-a.to_pre()
-a.bump_beta()
-assert(a.major == 0)
-assert(a.minor == 53)
-assert(a.pre == False)
-assert(a.beta == 1)
-assert(str(a) == "0.53beta1")
-
-a.bump_beta()
-assert(a.major == 0)
-assert(a.minor == 53)
-assert(a.pre == False)
-assert(a.beta == 2)
-assert(str(a) == "0.53beta2")
-
-a.to_release()
-assert(a.major == 0)
-assert(a.minor == 53)
-assert(a.pre == False)
-assert(a.beta == None)
-assert(str(a) == "0.53")
-
-b = version.Version("1.42beta1")
-assert(b.major == 1)
-assert(b.minor == 42)
-assert(b.pre == False)
-assert(b.beta == 1)
diff --git a/version.py b/version.py
deleted file mode 100644
index 5b16352e1..000000000
--- a/version.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import datetime
-import shutil
-import copy
-
-class Version:
-    def __init__(self, s):
-        self.pre = False
-        self.beta = None
-
-        if s.startswith("'"):
-            s = s[1:]
-        if s.endswith("'"):
-            s = s[0:-1]
-        
-        if s.endswith('pre'):
-            s = s[0:-3]
-            self.pre = True
-
-        b = s.find("beta")
-        if b != -1:
-            self.beta = int(s[b+4:])
-            s = s[0:b]
-
-        p = s.split('.')
-        self.major = int(p[0])
-        self.minor = int(p[1])
-
-    def bump(self):
-        self.minor += 1
-        self.pre = False
-        self.beta = None
-
-    def to_pre(self):
-        self.pre = True
-        self.beta = None
-
-    def bump_and_to_pre(self):
-        self.bump()
-        self.pre = True
-        self.beta = None
-
-    def to_release(self):
-        self.pre = False
-        self.beta = None
-
-    def bump_beta(self):
-        if self.pre:
-            self.pre = False
-            self.beta = 1
-        elif self.beta is not None:
-            self.beta += 1
-        elif self.beta is None:
-            self.beta = 1
-
-    def __str__(self):
-        s = '%d.%02d' % (self.major, self.minor)
-        if self.beta is not None:
-            s += 'beta%d' % self.beta
-        elif self.pre:
-            s += 'pre'
-
-        return s
-        
-def rewrite_wscript(method):
-    f = open('wscript', 'rw')
-    o = open('wscript.tmp', 'w')
-    version = None
-    while 1:
-        l = f.readline()
-        if l == '':
-            break
-
-        s = l.split()
-        if len(s) == 3 and s[0] == "VERSION":
-            version = Version(s[2])
-            method(version)
-            print "Writing %s" % version
-            print >>o,"VERSION = '%s'" % version
-        else:
-            print >>o,l,
-    f.close()
-    o.close()
-
-    os.rename('wscript.tmp', 'wscript')
-    return version
-
-def append_to_changelog(version):
-    f = open('ChangeLog', 'r')
-    c = f.read()
-    f.close()
-
-    f = open('ChangeLog', 'w')
-    now = datetime.datetime.now()
-    f.write('%d-%02d-%02d  Carl Hetherington  <cth@carlh.net>\n\n\t* Version %s released.\n\n' % (now.year, now.month, now.day, version))
-    f.write(c)