diff --git a/command_line.py b/command_line.py index b65549b..e16dd59 100644 --- a/command_line.py +++ b/command_line.py @@ -15,6 +15,8 @@ import stat import tarfile import zipfile import traceback +import platform +import subprocess from distutils.version import LooseVersion @@ -209,7 +211,8 @@ class CommandBase(object): config = ConfigObj(config_io, unrepr=True).dict() settings = {'setting_groups': []} setting_items = (config['setting_groups'].items() + - [('export_settings', config['export_settings'])]) + [('export_settings', config['export_settings'])] + + [('compression', config['compression'])]) for setting_group, setting_group_dict in setting_items: settings[setting_group] = {} for setting_name, setting_dict in setting_group_dict.items(): @@ -225,6 +228,7 @@ class CommandBase(object): config.pop('setting_groups') config.pop('export_settings') + config.pop('compression') for key, val in config.items(): settings[key] = val @@ -242,7 +246,8 @@ class CommandBase(object): def get_setting(self, name): for setting_group in (self.settings['setting_groups'] + - [self.settings['export_settings']]): + [self.settings['export_settings']] + + [self.settings['compression']]): if name in setting_group: setting = setting_group[name] return setting @@ -346,7 +351,8 @@ class CommandBase(object): dic['webkit'][setting_name] = setting.value dl_export_items = (self.settings['download_settings'].items() + - self.settings['export_settings'].items()) + self.settings['export_settings'].items() + + self.settings['compression'].items()) for setting_name, setting in dl_export_items: if setting.value is not None: dic['webexe_settings'][setting_name] = setting.value @@ -361,7 +367,7 @@ class CommandBase(object): @extract_error.setter def extract_error(self, value): - if value is not None and not self.quiet and not inside_mac_app: + if value is not None and not self.quiet and not inside_packed_exe: self._extract_error = str(value) sys.stderr.write('\r{}'.format(self._extract_error)) sys.stderr.flush() @@ -514,7 +520,7 @@ class CommandBase(object): export_dest) self.progress_text += '.' - if ex_setting.name == 'mac': + if 'mac' in ex_setting.name: app_path = os.path.join(export_dest, self.project_name()+'.app') shutil.move(os.path.join(export_dest, @@ -536,12 +542,18 @@ class CommandBase(object): else: ext = '' windows = False - if ex_setting.name == 'windows': + if 'windows' in ex_setting.name: ext = '.exe' windows = True nw_path = os.path.join(export_dest, ex_setting.dest_files[0]) + + if windows and 'x32' in ex_setting.name: + self.replace_icon_in_exe(nw_path) + + #self.compress_nw(nw_path) + dest_binary_path = os.path.join(export_dest, self.project_name() + ext) @@ -555,9 +567,6 @@ class CommandBase(object): stat.S_IXOTH) os.chmod(dest_binary_path, sevenfivefive) - if windows: - self.replace_icon_in_exe(dest_binary_path) - self.progress_text += '.' if os.path.exists(nw_path): @@ -571,6 +580,18 @@ class CommandBase(object): finally: shutil.rmtree(temp_dir) + def compress_nw(self, nw_path): + compression = self.get_setting('nw_compression_level') + upx_bin = os.path.join('files', 'compressors', 'upx-linux-x64') + cmd = '{upx_bin} --lzma -{comp_level} -o test {path}'.format(upx_bin=upx_bin, + comp_level=compression.value, + path=nw_path) + print cmd + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, shell=True) + output, err = proc.communicate() + print err, output + def copy_files_to_project_folder(self): old_dir = CWD os.chdir(self.project_dir()) @@ -718,7 +739,7 @@ if __name__ == '__main__': if setting.values: kwargs.update({'choices': setting.values}) setting.description += ' Possible values: {{{}}}'.format(', '.join([str(x) for x in setting.values])) - kwargs.update({'metavar':''}) + kwargs.update({'metavar': ''}) else: kwargs.update({'metavar': '<{}>'.format(setting.display_name)}) diff --git a/files/mac/node-webkit.app/Contents/Frameworks/crash_inspector b/files/mac-x32/node-webkit.app/Contents/Frameworks/crash_inspector similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/crash_inspector rename to files/mac-x32/node-webkit.app/Contents/Frameworks/crash_inspector diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/place_holder.txt b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/place_holder.txt similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/place_holder.txt rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/place_holder.txt diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/English.lproj/HttpAuth.nib b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/English.lproj/HttpAuth.nib similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/English.lproj/HttpAuth.nib rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/English.lproj/HttpAuth.nib diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/am.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/am.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/am.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/am.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ar.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ar.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ar.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ar.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bg.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bg.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bg.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bg.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bn.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bn.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bn.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bn.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ca.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ca.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ca.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ca.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/cs.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/cs.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/cs.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/cs.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/da.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/da.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/da.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/da.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/de.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/de.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/de.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/de.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/el.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/el.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/el.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/el.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-GB.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-GB.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-GB.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-GB.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-US.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-US.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-US.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-US.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es-419.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es-419.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es-419.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es-419.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/et.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/et.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/et.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/et.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fa.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fa.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fa.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fa.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fi.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fi.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fi.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fi.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fil.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fil.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fil.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fil.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fr.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fr.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fr.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fr.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/gu.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/gu.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/gu.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/gu.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hi.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hi.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hi.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hi.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hr.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hr.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hr.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hr.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hu.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hu.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hu.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hu.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/id.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/id.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/id.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/id.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/it.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/it.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/it.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/it.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/iw.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/iw.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/iw.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/iw.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ja.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ja.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ja.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ja.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/kn.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/kn.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/kn.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/kn.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ko.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ko.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ko.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ko.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lt.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lt.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lt.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lt.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lv.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lv.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lv.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lv.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ml.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ml.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ml.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ml.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/mr.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/mr.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/mr.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/mr.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ms.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ms.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ms.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ms.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nl.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nl.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nl.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nl.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/no.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/no.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/no.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/no.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pl.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pl.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pl.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pl.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-BR.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-BR.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-BR.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-BR.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-PT.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-PT.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-PT.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-PT.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ro.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ro.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ro.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ro.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ru.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ru.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ru.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ru.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sk.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sk.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sk.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sk.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sl.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sl.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sl.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sl.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sr.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sr.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sr.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sr.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sv.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sv.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sv.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sv.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sw.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sw.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sw.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sw.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ta.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ta.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ta.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ta.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/te.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/te.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/te.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/te.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/th.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/th.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/th.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/th.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/tr.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/tr.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/tr.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/tr.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/uk.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/uk.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/uk.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/uk.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/vi.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/vi.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/vi.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/vi.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-CN.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-CN.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-CN.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-CN.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-TW.pak b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-TW.pak similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-TW.pak rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-TW.pak diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/Info.plist b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/Info.plist similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/Info.plist rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/Info.plist diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/MacOS/node-webkit Helper EH b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/MacOS/node-webkit Helper EH similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/MacOS/node-webkit Helper EH rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/MacOS/node-webkit Helper EH diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/PkgInfo b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/PkgInfo similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/PkgInfo rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/PkgInfo diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/Info.plist b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/Info.plist similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/Info.plist rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/Info.plist diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/MacOS/node-webkit Helper NP b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/MacOS/node-webkit Helper NP similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/MacOS/node-webkit Helper NP rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/MacOS/node-webkit Helper NP diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/PkgInfo b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/PkgInfo similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/PkgInfo rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/PkgInfo diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/Info.plist b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/Info.plist similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/Info.plist rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/Info.plist diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/MacOS/node-webkit Helper b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/MacOS/node-webkit Helper similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/MacOS/node-webkit Helper rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/MacOS/node-webkit Helper diff --git a/files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/PkgInfo b/files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/PkgInfo similarity index 100% rename from files/mac/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/PkgInfo rename to files/mac-x32/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/PkgInfo diff --git a/files/mac/node-webkit.app/Contents/Info.plist b/files/mac-x32/node-webkit.app/Contents/Info.plist similarity index 100% rename from files/mac/node-webkit.app/Contents/Info.plist rename to files/mac-x32/node-webkit.app/Contents/Info.plist diff --git a/files/mac/node-webkit.app/Contents/MacOS/node-webkit b/files/mac-x32/node-webkit.app/Contents/MacOS/node-webkit similarity index 100% rename from files/mac/node-webkit.app/Contents/MacOS/node-webkit rename to files/mac-x32/node-webkit.app/Contents/MacOS/node-webkit diff --git a/files/mac/node-webkit.app/Contents/PkgInfo b/files/mac-x32/node-webkit.app/Contents/PkgInfo similarity index 100% rename from files/mac/node-webkit.app/Contents/PkgInfo rename to files/mac-x32/node-webkit.app/Contents/PkgInfo diff --git a/files/mac/node-webkit.app/Contents/Resources/nw.icns b/files/mac-x32/node-webkit.app/Contents/Resources/nw.icns similarity index 100% rename from files/mac/node-webkit.app/Contents/Resources/nw.icns rename to files/mac-x32/node-webkit.app/Contents/Resources/nw.icns diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/crash_inspector b/files/mac-x64/node-webkit.app/Contents/Frameworks/crash_inspector new file mode 100755 index 0000000..349f786 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/crash_inspector differ diff --git a/files/windows/place_holder.txt b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/place_holder.txt similarity index 100% rename from files/windows/place_holder.txt rename to files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/place_holder.txt diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/English.lproj/HttpAuth.nib b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/English.lproj/HttpAuth.nib new file mode 100644 index 0000000..30c29d2 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/English.lproj/HttpAuth.nib differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/am.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/am.pak new file mode 100644 index 0000000..c371ddb Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/am.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ar.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ar.pak new file mode 100644 index 0000000..83b0f7f Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ar.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bg.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bg.pak new file mode 100644 index 0000000..61a370d Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bg.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bn.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bn.pak new file mode 100644 index 0000000..4845ba4 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/bn.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ca.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ca.pak new file mode 100644 index 0000000..737612f Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ca.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/cs.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/cs.pak new file mode 100644 index 0000000..5cd6985 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/cs.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/da.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/da.pak new file mode 100644 index 0000000..7e73987 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/da.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/de.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/de.pak new file mode 100644 index 0000000..cbd992c Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/de.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/el.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/el.pak new file mode 100644 index 0000000..ecc9dba Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/el.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-GB.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-GB.pak new file mode 100644 index 0000000..61c0bd0 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-GB.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-US.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-US.pak new file mode 100644 index 0000000..4ecdde5 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/en-US.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es-419.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es-419.pak new file mode 100644 index 0000000..171ee95 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es-419.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es.pak new file mode 100644 index 0000000..d6fa9ce Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/es.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/et.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/et.pak new file mode 100644 index 0000000..2b409da Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/et.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fa.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fa.pak new file mode 100644 index 0000000..f75d3af Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fa.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fi.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fi.pak new file mode 100644 index 0000000..e7b7c0a Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fi.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fil.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fil.pak new file mode 100644 index 0000000..c5d9edb Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fil.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fr.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fr.pak new file mode 100644 index 0000000..c9aab0b Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/fr.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/gu.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/gu.pak new file mode 100644 index 0000000..bfca775 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/gu.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hi.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hi.pak new file mode 100644 index 0000000..bb3ad9a Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hi.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hr.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hr.pak new file mode 100644 index 0000000..93ed6d1 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hr.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hu.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hu.pak new file mode 100644 index 0000000..b9d4ddb Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/hu.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/id.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/id.pak new file mode 100644 index 0000000..ed9875d Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/id.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/it.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/it.pak new file mode 100644 index 0000000..48b1757 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/it.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/iw.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/iw.pak new file mode 100644 index 0000000..64b5083 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/iw.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ja.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ja.pak new file mode 100644 index 0000000..f6feafc Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ja.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/kn.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/kn.pak new file mode 100644 index 0000000..a8e054b Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/kn.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ko.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ko.pak new file mode 100644 index 0000000..ea275cf Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ko.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lt.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lt.pak new file mode 100644 index 0000000..30a6113 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lt.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lv.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lv.pak new file mode 100644 index 0000000..3febacc Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/lv.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ml.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ml.pak new file mode 100644 index 0000000..207d12b Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ml.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/mr.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/mr.pak new file mode 100644 index 0000000..2dcc914 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/mr.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ms.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ms.pak new file mode 100644 index 0000000..b87991f Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ms.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nl.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nl.pak new file mode 100644 index 0000000..3d49b33 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nl.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/no.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/no.pak new file mode 100644 index 0000000..e9b9baf Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/no.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pl.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pl.pak new file mode 100644 index 0000000..1885408 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pl.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-BR.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-BR.pak new file mode 100644 index 0000000..910496d Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-BR.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-PT.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-PT.pak new file mode 100644 index 0000000..21b05e3 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/pt-PT.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ro.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ro.pak new file mode 100644 index 0000000..74171bd Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ro.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ru.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ru.pak new file mode 100644 index 0000000..ffc4e32 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ru.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sk.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sk.pak new file mode 100644 index 0000000..84449b7 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sk.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sl.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sl.pak new file mode 100644 index 0000000..43e85db Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sl.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sr.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sr.pak new file mode 100644 index 0000000..3d01abb Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sr.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sv.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sv.pak new file mode 100644 index 0000000..70f583a Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sv.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sw.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sw.pak new file mode 100644 index 0000000..bbd620e Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/sw.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ta.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ta.pak new file mode 100644 index 0000000..feeb536 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/ta.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/te.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/te.pak new file mode 100644 index 0000000..e682a72 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/te.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/th.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/th.pak new file mode 100644 index 0000000..78d1901 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/th.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/tr.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/tr.pak new file mode 100644 index 0000000..24dc921 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/tr.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/uk.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/uk.pak new file mode 100644 index 0000000..9346782 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/uk.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/vi.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/vi.pak new file mode 100644 index 0000000..e652630 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/vi.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-CN.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-CN.pak new file mode 100644 index 0000000..06dd1b5 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-CN.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-TW.pak b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-TW.pak new file mode 100644 index 0000000..bb3e5bc Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/zh-TW.pak differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/Info.plist b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/Info.plist new file mode 100644 index 0000000..5a653c2 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/Info.plist @@ -0,0 +1,46 @@ + + + + + BuildMachineOSBuild + 12F45 + CFBundleDevelopmentRegion + en + CFBundleDisplayName + node-webkit Helper EH + CFBundleExecutable + node-webkit Helper EH + CFBundleIdentifier + com.intel.nw.helper.EH + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + node-webkit Helper EH + CFBundlePackageType + APPL + CFBundleShortVersionString + 38.0.2125.104 + CFBundleSignature + ???? + CFBundleVersion + 2125.104 + DTSDKBuild + 12F37 + DTSDKName + macosx10.8 + DTXcode + 0511 + DTXcodeBuild + 5B1008 + LSFileQuarantineEnabled + + LSMinimumSystemVersion + 10.6.0 + LSUIElement + 1 + NSSupportsAutomaticGraphicsSwitching + + SCMRevision + 290379 + + diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/MacOS/node-webkit Helper EH b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/MacOS/node-webkit Helper EH new file mode 100755 index 0000000..93d5aed Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/MacOS/node-webkit Helper EH differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/PkgInfo b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/PkgInfo new file mode 100644 index 0000000..bd04210 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper EH.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/Info.plist b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/Info.plist new file mode 100644 index 0000000..50c0136 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/Info.plist @@ -0,0 +1,46 @@ + + + + + BuildMachineOSBuild + 12F45 + CFBundleDevelopmentRegion + en + CFBundleDisplayName + node-webkit Helper NP + CFBundleExecutable + node-webkit Helper NP + CFBundleIdentifier + com.intel.nw.helper.NP + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + node-webkit Helper NP + CFBundlePackageType + APPL + CFBundleShortVersionString + 38.0.2125.104 + CFBundleSignature + ???? + CFBundleVersion + 2125.104 + DTSDKBuild + 12F37 + DTSDKName + macosx10.8 + DTXcode + 0511 + DTXcodeBuild + 5B1008 + LSFileQuarantineEnabled + + LSMinimumSystemVersion + 10.6.0 + LSUIElement + 1 + NSSupportsAutomaticGraphicsSwitching + + SCMRevision + 290379 + + diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/MacOS/node-webkit Helper NP b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/MacOS/node-webkit Helper NP new file mode 100755 index 0000000..0c7cd8f Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/MacOS/node-webkit Helper NP differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/PkgInfo b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/PkgInfo new file mode 100644 index 0000000..bd04210 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper NP.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/Info.plist b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/Info.plist new file mode 100644 index 0000000..b51db26 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/Info.plist @@ -0,0 +1,46 @@ + + + + + BuildMachineOSBuild + 12F45 + CFBundleDevelopmentRegion + en + CFBundleDisplayName + node-webkit Helper + CFBundleExecutable + node-webkit Helper + CFBundleIdentifier + com.intel.nw.helper + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + node-webkit Helper + CFBundlePackageType + APPL + CFBundleShortVersionString + 38.0.2125.104 + CFBundleSignature + ???? + CFBundleVersion + 2125.104 + DTSDKBuild + 12F37 + DTSDKName + macosx10.8 + DTXcode + 0511 + DTXcodeBuild + 5B1008 + LSFileQuarantineEnabled + + LSMinimumSystemVersion + 10.6.0 + LSUIElement + 1 + NSSupportsAutomaticGraphicsSwitching + + SCMRevision + 290379 + + diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/MacOS/node-webkit Helper b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/MacOS/node-webkit Helper new file mode 100755 index 0000000..d5d4b4e Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/MacOS/node-webkit Helper differ diff --git a/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/PkgInfo b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/PkgInfo new file mode 100644 index 0000000..bd04210 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/Frameworks/node-webkit Helper.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/files/mac-x64/node-webkit.app/Contents/Info.plist b/files/mac-x64/node-webkit.app/Contents/Info.plist new file mode 100644 index 0000000..2592fc1 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/Info.plist @@ -0,0 +1,103 @@ + + + + + BuildMachineOSBuild + 12F45 + CFBundleDevelopmentRegion + en + CFBundleDisplayName + node-webkit + CFBundleDocumentTypes + + + CFBundleTypeIconFile + nw.icns + CFBundleTypeName + node-webkit App + CFBundleTypeRole + Viewer + LSHandlerRank + Owner + LSItemContentTypes + + com.intel.nw.app + + + + CFBundleTypeName + Folder + CFBundleTypeOSTypes + + fold + + CFBundleTypeRole + Viewer + LSHandlerRank + None + + + CFBundleExecutable + node-webkit + CFBundleIconFile + nw.icns + CFBundleIdentifier + com.intel.nw + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + node-webkit + CFBundlePackageType + APPL + CFBundleShortVersionString + 38.0.2125.104 + CFBundleVersion + 2125.104 + DTSDKBuild + 12F37 + DTSDKName + macosx10.8 + DTXcode + 0511 + DTXcodeBuild + 5B1008 + LSFileQuarantineEnabled + + LSMinimumSystemVersion + 10.6.0 + NSPrincipalClass + NSApplication + NSSupportsAutomaticGraphicsSwitching + + SCMRevision + 290379 + UTExportedTypeDeclarations + + + UTTypeConformsTo + + com.pkware.zip-archive + + UTTypeDescription + node-webkit App + UTTypeIconFile + nw.icns + UTTypeIdentifier + com.intel.nw.app + UTTypeReferenceURL + https://github.com/rogerwang/node-webkit/wiki/How-to-package-and-distribute-your-apps + UTTypeTagSpecification + + com.apple.ostype + node-webkit + public.filename-extension + + nw + + public.mime-type + application/x-node-webkit-app + + + + + diff --git a/files/mac-x64/node-webkit.app/Contents/MacOS/node-webkit b/files/mac-x64/node-webkit.app/Contents/MacOS/node-webkit new file mode 100755 index 0000000..1182850 Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/MacOS/node-webkit differ diff --git a/files/mac-x64/node-webkit.app/Contents/PkgInfo b/files/mac-x64/node-webkit.app/Contents/PkgInfo new file mode 100644 index 0000000..bd04210 --- /dev/null +++ b/files/mac-x64/node-webkit.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/files/mac-x64/node-webkit.app/Contents/Resources/nw.icns b/files/mac-x64/node-webkit.app/Contents/Resources/nw.icns new file mode 100644 index 0000000..4b045fb Binary files /dev/null and b/files/mac-x64/node-webkit.app/Contents/Resources/nw.icns differ diff --git a/files/settings.cfg b/files/settings.cfg index 6430809..55db954 100644 --- a/files/settings.cfg +++ b/files/settings.cfg @@ -1,4 +1,4 @@ -base_url='http://dl.node-webkit.org/v{}/' +base_url='http://dl.nwjs.io/v{}/' win_32_dir_prefix = 'node-webkit-v{}-win-ia32' mac_32_dir_prefix = 'node-webkit-v{}-osx-ia32' linux_32_dir_prefix = 'node-webkit-v{}-linux-ia32' @@ -201,7 +201,7 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' type='folder' [export_settings] - [[windows]] + [[windows-x32]] default_value=False type='check' url='%(base_url)s%(win_32_dir_prefix)s.zip' @@ -210,14 +210,43 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' '%(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']""" + '%(win_32_dir_prefix)s/libGLESv2.dll', + '%(win_32_dir_prefix)s/d3dcompiler_46.dll', + '%(win_32_dir_prefix)s/pdf.dll' + ]""" dest_files="""['nw.exe', 'nw.pak', 'icudtl.dat', 'libEGL.dll', 'ffmpegsumo.dll', - 'libGLESv2.dll']""" - [[mac]] + 'libGLESv2.dll', + 'd3dcompiler_46.dll', + 'pdf.dll' + ]""" + [[windows-x64]] + default_value=False + type='check' + url='%(base_url)s%(win_64_dir_prefix)s.zip' + extract_files="""['%(win_64_dir_prefix)s/nw.exe', + '%(win_64_dir_prefix)s/nw.pak', + '%(win_64_dir_prefix)s/icudtl.dat', + '%(win_64_dir_prefix)s/libEGL.dll', + '%(win_64_dir_prefix)s/ffmpegsumo.dll', + '%(win_64_dir_prefix)s/libGLESv2.dll', + '%(win_64_dir_prefix)s/d3dcompiler_46.dll', + '%(win_64_dir_prefix)s/pdf.dll' + ]""" + dest_files="""['nw.exe', + 'nw.pak', + 'icudtl.dat', + 'libEGL.dll', + 'ffmpegsumo.dll', + 'libGLESv2.dll', + 'd3dcompiler_46.dll', + 'pdf.dll' + ]""" + + [[mac-x32]] default_value=False type='check' url='%(base_url)s%(mac_32_dir_prefix)s.zip' @@ -230,6 +259,20 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' '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']""" + [[mac-x64]] + default_value=False + type='check' + url='%(base_url)s%(mac_64_dir_prefix)s.zip' + extract_file='%(mac_64_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework' + extract_files="""['%(mac_64_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/node-webkit Framework', + '%(mac_64_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Resources/nw.pak', + '%(mac_64_dir_prefix)s/node-webkit.app/Contents/Frameworks/node-webkit Framework.framework/Libraries/ffmpegsumo.so', + '%(mac_64_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]] default_value=False @@ -252,6 +295,14 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' '%(linux_32_dir_prefix)s/icudtl.dat']""" dest_files=['nw', 'nw.pak', 'libffmpegsumo.so', 'icudtl.dat'] +[compression] + [[nw_compression_level]] + display_name='NW Compression' + default_value=5 + type='range' + description='Compression to be applied to the executable\'s node webkit binary. 0 is no compression, 9 is maximum. They all use lzma.' + + [order] application_setting_order="""['main', 'name', 'node-main', 'description', 'version', 'keywords', 'user-agent', 'chromium-args', @@ -264,9 +315,10 @@ linux_64_dir_prefix = 'node-webkit-v{}-linux-x64' 'show_in_taskbar', 'visible', 'resizable', 'fullscreen', 'as_desktop', 'transparent']""" - export_setting_order = """['windows', 'linux-x64', 'mac', 'linux-x32']""" + export_setting_order = """['windows-x32', 'windows-x64', 'mac-x32', 'mac-x64', 'linux-x64', 'linux-x32']""" - download_setting_order = """['nw_version', 'download_dir','force_download']""" + download_setting_order = """['nw_version', 'download_dir', + 'force_download']""" [version_info] - url='https://raw.githubusercontent.com/rogerwang/node-webkit/master/CHANGELOG.md' + url='https://raw.githubusercontent.com/nwjs/nw.js/master/CHANGELOG.md' diff --git a/files/windows-x32/place_holder.txt b/files/windows-x32/place_holder.txt new file mode 100644 index 0000000..e69de29 diff --git a/files/windows-x64/place_holder.txt b/files/windows-x64/place_holder.txt new file mode 100644 index 0000000..e69de29 diff --git a/main.py b/main.py index 313a892..59d8528 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,7 @@ from utils import log, open_folder_in_explorer +__gui_version__ = "v0.1.13b" + import os import glob import sys @@ -7,7 +9,7 @@ import sys from PySide import QtGui, QtCore from PySide.QtGui import QApplication from PySide.QtNetwork import QHttp -from PySide.QtCore import QUrl, QFile, QIODevice +from PySide.QtCore import QUrl, QFile, QIODevice, QCoreApplication from command_line import CWD, CommandBase @@ -50,7 +52,7 @@ class MainWindow(QtGui.QWidget, CommandBase): self.option_settings_enabled(False) - self.setWindowTitle("Web2Executable") + self.setWindowTitle("Web2Executable {}".format(__gui_version__)) self.update_nw_versions(None) def setup_nw_versions(self): @@ -265,8 +267,8 @@ class MainWindow(QtGui.QWidget, CommandBase): self.out_file.remove() self.show_error('Download failed: {}.'.format(self.http.errorString())) self.enable_ui_after_error() - - self.continue_downloading_or_extract() + else: + self.continue_downloading_or_extract() def continue_downloading_or_extract(self): if self.files_to_download: @@ -443,10 +445,11 @@ class MainWindow(QtGui.QWidget, CommandBase): def call_with_object(self, name, obj, *args, **kwargs): """Allows arguments to be passed to click events""" - def call(): + def call(*cargs, **ckwargs): if hasattr(self, name): func = getattr(self, name) - func(obj, *args, **kwargs) + kwargs.update(ckwargs) + func(obj, *(args+cargs), **kwargs) return call def find_child_by_name(self, name): @@ -542,6 +545,8 @@ class MainWindow(QtGui.QWidget, CommandBase): return self.create_check_setting(name) elif setting.type == 'list': return self.create_list_setting(name) + elif setting.type == 'range': + return self.create_range_setting(name) def create_window_settings(self): group_box = QtGui.QGroupBox("Window Settings") @@ -551,7 +556,7 @@ class MainWindow(QtGui.QWidget, CommandBase): return group_box def create_export_settings(self): - group_box = QtGui.QGroupBox("Export to") + group_box = QtGui.QGroupBox("Export Settings") vlayout = self.create_layout(self.settings['order']['export_setting_order'], cols=4) group_box.setLayout(vlayout) @@ -583,7 +588,7 @@ class MainWindow(QtGui.QWidget, CommandBase): setting_label.setToolTip(setting.description) glayout.addWidget(setting_label, row, col) glayout.addLayout(self.create_setting(setting_name), - row, col+1) + row, col+1) col += 2 return glayout @@ -597,7 +602,7 @@ class MainWindow(QtGui.QWidget, CommandBase): text.setObjectName(setting.name) text.textChanged.connect(self.call_with_object('setting_changed', - text, setting)) + text, setting)) if setting.value: text.setText(str(setting.value)) @@ -682,16 +687,24 @@ class MainWindow(QtGui.QWidget, CommandBase): setting.value = old_val widget.setChecked(old_val) + elif setting.type == 'range': + old_val = 0 + if setting.default_value is not None: + old_val = setting.default_value + setting.value = old_val + widget.setValue(old_val) + def setting_changed(self, obj, setting, *args, **kwargs): if (setting.type == 'string' or setting.type == 'file' or setting.type == 'folder'): - setting.value = obj.text().replace('\\', '\\\\') setting.value = obj.text() elif setting.type == 'check': setting.value = obj.isChecked() elif setting.type == 'list': setting.value = obj.currentText() + elif setting.type == 'range': + setting.value = obj.value() if self.update_json: json_file = os.path.join(self.project_dir(), 'package.json') @@ -759,6 +772,43 @@ class MainWindow(QtGui.QWidget, CommandBase): return hlayout + def create_range_setting(self, name): + hlayout = QtGui.QHBoxLayout() + + setting = self.get_setting(name) + + button = None + if setting.button: + button = QtGui.QPushButton(setting.button) + button.clicked.connect(lambda: setting.button_callback(button)) + + slider = QtGui.QSlider(QtCore.Qt.Orientation.Horizontal) + slider.setRange(0, 9) + slider.valueChanged.connect(self.call_with_object('setting_changed', + slider, setting)) + + slider.setObjectName(setting.name) + slider.setValue(setting.default_value) + + range_label = QtGui.QLabel(str(setting.default_value)) + range_label.setMaximumWidth(30) + + slider.valueChanged.connect(self.call_with_object('_update_range_label', + range_label)) + + w = QtGui.QWidget() + whlayout = QtGui.QHBoxLayout() + whlayout.addWidget(slider) + whlayout.addWidget(range_label) + w.setLayout(whlayout) + + hlayout.addWidget(w) + + return hlayout + + def _update_range_label(self, label, value): + label.setText(str(value)) + def load_package_json(self): setting_list = super(MainWindow, self).load_package_json() for setting in setting_list: @@ -776,6 +826,8 @@ class MainWindow(QtGui.QWidget, CommandBase): index = setting_field.findText(val_str) if index != -1: setting_field.setCurrentIndex(index) + if setting.type == 'range': + setting_field.setValue(setting.value) self.ex_button.setEnabled(self.required_settings_filled()) def show_and_raise(self): @@ -786,6 +838,11 @@ class MainWindow(QtGui.QWidget, CommandBase): if __name__ == '__main__': app = QApplication(sys.argv) + QCoreApplication.setApplicationName("Web2Executable") + QCoreApplication.setApplicationVersion(__gui_version__) + QCoreApplication.setOrganizationName("SimplyPixelated") + QCoreApplication.setOrganizationDomain("simplypixelated.com") + frame = MainWindow(1000, 500) frame.show_and_raise()