Skip to content

Commit ac5f5cb

Browse files
authored
Declare setting object in settings.py (emscripten-core#13918)
Breaks at least one dependency cycle between cache.py and shared.py. This is quite a big change but it roughly equates to renaming `shared.Settings` to just `settings` in most location. This makes use of settings more concise and readable.
1 parent 92e2f3e commit ac5f5cb

14 files changed

+924
-922
lines changed

embuilder.py

+26-25
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
from tools import shared
2121
from tools import system_libs
22+
from tools.settings import settings
2223
import emscripten
2324

2425

@@ -106,9 +107,9 @@ def get_help():
106107

107108
def build_port(port_name):
108109
if force:
109-
system_libs.clear_port(port_name, shared.Settings)
110+
system_libs.clear_port(port_name, settings)
110111

111-
system_libs.build_port(port_name, shared.Settings)
112+
system_libs.build_port(port_name, settings)
112113

113114

114115
def main():
@@ -139,10 +140,10 @@ def main():
139140
shared.check_sanity()
140141

141142
if args.lto:
142-
shared.Settings.LTO = "full"
143+
settings.LTO = "full"
143144

144145
if args.pic:
145-
shared.Settings.RELOCATABLE = 1
146+
settings.RELOCATABLE = 1
146147

147148
if args.force:
148149
force = True
@@ -187,9 +188,9 @@ def main():
187188
elif what == 'icu':
188189
build_port('icu')
189190
elif what == 'zlib':
190-
shared.Settings.USE_ZLIB = 1
191+
settings.USE_ZLIB = 1
191192
build_port('zlib')
192-
shared.Settings.USE_ZLIB = 0
193+
settings.USE_ZLIB = 0
193194
elif what == 'bzip2':
194195
build_port('bzip2')
195196
elif what == 'bullet':
@@ -207,56 +208,56 @@ def main():
207208
elif what == 'sdl2':
208209
build_port('sdl2')
209210
elif what == 'sdl2-mt':
210-
shared.Settings.USE_PTHREADS = 1
211+
settings.USE_PTHREADS = 1
211212
build_port('sdl2')
212-
shared.Settings.USE_PTHREADS = 0
213+
settings.USE_PTHREADS = 0
213214
elif what == 'sdl2-gfx':
214215
build_port('sdl2_gfx')
215216
elif what == 'sdl2-image':
216217
build_port('sdl2_image')
217218
elif what == 'sdl2-image-png':
218-
shared.Settings.SDL2_IMAGE_FORMATS = ["png"]
219+
settings.SDL2_IMAGE_FORMATS = ["png"]
219220
build_port('sdl2_image')
220-
shared.Settings.SDL2_IMAGE_FORMATS = []
221+
settings.SDL2_IMAGE_FORMATS = []
221222
elif what == 'sdl2-image-jpg':
222-
shared.Settings.SDL2_IMAGE_FORMATS = ["jpg"]
223+
settings.SDL2_IMAGE_FORMATS = ["jpg"]
223224
build_port('sdl2_image')
224-
shared.Settings.SDL2_IMAGE_FORMATS = []
225+
settings.SDL2_IMAGE_FORMATS = []
225226
elif what == 'sdl2-net':
226227
build_port('sdl2_net')
227228
elif what == 'sdl2-mixer':
228-
old_formats = shared.Settings.SDL2_MIXER_FORMATS
229-
shared.Settings.SDL2_MIXER_FORMATS = []
229+
old_formats = settings.SDL2_MIXER_FORMATS
230+
settings.SDL2_MIXER_FORMATS = []
230231
build_port('sdl2_mixer')
231-
shared.Settings.SDL2_MIXER_FORMATS = old_formats
232+
settings.SDL2_MIXER_FORMATS = old_formats
232233
elif what == 'sdl2-mixer-ogg':
233-
old_formats = shared.Settings.SDL2_MIXER_FORMATS
234-
shared.Settings.SDL2_MIXER_FORMATS = ["ogg"]
234+
old_formats = settings.SDL2_MIXER_FORMATS
235+
settings.SDL2_MIXER_FORMATS = ["ogg"]
235236
build_port('sdl2_mixer')
236-
shared.Settings.SDL2_MIXER_FORMATS = old_formats
237+
settings.SDL2_MIXER_FORMATS = old_formats
237238
elif what == 'sdl2-mixer-mp3':
238-
old_formats = shared.Settings.SDL2_MIXER_FORMATS
239-
shared.Settings.SDL2_MIXER_FORMATS = ["mp3"]
239+
old_formats = settings.SDL2_MIXER_FORMATS
240+
settings.SDL2_MIXER_FORMATS = ["mp3"]
240241
build_port('sdl2_mixer')
241-
shared.Settings.SDL2_MIXER_FORMATS = old_formats
242+
settings.SDL2_MIXER_FORMATS = old_formats
242243
elif what == 'freetype':
243244
build_port('freetype')
244245
elif what == 'harfbuzz':
245246
build_port('harfbuzz')
246247
elif what == 'harfbuzz-mt':
247-
shared.Settings.USE_PTHREADS = 1
248+
settings.USE_PTHREADS = 1
248249
build_port('harfbuzz')
249-
shared.Settings.USE_PTHREADS = 0
250+
settings.USE_PTHREADS = 0
250251
elif what == 'sdl2-ttf':
251252
build_port('sdl2_ttf')
252253
elif what == 'cocos2d':
253254
build_port('cocos2d')
254255
elif what == 'regal':
255256
build_port('regal')
256257
elif what == 'regal-mt':
257-
shared.Settings.USE_PTHREADS = 1
258+
settings.USE_PTHREADS = 1
258259
build_port('regal')
259-
shared.Settings.USE_PTHREADS = 0
260+
settings.USE_PTHREADS = 0
260261
elif what == 'boost_headers':
261262
build_port('boost_headers')
262263
elif what == 'mpg123':

0 commit comments

Comments
 (0)