diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.py | 5 | ||||
| -rwxr-xr-x | scripts/makedmg.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/build.py b/scripts/build.py index 72c7d3571ad..6cd795a744f 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -245,7 +245,10 @@ def build_qtcreatorcdbext(args, paths): return if not os.path.exists(paths.qtcreatorcdbext_build): os.makedirs(paths.qtcreatorcdbext_build) - prefix_paths = [common.to_posix_path(os.path.abspath(fp)) for fp in args.prefix_paths] + prefix_paths = [os.path.abspath(fp) for fp in args.prefix_paths] + if paths.llvm: + prefix_paths += [paths.llvm] + prefix_paths = [common.to_posix_path(fp) for fp in prefix_paths] cmake_args = ['-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths), '-DCMAKE_INSTALL_PREFIX=' + common.to_posix_path(paths.qtcreatorcdbext_install)] cmake_args += common_cmake_arguments(args) diff --git a/scripts/makedmg.py b/scripts/makedmg.py index 9d7fd7f5f57..f77f03ad263 100755 --- a/scripts/makedmg.py +++ b/scripts/makedmg.py @@ -40,7 +40,7 @@ def main(): license_file = arguments.license_replacement shutil.copy(license_file, tempdir) dmg_cmd = ['hdiutil', 'create', '-srcfolder', tempdir, '-volname', arguments.dmg_volumename, - '-format', 'UDBZ', arguments.target_diskimage, '-ov', '-scrub', '-size', arguments.dmg_size, '-verbose'] + '-format', 'ULMO', arguments.target_diskimage, '-ov', '-scrub', '-size', arguments.dmg_size, '-verbose'] subprocess.check_call(dmg_cmd) # sleep a few seconds to make sure disk image is fully unmounted etc time.sleep(5) |