Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Files json #1501

Merged
merged 5 commits into from
Nov 14, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Build files.json using the right file paths
  • Loading branch information
soapy1 committed Nov 14, 2016
commit 8eaf372bdf901547be544531acf1e2235dcd5c4b
28 changes: 13 additions & 15 deletions conda_build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,21 +424,20 @@ def create_info_files(m, files, config, prefix):
# make sure we use '/' path separators in metadata
files = [_f.replace('\\', '/') for _f in files]

short_paths = files
if is_noarch_python(m):
for index, short_path in enumerate(short_paths):
if short_path.find("site-packages") > 0:
short_paths[index] = short_path[short_path.find("site-packages"):]
elif short_path.startswith("bin") and (short_path not in entry_point_script_names):
short_paths[index] = short_path.replace("bin", "python-scripts")
elif short_path.startswith("Scripts") and (short_path not in entry_point_script_names):
short_paths[index] = short_path.replace("Scripts", "python-scripts")
elif m.get_value('build/noarch_python'):
short_paths = []

with open(join(config.info_dir, 'files'), **mode_dict) as fo:
for f in short_paths:
fo.write(f + "\n")
if m.get_value('build/noarch_python'):
fo.write('\n')
elif is_noarch_python(m):
for f in files:
if f.find("site-packages") > 0:
fo.write(f[f.find("site-packages"):] + '\n')
elif f.startswith("bin") and (f not in entry_point_script_names):
fo.write(f.replace("bin", "python-scripts") + '\n')
elif f.startswith("Scripts") and (f not in entry_point_script_names):
fo.write(f.replace("Scripts", "python-scripts") + '\n')
else:
for f in files:
fo.write(f + '\n')

no_link = m.get_value('build/no_link')
if no_link:
Expand All @@ -453,7 +452,6 @@ def create_info_files(m, files, config, prefix):
files_with_prefix = get_files_with_prefix(m, files, prefix)
create_info_files_json(m, config.info_dir, prefix, files, files_with_prefix)


detect_and_record_prefix_files(m, files, prefix, config)
write_no_link(m, config, files)

Expand Down