0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

use python3 to update static files

Browse source
This commit is contained in:
j 2014-09-30 23:21:44 +02:00
parent c961aa5c64
commit d78c30b163
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oml/commands.py
View file

@ -110,8 +110,8 @@ def command_update_static(*args):
r('git', 'clone', 'https://git.0x2620.org/oxjs.git', oxjs) r('git', 'clone', 'https://git.0x2620.org/oxjs.git', oxjs)
elif os.path.exists(os.path.join(oxjs, '.git')): elif os.path.exists(os.path.join(oxjs, '.git')):
os.system('cd "%s" && git pull' % oxjs) os.system('cd "%s" && git pull' % oxjs)
r('python2', os.path.join(oxjs, 'tools', 'build', 'build.py')) r('python3', os.path.join(oxjs, 'tools', 'build', 'build.py'))
r('python2', os.path.join(settings.static_path, 'py', 'build.py')) r('python3', os.path.join(settings.static_path, 'py', 'build.py'))
def command_release(*args): def command_release(*args):
""" """

2
static/py/build.py
View file

@ -14,7 +14,7 @@ ox.file.write_json('../json/js.json', files, indent=4)
ox.file.write_file( ox.file.write_file(
'%soml.min.js' % path, '%soml.min.js' % path,
'\n'.join([ '\n'.join([
ox.js.minify(ox.file.read_file('%s%s' % (path, file))) ox.js.minify(ox.file.read_file('%s%s' % (path, file)).decode('utf-8'))
for file in files for file in files
]) ])
) )