jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fixed some bugs with file copying.

Browse source
This commit is contained in:
Joey Payne 2014-12-20 17:02:17 +13:00
commit b3281ce96b
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
command_line.py
View file

@ -75,7 +75,7 @@ class Setting(object):
self.description = kwargs.pop('description', '') self.description = kwargs.pop('description', '')
self.values = kwargs.pop('values', []) 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: if self.value is None:
self.value = self.default_value self.value = self.default_value
@ -112,7 +112,7 @@ class Setting(object):
return self.extract_file.format(version) return self.extract_file.format(version)
return '' 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(): for undefined_key, undefined_value in kwargs.items():
setattr(self, undefined_key, undefined_value) setattr(self, undefined_key, undefined_value)
@ -205,18 +205,16 @@ class CommandBase(object):
contents = contents.replace('{DEFAULT_DOWNLOAD_PATH}', contents = contents.replace('{DEFAULT_DOWNLOAD_PATH}',
DEFAULT_DOWNLOAD_PATH) DEFAULT_DOWNLOAD_PATH)
config_io = StringIO(contents) config_io = StringIO(contents)
config = ConfigObj(config_io, unrepr=True) config = ConfigObj(config_io, unrepr=True).dict()
settings = {'setting_groups': []} settings = {'setting_groups': []}
setting_items = (config['setting_groups'].items() + setting_items = (config['setting_groups'].items() +
[('export_settings', config['export_settings'])]) [('export_settings', config['export_settings'])])
for setting_group, setting_group_dict in setting_items: for setting_group, setting_group_dict in setting_items:
settings[setting_group] = {} settings[setting_group] = {}
for setting_name, setting_dict in setting_group_dict.items(): 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: if '_callback' in key:
setting_dict[key] = getattr(self, setting_dict[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) setting_obj = Setting(name=setting_name, **setting_dict)
settings[setting_group][setting_name] = setting_obj settings[setting_group][setting_name] = setting_obj
@ -590,8 +588,6 @@ class CommandBase(object):
def convert_val_to_str(self, val): def convert_val_to_str(self, val):
if isinstance(val, (list, tuple)): if isinstance(val, (list, tuple)):
return ', '.join(val) return ', '.join(val)
elif isinstance(val, basestring):
val = str(val).replace('\\', '\\\\')
return str(val).replace(self.project_dir()+os.path.sep, '') return str(val).replace(self.project_dir()+os.path.sep, '')
def export(self): def export(self):

12
files/settings.cfg
View file

@ -165,11 +165,13 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64'
extract_files="""['%(win_32_dir_prefix)s/nw.exe', extract_files="""['%(win_32_dir_prefix)s/nw.exe',
'%(win_32_dir_prefix)s/icudtl.dat', '%(win_32_dir_prefix)s/icudtl.dat',
'%(win_32_dir_prefix)s/libEGL.dll', '%(win_32_dir_prefix)s/libEGL.dll',
'%(win_32_dir_prefix)s/ffmpegsumo.dll',
'%(win_32_dir_prefix)s/libGLESv2.dll']""" '%(win_32_dir_prefix)s/libGLESv2.dll']"""
dest_files="""['nw.exe', dest_files="""['nw.exe',
'nw.pak', 'nw.pak',
'icudtl.dat', 'icudtl.dat',
'libEGL.dll', 'libEGL.dll',
'ffmpegsumo.dll',
'libGLESv2.dll']""" 'libGLESv2.dll']"""
[[mac]] [[mac]]
default_value=False 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_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', 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', '%(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', 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/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']""" 'node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/icudtl.dat']"""
[[linux-x64]] [[linux-x64]]
@ -190,8 +194,9 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64'
extract_file='%(linux_64_dir_prefix)s/nw' extract_file='%(linux_64_dir_prefix)s/nw'
extract_files="""['%(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/nw.pak',
'%(linux_64_dir_prefix)s/libffmpegsumo.so',
'%(linux_64_dir_prefix)s/icudtl.dat']""" '%(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]] [[linux-x32]]
default_value=False default_value=False
type='check' type='check'
@ -199,8 +204,9 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64'
extract_file='%(linux_32_dir_prefix)s/nw' extract_file='%(linux_32_dir_prefix)s/nw'
extract_files="""['%(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/nw.pak',
'%(linux_32_dir_prefix)s/libffmpegsumo.so',
'%(linux_32_dir_prefix)s/icudtl.dat']""" '%(linux_32_dir_prefix)s/icudtl.dat']"""
dest_files=['nw', 'nw.pak', 'icudtl.dat'] dest_files=['nw', 'nw.pak', 'icudtl.dat', 'libffmpegsumo.so']
[order] [order]
application_setting_order="""['main', 'name', 'node-main', 'description', 'version', 'keywords', application_setting_order="""['main', 'name', 'node-main', 'description', 'version', 'keywords',