bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the make_distrib.py script to fix "allow-partial" on Windows and for consistency across platforms (issue #621). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@666 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-06-04 17:19:12 +00:00
parent 06bc30a802
commit b8a3120222
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tools/make_distrib.py
View File

@ -279,46 +279,44 @@ if platform == 'windows':
'tests/cefclient/', cefclient_dir, options.quiet) 'tests/cefclient/', cefclient_dir, options.quiet)
# transfer build/Debug files # transfer build/Debug files
if not options.allowpartial or path_exists(os.path.join(cef_dir, 'Debug')): build_dir = os.path.join(src_dir, 'build/Debug');
binary_dir = os.path.join(src_dir, 'build/Debug'); if not options.allowpartial or path_exists(build_dir):
dst_dir = os.path.join(output_dir, 'Debug') dst_dir = os.path.join(output_dir, 'Debug')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
copy_files(os.path.join(script_dir, 'distrib/win/*.dll'), dst_dir, options.quiet) copy_files(os.path.join(script_dir, 'distrib/win/*.dll'), dst_dir, options.quiet)
copy_files(os.path.join(binary_dir, '*.dll'), dst_dir, options.quiet) copy_files(os.path.join(build_dir, '*.dll'), dst_dir, options.quiet)
copy_file(os.path.join(binary_dir, 'cefclient.exe'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cefclient.exe'), dst_dir, options.quiet)
copy_file(os.path.join(binary_dir, 'cef.pak'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cef.pak'), dst_dir, options.quiet)
copy_dir(os.path.join(binary_dir, 'locales'), os.path.join(dst_dir, 'locales'), \ copy_dir(os.path.join(build_dir, 'locales'), os.path.join(dst_dir, 'locales'), \
options.quiet) options.quiet)
# transfer lib/Debug files # transfer lib/Debug files
dst_dir = os.path.join(output_dir, 'lib/Debug') dst_dir = os.path.join(output_dir, 'lib/Debug')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
copy_file(os.path.join(binary_dir, 'lib/libcef.lib'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'lib/libcef.lib'), dst_dir, options.quiet)
else: else:
sys.stderr.write("No Debug build files.\n") sys.stderr.write("No Debug build files.\n")
# transfer build/Release files # transfer build/Release files
if not options.allowpartial or path_exists(os.path.join(cef_dir, 'Release')): build_dir = os.path.join(src_dir, 'build/Release');
binary_dir = os.path.join(src_dir, 'build/Release'); if not options.allowpartial or path_exists(build_dir):
dst_dir = os.path.join(output_dir, 'Release') dst_dir = os.path.join(output_dir, 'Release')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
copy_files(os.path.join(script_dir, 'distrib/win/*.dll'), dst_dir, options.quiet) copy_files(os.path.join(script_dir, 'distrib/win/*.dll'), dst_dir, options.quiet)
copy_files(os.path.join(binary_dir, '*.dll'), dst_dir, options.quiet) copy_files(os.path.join(build_dir, '*.dll'), dst_dir, options.quiet)
copy_file(os.path.join(binary_dir, 'cefclient.exe'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cefclient.exe'), dst_dir, options.quiet)
copy_file(os.path.join(binary_dir, 'cef.pak'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cef.pak'), dst_dir, options.quiet)
copy_dir(os.path.join(binary_dir, 'locales'), os.path.join(dst_dir, 'locales'), \ copy_dir(os.path.join(build_dir, 'locales'), os.path.join(dst_dir, 'locales'), \
options.quiet) options.quiet)
# transfer lib/Release files # transfer lib/Release files
dst_dir = os.path.join(output_dir, 'lib/Release') dst_dir = os.path.join(output_dir, 'lib/Release')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
copy_file(os.path.join(binary_dir, 'lib/libcef.lib'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'lib/libcef.lib'), dst_dir, options.quiet)
if not options.nosymbols: if not options.nosymbols:
# transfer symbols # transfer symbols
copy_file(os.path.join(binary_dir, 'libcef.pdb'), symbol_dir, options.quiet) copy_file(os.path.join(build_dir, 'libcef.pdb'), symbol_dir, options.quiet)
else: else:
sys.stderr.write("No Release build files.\n") sys.stderr.write("No Release build files.\n")
@ -412,33 +410,31 @@ elif platform == 'macosx':
write_file(src_file, data) write_file(src_file, data)
elif platform == 'linux': elif platform == 'linux':
linux_build_dir = os.path.join(cef_dir, os.pardir, 'out')
# create the README.TXT file # create the README.TXT file
create_readme(os.path.join(script_dir, 'distrib/linux/README.txt'), output_dir, cef_url, \ create_readme(os.path.join(script_dir, 'distrib/linux/README.txt'), output_dir, cef_url, \
cef_rev, cef_ver, chromium_url, chromium_rev, chromium_ver, date) cef_rev, cef_ver, chromium_url, chromium_rev, chromium_ver, date)
# transfer build/Debug files # transfer out/Debug files
if not options.allowpartial or path_exists(os.path.join(linux_build_dir, 'Debug')): build_dir = os.path.join(src_dir, 'out/Debug');
if not options.allowpartial or path_exists(build_dir):
dst_dir = os.path.join(output_dir, 'Debug') dst_dir = os.path.join(output_dir, 'Debug')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
copy_dir(os.path.join(linux_build_dir, 'Debug/lib.target'), os.path.join(dst_dir, 'lib.target'), options.quiet) copy_dir(os.path.join(build_dir, 'lib.target'), os.path.join(dst_dir, 'lib.target'), options.quiet)
copy_file(os.path.join(linux_build_dir, 'Debug/cefclient'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cefclient'), dst_dir, options.quiet)
copy_file(os.path.join(linux_build_dir, 'Debug/cef.pak'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cef.pak'), dst_dir, options.quiet)
copy_dir(os.path.join(linux_build_dir, 'Debug/locales'), os.path.join(dst_dir, 'locales'), options.quiet) copy_dir(os.path.join(build_dir, 'locales'), os.path.join(dst_dir, 'locales'), options.quiet)
else: else:
sys.stderr.write("No Debug build files.\n") sys.stderr.write("No Debug build files.\n")
# transfer build/Release files # transfer out/Release files
if not options.allowpartial or path_exists(os.path.join(linux_build_dir, 'Release')): build_dir = os.path.join(src_dir, 'out/Release');
if not options.allowpartial or path_exists(build_dir):
dst_dir = os.path.join(output_dir, 'Release') dst_dir = os.path.join(output_dir, 'Release')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
copy_dir(os.path.join(linux_build_dir, 'Release/lib.target'), os.path.join(dst_dir, 'lib.target'), options.quiet) copy_dir(os.path.join(build_dir, 'lib.target'), os.path.join(dst_dir, 'lib.target'), options.quiet)
copy_file(os.path.join(linux_build_dir, 'Release/cefclient'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cefclient'), dst_dir, options.quiet)
copy_file(os.path.join(linux_build_dir, 'Release/cef.pak'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cef.pak'), dst_dir, options.quiet)
copy_dir(os.path.join(linux_build_dir, 'Release/locales'), os.path.join(dst_dir, 'locales'), options.quiet) copy_dir(os.path.join(build_dir, 'locales'), os.path.join(dst_dir, 'locales'), options.quiet)
else: else:
sys.stderr.write("No Release build files.\n") sys.stderr.write("No Release build files.\n")