lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fix issue #1852: manuals needs more explicit dependencies. (issue 499604


From: janek . lilypond
Subject: Fix issue #1852: manuals needs more explicit dependencies. (issue 4996044)
Date: Fri, 09 Sep 2011 19:02:05 +0000

Reviewers: julien.rioux_gmail.com, Graham Percival,

Message:
By Julien Rioux.

Description:
Fix issue #1852: manuals needs more explicit dependencies.

Dependencies are already being tracker by lilypond-book.py,
which produces .dep files containing make rules. The file
stepmake/stepmake/generic-targets.make includes them into
the build.

The problem is that the .dep files contain errors.

We fix the .dep files produced by lilypond-book.py by
  1) using the relative path to the target file,
  2) using the correct file extension for the target file.

Please review this at http://codereview.appspot.com/4996044/

Affected files:
  M scripts/lilypond-book.py


Index: scripts/lilypond-book.py
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index b1256529fd247ae6193b906f7e7e7ce8ab15b6cc..0814739b47b890d3278ea66a5d8dc0442fd3fbe4 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -674,6 +674,7 @@ def main ():
     else:
global_options.lily_output_dir = os.path.abspath(global_options.output_dir)

+    relative_output_dir = global_options.output_dir

     identify ()
     try:
@@ -686,9 +687,8 @@ def main ():

     base_file_name = os.path.splitext (os.path.basename (files[0]))[0]
dep_file = os.path.join (global_options.output_dir, base_file_name + '.dep')
-    final_output_file = os.path.join (global_options.output_dir,
-                     base_file_name
-                     + '.%s' % global_options.format)
+    final_output_file = os.path.join (relative_output_dir,
+ base_file_name + global_options.formatter.default_extension)

     os.chdir (original_dir)
     file (dep_file, 'w').write ('%s: %s'





reply via email to

[Prev in Thread] Current Thread [Next in Thread]