Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: tools/generate_library_loader/generate_library_loader.py

Issue 11414271: Linux library loaders: use relative path for includes (for distcc). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/generate_library_loader/generate_library_loader.py
diff --git a/tools/generate_library_loader/generate_library_loader.py b/tools/generate_library_loader/generate_library_loader.py
index edf0706a76a8d56301ba07f7f67f11781edf24a1..1bd601c99ff76ee20a9b8b362877bbfcdd27df31 100755
--- a/tools/generate_library_loader/generate_library_loader.py
+++ b/tools/generate_library_loader/generate_library_loader.py
@@ -162,10 +162,12 @@ def main():
if not args:
parser.error('No function names specified')
- # Make sure we are always dealing with an absolute path
+ # Make sure we are always dealing with paths relative to source tree root
# to avoid issues caused by different relative path roots.
- options.output_cc = os.path.abspath(options.output_cc)
- options.output_h = os.path.abspath(options.output_h)
+ source_tree_root = os.path.abspath(
+ os.path.join(os.path.dirname(__file__), '..', '..'))
+ options.output_cc = os.path.relpath(options.output_cc, source_tree_root)
+ options.output_h = os.path.relpath(options.output_h, source_tree_root)
# Create a unique prefix, e.g. for header guards.
# Stick a known string at the beginning to ensure this doesn't begin
@@ -211,7 +213,7 @@ def main():
# Make it easier for people to find the code generator just in case.
# Doing it this way is more maintainable, because it's going to work
# even if file gets moved without updating the contents.
- generator_path = os.path.abspath(__file__)
+ generator_path = os.path.relpath(__file__, source_tree_root)
header_contents = HEADER_TEMPLATE % {
'generator_path': generator_path,
@@ -230,13 +232,13 @@ def main():
'member_cleanup': ''.join(member_cleanup),
}
- header_file = open(options.output_h, 'w')
+ header_file = open(os.path.join(source_tree_root, options.output_h), 'w')
try:
header_file.write(header_contents)
finally:
header_file.close()
- impl_file = open(options.output_cc, 'w')
+ impl_file = open(os.path.join(source_tree_root, options.output_cc), 'w')
try:
impl_file.write(impl_contents)
finally:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698