fix unzip code

[xonotic/netradiant.git] / makeversion.py

diff --git a/makeversion.py b/makeversion.py
index 3dab61c67f0282034a2cd8a99a6def8978985137..06c863121779cd4717cc4efa1a79e2205e8a21be 100644 (file)
--- a/makeversion.py
+++ b/makeversion.py
@@ -1,23 +1,3 @@
-# Copyright (C) 1999-2006 Id Software, Inc. and contributors.
-# For a list of contributors, see the accompanying CONTRIBUTORS file.
-# 
-# This file is part of GtkRadiant.
-# 
-# GtkRadiant is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# GtkRadiant is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GtkRadiant; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
 # version and about message management
 # NOTE: this module is meant to be used on all platforms, it is not SCons centric
 
@@ -32,15 +12,13 @@
 #   for non-official builds, we have a default message
 #   otherwise, use environment variable $RADIANT_ABOUTMSG
 # input:
-#   file pointed to by $RADIANT_ABOUTMSG if exists
-#   else include/aboutmsg.default
+#   include/aboutmsg.default
+#   or file pointed to by $RADIANT_ABOUTMSG if exists
 # ouput:
 #   include/aboutmsg.h
 
 import sys, re, string, os
 
-import svn
-
 def get_version():
   # version
   f = open('include/version.default', 'r')
@@ -54,49 +32,41 @@ def get_version():
   return (line, major, minor)  
 
 # you can pass an optional message to append to aboutmsg
-def radiant_makeversion(append_about, root = os.getcwd()):
+def radiant_makeversion(append_about):
   (line, major, minor) = get_version()
-  f = open(os.path.join(root, 'include/version.h'), 'w')
+  f = open('include/version.h', 'w')
   f.write('// generated header, see makeversion.py\n')
   f.write('#define RADIANT_VERSION "%s"\n' % line)
   f.write('#define RADIANT_MINOR_VERSION "%s"\n' % minor)
   f.write('#define RADIANT_MAJOR_VERSION "%s"\n' % major)
   f.close()
-  f = open(os.path.join(root, 'include/RADIANT_MINOR'), 'w')
+  f = open('include/RADIANT_MINOR', 'w')
   f.write(minor)
   f.close()
-  f = open(os.path.join(root, 'include/RADIANT_MAJOR'), 'w')
+  f = open('include/RADIANT_MAJOR', 'w')
   f.write(major)
   f.close()
-  f = open(os.path.join(root, 'include/version'), 'w')
+  f = open('include/version', 'w')
   f.write(line)
   f.close()
   # aboutmsg
-  aboutfile = os.path.join(root, 'include/aboutmsg.default')
+  aboutfile = 'include/aboutmsg.default'
   if ( os.environ.has_key('RADIANT_ABOUTMSG') ):
     aboutfile = os.environ['RADIANT_ABOUTMSG']
-  line = None
-  if os.path.isfile(aboutfile):
-    sys.stdout.write("about message is in %s\n" % aboutfile)
-    f = open(aboutfile, 'r')
-    line = f.readline()
-    f.close()
-    if line.endswith("\n"):
-      line = line[:-1]
-  else:
-    line = "Custom build based on revision " + str(svn.getRevision(os.getcwd()))
+  sys.stdout.write("about message is in %s\n" % aboutfile)
+  f = open(aboutfile, 'r')
+  buffer = f.read()
+  line = string.split(buffer, '\n')[0]
+  f.close()
   # optional additional message
   if ( not append_about is None ):
     line += append_about
   sys.stdout.write("about: %s\n" % line)
-  f = open(os.path.join(root, 'include/aboutmsg.h'), 'w')
+  f = open('include/aboutmsg.h', 'w')
   f.write('// generated header, see makeversion.py\n')
   f.write('#define RADIANT_ABOUTMSG "%s"\n' % line)
   f.close()
 
 # can be used as module (scons build), or by direct call
 if __name__ == '__main__':
-  root = os.path.dirname(__file__)
-  if not os.path.isabs(root):
-    root = os.getcwd()
-  radiant_makeversion(None, root)
+  radiant_makeversion(None)