Skip to content

Commit

Permalink
Merge pull request #1168 from msarahan/long_prefix
Browse files Browse the repository at this point in the history
always use long prefix
  • Loading branch information
msarahan authored Aug 3, 2016
2 parents ed323c1 + cd9b471 commit bb308b0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
6 changes: 1 addition & 5 deletions conda_build/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,7 @@ def _get_lua(self, prefix):

@property
def build_prefix(self):
if self.use_long_build_prefix is None:
raise Exception("I don't know which build prefix to use yet")
if self.use_long_build_prefix:
return self.long_build_prefix
return self.short_build_prefix
return self.long_build_prefix

@property
def build_python(self):
Expand Down
2 changes: 1 addition & 1 deletion conda_build/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def build(m, bld_bat, dirty=False, activate=True):
fo.write("set LIB={};%LIB%\n".format(env["LIBRARY_LIB"]))
fo.write(msvc_env_cmd(bits=cc.bits, override=m.get_value('build/msvc_compiler', None)))
if activate:
fo.write("call activate.bat _build\n")
fo.write("call activate.bat {0}\n".format(config.build_prefix))
fo.write("REM ===== end generated header =====\n")
fo.write(data)

Expand Down
2 changes: 2 additions & 0 deletions tests/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ def test_find_prefix_files():
"""
# create a temporary folder
prefix = os.path.join(sys.prefix, "envs", "_build")
# duplicate long build prefix
prefix = max(prefix, (prefix + 8 * '_placehold')[:80])
if not os.path.isdir(prefix):
os.makedirs(prefix)
with TemporaryDirectory(prefix=prefix + os.path.sep) as tmpdir:
Expand Down

0 comments on commit bb308b0

Please sign in to comment.