Skip to content

build: Make configure file parseable on python3 #9657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kalrover wants to merge 5 commits into from
Closed

build: Make configure file parseable on python3 #9657

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fc8aae
build: Make configure file parseable on python3
kalrover Nov 17, 2016
6d786b5
Fix message & long line
kalrover Nov 18, 2016
6f82f8b
Fix try statement
kalrover Nov 21, 2016
aff20c6
Remove redundant parentheses
kalrover Nov 21, 2016
2303ff7
Check python 2.6 or 2.7
kalrover Nov 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove redundant parentheses
  • Loading branch information
@kalrover
kalrover committed Nov 24, 2016
commit aff20c6af92f40407b1606692a14a232dbdedb85
12 changes: 6 additions & 6 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ def configure_static(o):

def write(filename, data):
filename = os.path.join(root_dir, filename)
print('creating ', filename)
print('creating %s' % filename)
f = open(filename, 'w+')
f.write(data)

Expand Down Expand Up @@ -1119,12 +1119,12 @@ def configure_intl(o):
# --with-icu-source processing
# now, check that they didn't pass --with-icu-source=deps/icu
elif with_icu_source and os.path.abspath(icu_full_path) == os.path.abspath(with_icu_source):
print('Ignoring redundant --with-icu-source=%s' % (with_icu_source))
print('Ignoring redundant --with-icu-source=%s' % with_icu_source)
with_icu_source = None
# if with_icu_source is still set, try to use it.
if with_icu_source:
if os.path.isdir(icu_full_path):
print('Deleting old ICU source: %s' % (icu_full_path))
print('Deleting old ICU source: %s' % icu_full_path)
shutil.rmtree(icu_full_path)
# now, what path was given?
if os.path.isdir(with_icu_source):
Expand Down Expand Up @@ -1163,17 +1163,17 @@ def configure_intl(o):
# ICU source dir relative to tools/icu (for .gyp file)
o['variables']['icu_path'] = icu_full_path
if not os.path.isdir(icu_full_path):
print('* ECMA-402 (Intl) support didn\'t find ICU in %s..' % (icu_full_path))
print('* ECMA-402 (Intl) support didn\'t find ICU in %s..' % icu_full_path)
# can we download (or find) a zipfile?
localzip = icu_download(icu_full_path)
if localzip:
nodedownload.unpack(localzip, icu_parent_path)
if not os.path.isdir(icu_full_path):
print(' Cannot build Intl without ICU in %s.' % (icu_full_path))
print(' Cannot build Intl without ICU in %s.' % icu_full_path)
print(' (Fix, or disable with "--with-intl=none" )')
sys.exit(1)
else:
print('* Using ICU in %s' % (icu_full_path))
print('* Using ICU in %s' % icu_full_path)
# Now, what version of ICU is it? We just need the "major", such as 54.
# uvernum.h contains it as a #define.
uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h')
Expand Down