Improvements to make_distrib tool (issue #260).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@307 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-10-10 12:02:52 +00:00
parent 1c2f102bb0
commit bb90cc00c4
1 changed files with 15 additions and 5 deletions

View File

@ -116,8 +116,18 @@ script_dir = os.path.dirname(__file__)
# CEF root directory # CEF root directory
cef_dir = os.path.abspath(os.path.join(script_dir, os.pardir)) cef_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
# Test the operating system.
platform = '';
if sys.platform == 'win32':
platform = 'windows'
elif sys.platform == 'darwin':
platform = 'macosx'
elif sys.platform == 'linux2':
platform = 'linux'
# output directory # output directory
output_dir = os.path.abspath(os.path.join(options.outputdir, 'cef_binary_r'+cef_rev)) output_dir = os.path.abspath(os.path.join(options.outputdir, \
'cef_binary_r'+cef_rev+'_'+platform))
remove_dir(output_dir, options.quiet) remove_dir(output_dir, options.quiet)
make_dir(output_dir, options.quiet) make_dir(output_dir, options.quiet)
@ -163,7 +173,7 @@ write_file(os.path.join(output_dir, 'cef_paths.gypi'), data)
transfer_files(cef_dir, script_dir, os.path.join(script_dir, 'distrib/transfer.cfg'), \ transfer_files(cef_dir, script_dir, os.path.join(script_dir, 'distrib/transfer.cfg'), \
output_dir, options.quiet) output_dir, options.quiet)
if sys.platform == 'win32': if platform == 'windows':
# create the README.TXT file # create the README.TXT file
create_readme(os.path.join(script_dir, 'distrib/win/README.TXT'), output_dir, cef_rev, \ create_readme(os.path.join(script_dir, 'distrib/win/README.TXT'), output_dir, cef_rev, \
chromium_rev, date) chromium_rev, date)
@ -212,7 +222,7 @@ if sys.platform == 'win32':
# transfer docs files # transfer docs files
dst_dir = os.path.join(output_dir, 'docs') dst_dir = os.path.join(output_dir, 'docs')
src_dir = os.path.join(cef_dir, 'docs') src_dir = os.path.join(cef_dir, 'docs')
if path_exists(dst_dir): if path_exists(src_dir):
copy_dir(src_dir, dst_dir, options.quiet) copy_dir(src_dir, dst_dir, options.quiet)
# transfer additional files, if any # transfer additional files, if any
@ -224,7 +234,7 @@ if sys.platform == 'win32':
generate_msvs_projects('2008'); generate_msvs_projects('2008');
generate_msvs_projects('2010'); generate_msvs_projects('2010');
elif sys.platform == 'darwin': elif platform == 'macosx':
# create the README.TXT file # create the README.TXT file
create_readme(os.path.join(script_dir, 'distrib/mac/README.TXT'), output_dir, cef_rev, \ create_readme(os.path.join(script_dir, 'distrib/mac/README.TXT'), output_dir, cef_rev, \
chromium_rev, date) chromium_rev, date)
@ -277,7 +287,7 @@ elif sys.platform == 'darwin':
data = data.replace('../../../', '') data = data.replace('../../../', '')
write_file(src_file, data) write_file(src_file, data)
elif sys.platform == 'linux2': elif platform == 'linux':
# transfer include files # transfer include files
transfer_gypi_files(cef_dir, cef_paths['includes_linux'], \ transfer_gypi_files(cef_dir, cef_paths['includes_linux'], \
'include/', include_dir, options.quiet) 'include/', include_dir, options.quiet)