diff --git a/command_line.py b/command_line.py index d56a2fd..bf0c233 100644 --- a/command_line.py +++ b/command_line.py @@ -75,7 +75,7 @@ class Setting(object): self.description = kwargs.pop('description', '') self.values = kwargs.pop('values', []) - self.set_extra_attributes_from_keyword_args(kwargs) + self.set_extra_attributes_from_keyword_args(**kwargs) if self.value is None: self.value = self.default_value @@ -112,7 +112,7 @@ class Setting(object): return self.extract_file.format(version) return '' - def set_extra_attributes_from_keyword_args(self, kwargs): + def set_extra_attributes_from_keyword_args(self, **kwargs): for undefined_key, undefined_value in kwargs.items(): setattr(self, undefined_key, undefined_value) @@ -205,18 +205,16 @@ class CommandBase(object): contents = contents.replace('{DEFAULT_DOWNLOAD_PATH}', DEFAULT_DOWNLOAD_PATH) config_io = StringIO(contents) - config = ConfigObj(config_io, unrepr=True) + config = ConfigObj(config_io, unrepr=True).dict() settings = {'setting_groups': []} setting_items = (config['setting_groups'].items() + [('export_settings', config['export_settings'])]) for setting_group, setting_group_dict in setting_items: settings[setting_group] = {} for setting_name, setting_dict in setting_group_dict.items(): - for key in setting_dict.keys(): + for key, val in setting_dict.items(): if '_callback' in key: setting_dict[key] = getattr(self, setting_dict[key]) - for key, val in setting_dict.items(): - setting_dict[key] = val setting_obj = Setting(name=setting_name, **setting_dict) settings[setting_group][setting_name] = setting_obj @@ -590,8 +588,6 @@ class CommandBase(object): def convert_val_to_str(self, val): if isinstance(val, (list, tuple)): return ', '.join(val) - elif isinstance(val, basestring): - val = str(val).replace('\\', '\\\\') return str(val).replace(self.project_dir()+os.path.sep, '') def export(self): diff --git a/files/settings.cfg b/files/settings.cfg index d2404c2..f3b4491 100644 --- a/files/settings.cfg +++ b/files/settings.cfg @@ -165,11 +165,13 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' extract_files="""['%(win_32_dir_prefix)s/nw.exe', '%(win_32_dir_prefix)s/icudtl.dat', '%(win_32_dir_prefix)s/libEGL.dll', + '%(win_32_dir_prefix)s/ffmpegsumo.dll', '%(win_32_dir_prefix)s/libGLESv2.dll']""" dest_files="""['nw.exe', 'nw.pak', 'icudtl.dat', 'libEGL.dll', + 'ffmpegsumo.dll', 'libGLESv2.dll']""" [[mac]] default_value=False @@ -178,9 +180,11 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' extract_file='%(mac_32_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework' extract_files="""['%(mac_32_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework', '%(mac_32_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nw.pak', - '%s(mac_32_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/icudtl.dat']""" + '%(mac_32_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/ffmpegsumo.so', + '%(mac_32_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/icudtl.dat']""" dest_files="""['node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework', 'node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nw.pak', + 'node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/ffmpegsumo.so', 'node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/icudtl.dat']""" [[linux-x64]] @@ -190,8 +194,9 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' extract_file='%(linux_64_dir_prefix)s/nw' extract_files="""['%(linux_64_dir_prefix)s/nw', '%(linux_64_dir_prefix)s/nw.pak', + '%(linux_64_dir_prefix)s/libffmpegsumo.so', '%(linux_64_dir_prefix)s/icudtl.dat']""" - dest_files=['nw', 'nw.pak', 'icudtl.dat'] + dest_files=['nw', 'nw.pak', 'icudtl.dat', 'libffmpegsumo.so'] [[linux-x32]] default_value=False type='check' @@ -199,8 +204,9 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' extract_file='%(linux_32_dir_prefix)s/nw' extract_files="""['%(linux_32_dir_prefix)s/nw', '%(linux_32_dir_prefix)s/nw.pak', + '%(linux_32_dir_prefix)s/libffmpegsumo.so', '%(linux_32_dir_prefix)s/icudtl.dat']""" - dest_files=['nw', 'nw.pak', 'icudtl.dat'] + dest_files=['nw', 'nw.pak', 'icudtl.dat', 'libffmpegsumo.so'] [order] application_setting_order="""['main', 'name', 'node-main', 'description', 'version', 'keywords',