Commit 06f1bf06 authored by Giorgos Korfiatis's avatar Giorgos Korfiatis

Use standard zip to bundle windows

parent 01291bed
......@@ -42,7 +42,8 @@ build\cygwin_build\bin\bash.exe on Windows) to build the nwjs application
and collect everything under dist/baas (or dist/baas.app on OSX)
2. Run python bundle.py <platform> to make a tar.gz (for Linux) or zip
archive (for Windows and OSX).
archive (for Windows and OSX). On Windows it must be run as
build\cygwin_build\bin\bash.exe -c "/usr/bin/python bundle.py <platform>"
## Copyright and license
......
......@@ -53,18 +53,13 @@ def main():
os.chdir(DISTPATH)
filename = '%s-%s-%s' % (APP, version, descr)
if osarg.startswith('osx'):
base_dir = '%s.app' % APP
if not osarg.startswith('linux'):
base_dir = '%s.app' % APP if osarg.startswith("osx") else APP
arch_name = "%s.zip" % filename
os.system("zip -ry %s %s" % (arch_name, base_dir))
os.system("/usr/bin/zip -ry %s %s" % (arch_name, base_dir))
else:
if osarg.startswith("linux"):
arch_type = 'gztar'
base_dir = APP
elif osarg.startswith('win'):
arch_type = 'zip'
base_dir = APP
arch_type = 'gztar'
base_dir = APP
arch_name = shutil.make_archive(
filename, arch_type, root_dir='.', base_dir=base_dir)
print "Wrote %s" % os.path.join(DISTPATH, arch_name)
......
......@@ -5,7 +5,7 @@ set NAME=cygwin
if "%1" == "build" (
set NAME=%NAME%_build
set PACKAGES=%PACKAGES%,librsync-devel,wget,gcc-core,gcc,patch,unzip
set PACKAGES=%PACKAGES%,librsync-devel,wget,gcc-core,gcc,patch,zip,unzip
) else (
if not "%1" == "dist" (
@echo Must give option build or dist
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment