Cleanup: remove Simple_font_metric, Font_metric::text_dimension

[lilypond.git] / python / lilylib.py

diff --git a/python/lilylib.py b/python/lilylib.py
index cfa5e67d0a7b0de58428f76b3ea96efac1cecdc1..3bdfa1c35cb48a1b5b6c84ca96dac767f821d86e 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -1,17 +1,26 @@
-###############################################################
-# lilylib.py -- options and stuff
-# 
-# source file of the GNU LilyPond music typesetter
+# This file is part of LilyPond, the GNU music typesetter.
 #
-# (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
-#                 Jan Nieuwenhuizen <janneke@gnu.org>
+# Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+#                Jan Nieuwenhuizen <janneke@gnu.org>
+#
+# LilyPond 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 3 of the License, or
+# (at your option) any later version.
+#
+# LilyPond 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 LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 import __main__
 import glob
 import os
 import re
 import shutil
-import string
 import sys
 import optparse
 
@@ -19,24 +28,6 @@ import optparse
 # Users of python modules should include this snippet
 # and customize variables below.
 
-# We'll suffer this path init stuff as long as we don't install our
-# python packages in <prefix>/lib/pythonx.y (and don't kludge around
-# it as we do with teTeX on Red Hat Linux: set some environment var
-# (PYTHONPATH) in profile)
-
-# If set, LILYPOND_DATADIR must take prevalence
-# if datadir is not set, we're doing a build and LILYPOND_DATADIR
-
-datadir = '@local_lilypond_datadir@'
-if not os.path.isdir (datadir):
-    datadir = '@lilypond_datadir@'
-if os.environ.has_key ('LILYPOND_DATADIR') :
-    datadir = os.environ['LILYPOND_DATADIR']
-    while datadir[-1] == os.sep:
-       datadir= datadir[:-1]
-
-sys.path.insert (0, os.path.join (datadir, 'python'))
-
 
 # Python 2.5 only accepts strings with proper Python internal encoding
 # (i.e. ASCII or Unicode) when writing to stdout/stderr, so we must
@@ -69,6 +60,14 @@ def stderr_write (s):
 
 progress = stderr_write
 
+def require_python_version ():
+    if sys.hexversion < 0x02040000:
+        stderr_write ("Python 2.4 or newer is required to run this program.\n\
+Please upgrade Python from http://python.org/download/, and if you use MacOS X,\n\
+please read 'Setup for MacOS X' in Application Usage.")
+        os.system ("open http://python.org/download/")
+        sys.exit (2)
+
 # Modified version of the commands.mkarg(x), which always uses 
 # double quotes (since Windows can't handle the single quotes:
 def mkarg(x):
@@ -185,7 +184,7 @@ def strip_extension (f, ext):
 
 def search_exe_path (name):
     p = os.environ['PATH']
-    exe_paths = string.split (p, ':')
+    exe_paths = p.split (':')
     for e in exe_paths:
        full = os.path.join (e, name)
        if os.path.exists (full):