1 --- tbb_ref/build/build.py
4 if is_win and args.msbuild:
5 preview_release_dir = release_dir = jp(args.tbbroot, 'build', 'vs'+args.vs, args.vs_platform, 'Release')
6 if not args.no_rebuild or not os.path.isdir(release_dir):
7 - assert os.system('msbuild /m /p:Platform=%s /p:Configuration=Release %s build/vs%s/makefile.sln'% \
8 - (args.vs_platform, args.build_args, args.vs)) == 0
9 + assert os.system('msbuild /m /p:Platform=%s /p:Configuration=Release %s build/vs%s/makefile.sln'%(args.vs_platform, args.build_args, args.vs)) == 0
10 preview_debug_dir = debug_dir = jp(args.tbbroot, 'build', 'vs'+args.vs, args.vs_platform, 'Debug')
11 if not args.no_rebuild or not os.path.isdir(debug_dir):
12 - assert os.system('msbuild /m /p:Platform=%s /p:Configuration=Debug %s build/vs%s/makefile.sln'% \
13 - (args.vs_platform, args.build_args, args.vs)) == 0
14 + assert os.system('msbuild /m /p:Platform=%s /p:Configuration=Debug %s build/vs%s/makefile.sln'%(args.vs_platform, args.build_args, args.vs)) == 0
16 release_dir = jp(args.tbbroot, 'build', args.build_prefix+'_release')
17 debug_dir = jp(args.tbbroot, 'build', args.build_prefix+'_debug')
19 paths = [os.path.abspath(d) for d in [args.prefix, inc_dir, irml_dir, lib_dir]+release_dirs]
20 os.environ["TBBROOT"] = paths[0]
21 # all the paths must be relative to python/ directory or be absolute
22 - assert system('python python/setup.py build -b%s build_ext -I%s -L%s install -f'% \
23 - (paths[2], paths[1], ':'.join(paths[2:]))) == 0
24 + assert system('python python/setup.py build -b%s build_ext -I%s -L%s install -f --prefix=%s'% \
25 + (paths[2], paths[1], ':'.join(paths[2:]), args.prefix)) == 0
28 --- tbb_ref/build/windows.inc
29 +++ tbb/build/windows.inc
31 # See the License for the specific language governing permissions and
32 # limitations under the License.
38 test_dir:=$(tbb_build_dir)