diff options
| author | John Gourlay <john@weathervanefarm.net> | 2016-06-10 10:22:41 -0400 |
|---|---|---|
| committer | John Gourlay <john@weathervanefarm.net> | 2016-06-10 10:22:41 -0400 |
| commit | 720bdb29cfac44d9469a54d44bb002e1ccab15f9 (patch) | |
| tree | 95152b2f8cd97d09175953e979dbf39315671e61 /scripts | |
| parent | 57a6fdce712bbdc538b712b319d28366e05b7495 (diff) | |
| parent | 37da55e4c857a21b017981eed0a28943e9fae119 (diff) | |
Bring dev/johngourlay/issue-4751 up to date with respect to staging.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/create-weblinks-itexi.py | 2 | ||||
| -rw-r--r-- | scripts/midi2ly.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/build/create-weblinks-itexi.py b/scripts/build/create-weblinks-itexi.py index e529ca7327..e631c27fd8 100644 --- a/scripts/build/create-weblinks-itexi.py +++ b/scripts/build/create-weblinks-itexi.py @@ -554,7 +554,7 @@ def make_regtest_links(name, version, lang): getTrans("PDF of lilypond-book regtests for ", lang)+version) def make_doctarball_links(name, version, lang): - url = depth + "download/binaries/documentation/lilypond-" + url = depth + "downloads/binaries/documentation/lilypond-" # ugly FIXME, but proper build number support isn't Critical. url += version + "-1" url += ".documentation.tar.bz2" diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index f4a47fb79a..5358fc4698 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -32,7 +32,6 @@ import sys @relocate-preamble@ """ -import midi import lilylib as ly global _;_=ly._ @@ -923,6 +922,9 @@ class Staff: return dump_track (self.voices, i) def convert_midi (in_file, out_file): + global midi + import midi + global clocks_per_1, clocks_per_4, key global start_quant_clocks global duration_quant_clocks |