From 46f5779074ec19a96f6a0e06d039a55a2b8ef6e3 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 27 Dec 2009 23:54:01 +0000 Subject: [PATCH] Build: fix python style issues. --- scripts/build/create-version-itexi.py | 171 +++++++++++++------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/scripts/build/create-version-itexi.py b/scripts/build/create-version-itexi.py index a7b14b0c7d..0a50a466fe 100644 --- a/scripts/build/create-version-itexi.py +++ b/scripts/build/create-version-itexi.py @@ -10,6 +10,8 @@ import glob +# FIXME: if the depth depends on the type of build, figure it +# out automatically. ### just like depth in our GNUmakefiles # these links are relative from /~graham/web/ depth = "../../" @@ -26,12 +28,12 @@ VERSION_STABLE = "" VERSION_DEVEL = "" try: - topDir = sys.argv[1] + topDir = sys.argv[1] except: - myDir = os.path.dirname(sys.argv[0]) - # use two abspaths to work around some windows python bug - topDir = os.path.join(os.path.abspath(myDir)+os.sep+'..'+os.sep+'..'+os.sep) - topDir = os.path.abspath( topDir ) + myDir = os.path.dirname(sys.argv[0]) + # use two abspaths to work around some windows python bug + topDir = os.path.join(os.path.abspath(myDir)+os.sep+'..'+os.sep+'..'+os.sep) + topDir = os.path.abspath( topDir ) # TODO: this might be useful for other scripts; can we make it available? @@ -49,101 +51,98 @@ major = 0 minor = 0 patch = 0 for line in version_contents: - if (line[0:13] == 'MAJOR_VERSION'): - major = line[14:-1] - if (line[0:13] == 'MINOR_VERSION'): - minor = line[14:-1] - if (line[0:11] == 'PATCH_LEVEL'): - patch = line[12:-1] - if (line[0:14] == 'VERSION_STABLE'): - VERSION_STABLE = line[15:-1] - if (line[0:13] == 'VERSION_DEVEL'): - VERSION_DEVEL = line[14:-1] + if (line.startswith('MAJOR_VERSION')): + major = line[14:-1] + if (line.startswith('MINOR_VERSION')): + minor = line[14:-1] + if (line.startswith('PATCH_LEVEL')): + patch = line[12:-1] + if (line.startswith('VERSION_STABLE')): + VERSION_STABLE = line[15:-1] + if (line.startswith('VERSION_DEVEL')): + VERSION_DEVEL = line[14:-1] VERSION = str(major)+'.'+str(minor)+'.'+str(patch) def make_macro(name, string): - print "@macro", name - print string - print "@end macro" - print "" + print "@macro", name + print string + print "@end macro" + print "" def make_download(name, osA, osB, version, revision, text): - string = "@uref{http://download.linuxaudio.org/lilypond/binaries/" - string += osA + "lilypond-" - string += version + "-" + revision - string += "." + osB + ",\n" - string += text - string += ": LilyPond " - string += version + "-" + revision - string += "}" - make_macro(name, string) + string = "@uref{http://download.linuxaudio.org/lilypond/binaries/" + string += osA + "lilypond-" + string += version + "-" + revision + string += "." + osB + ",\n" + string += text + string += ": LilyPond " + string += version + "-" + revision + string += "}" + make_macro(name, string) def make_download_source(name, vstring, version): - string = "@uref{http://download.linuxaudio.org/lilypond/sources/" - string += vstring + "/" - string += "lilypond-" + version + ".tar.gz" - string += ", " - string += "lilypond-" + version + ".tar.gz" - string += "}" - make_macro(name, string) + string = "@uref{http://download.linuxaudio.org/lilypond/sources/" + string += vstring + "/" + string += "lilypond-" + version + ".tar.gz" + string += ", " + string += "lilypond-" + version + ".tar.gz" + string += "}" + make_macro(name, string) def make_all_downloads(macroName, version): - make_download("download"+macroName+"LinuxNormal", "linux-x86/", - "linux-x86.sh", version, "1", "Linux x86") - make_download("download"+macroName+"LinuxBig", "linux-64/", - "linux-64.sh", version, "1", "Linux 64") - make_download("download"+macroName+"LinuxPPC", "linux-ppc/", - "linux-ppc.sh", version, "1", "Linux PPC") - - make_download("download"+macroName+"FreeBSDNormal", "freebsd-x86/", - "freebsd-x86.sh", version, "1", "FreeBSD i386") - make_download("download"+macroName+"FreeBSDBig", "freebsd-x86/", - "freebsd-64.sh", version, "1", "FreeBSD amd64") - - make_download("download"+macroName+"DarwinNormal", "darwin-x86/", - "darwin-x86.tar.bz2", version, "1", "MacOS X x86") - make_download("download"+macroName+"DarwinPPC", "darwin-ppc/", - "darwin-ppc.tar.bz2", version, "1", "MacOS X PPC") - - make_download("download"+macroName+"Windows", "mingw/", - "mingw.exe", version, "1", "Windows") + make_download("download"+macroName+"LinuxNormal", "linux-x86/", + "linux-x86.sh", version, "1", "Linux x86") + make_download("download"+macroName+"LinuxBig", "linux-64/", + "linux-64.sh", version, "1", "Linux 64") + make_download("download"+macroName+"LinuxPPC", "linux-ppc/", + "linux-ppc.sh", version, "1", "Linux PPC") + + make_download("download"+macroName+"FreeBSDNormal", "freebsd-x86/", + "freebsd-x86.sh", version, "1", "FreeBSD i386") + make_download("download"+macroName+"FreeBSDBig", "freebsd-x86/", + "freebsd-64.sh", version, "1", "FreeBSD amd64") + + make_download("download"+macroName+"DarwinNormal", "darwin-x86/", + "darwin-x86.tar.bz2", version, "1", "MacOS X x86") + make_download("download"+macroName+"DarwinPPC", "darwin-ppc/", + "darwin-ppc.tar.bz2", version, "1", "MacOS X PPC") + + make_download("download"+macroName+"Windows", "mingw/", + "mingw.exe", version, "1", "Windows") def make_ver_link(macroname, version, url, linktext): - string = "@uref{" - # TODO: generalize this - if (version[:4] == '2.13'): - string += WEB_DOCLINK_DEVEL - if (version[:4] == '2.12'): - string += WEB_DOCLINK_STABLE - string += url - string += "," - string += linktext - string += "}" - make_macro(macroname, string) + string = "@uref{" + # TODO: generalize this + if (version[:4] == '2.13'): + string += WEB_DOCLINK_DEVEL + if (version[:4] == '2.12'): + string += WEB_DOCLINK_STABLE + string += url + string += "," + string += linktext + string += "}" + make_macro(macroname, string) def make_manual_links(name, version): - for m in manuals: - # FIXME: this is disgusting - manual = m - #mshort = 'glossary' if m=='music-glossary' else m - # grr, GUB only has python 2.4.5. :( - if (m=='music-glossary'): - mshort = 'glossary' - else: - mshort = m - make_ver_link("manual"+name+mshort.capitalize()+'Pdf', - version, - manual + '.pdf', - manual.capitalize() + '.pdf') - make_ver_link("manual"+name+mshort.capitalize()+'Split', - version, - manual+'/index.html', - manual.capitalize() + ' (split HTML)') - make_ver_link("manual"+name+mshort.capitalize()+'Big', - version, - manual+'-big-page.html', - manual.capitalize() + ' (big HTML)') + for m in manuals: + manual = m + if (m=='music-glossary'): + mshort = 'glossary' + else: + mshort = m + make_ver_link("manual"+name+mshort.capitalize()+'Pdf', + version, + manual + '.pdf', + manual.capitalize() + '.pdf') + make_ver_link("manual"+name+mshort.capitalize()+'Split', + version, + manual+'/index.html', + manual.capitalize() + ' (split HTML)') + make_ver_link("manual"+name+mshort.capitalize()+'Big', + version, + manual+'-big-page.html', + manual.capitalize() + ' (big HTML)') print "@c ************************ Version numbers ************" -- 2.39.5