Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

build: i18n: move noisy variables to separate .gypi #8508

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ deps/zlib/zlib.target.mk

# test artifacts
tools/faketime
icu_config.gypi
33 changes: 24 additions & 9 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,14 @@ def configure_winsdk(o):
print('ctrpp not found in WinSDK path--using pre-gen files '
'from tools/msvs/genfiles.')

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

do_not_edit = '# Do not edit. Generated by the configure script.\n'

def glob_to_var(dir_base, dir_sub):
list = []
dir_all = os.path.join(dir_base, dir_sub)
Expand All @@ -703,8 +711,18 @@ def glob_to_var(dir_base, dir_sub):
break
return list


def configure_intl(o):
icu_config = {
'variables': {}
}
icu_config_name = 'icu_config.gypi'
def write_config(data, name):
return

# write an empty file to start with
write(icu_config_name, do_not_edit +
pprint.pformat(icu_config, indent=2) + '\n')

# small ICU is off by default.
# always set icu_small, node.gyp depends on it being defined.
o['variables']['icu_small'] = b(False)
Expand Down Expand Up @@ -821,7 +839,10 @@ def configure_intl(o):
for i in icu_src:
var = 'icu_src_%s' % i
path = '../../deps/icu/source/%s' % icu_src[i]
o['variables'][var] = glob_to_var('tools/icu', path)
icu_config['variables'][var] = glob_to_var('tools/icu', path)
# write updated icu_config.gypi with a bunch of paths
write(icu_config_name, do_not_edit +
pprint.pformat(icu_config, indent=2) + '\n')
return # end of configure_intl

# determine the "flavor" (operating system) we're building for,
Expand Down Expand Up @@ -860,13 +881,7 @@ output = {
}
pprint.pprint(output, indent=2)

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

write('config.gypi', '# Do not edit. Generated by the configure script.\n' +
write('config.gypi', do_not_edit +
pprint.pformat(output, indent=2) + '\n')

config = {
Expand Down
1 change: 1 addition & 0 deletions tools/icu/icu-generic.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'variables': {
'icu_src_derb': [ '../../deps/icu/source/tools/genrb/derb.c' ],
},
'includes': [ '../../icu_config.gypi' ],
'targets': [
{
# a target to hold uconfig defines.
Expand Down