From f2a7ba250c9981828d04b831d1ee8f556e1301c7 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Tue, 7 Oct 2014 12:07:47 -0400 Subject: Update stuff, fix Makefile. --- configure | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 6ca1a0f..49abf9f 100755 --- a/configure +++ b/configure @@ -143,7 +143,7 @@ if __name__ == "__main__": check("gzip", "pre-compress the JSON files", ["-9"]) check("apngasm", "assemble the click-to-continue image", run=False) - check("convert", "perform miscellaneous actions on the images") + check("convert", "perform miscellaneous actions on the images", run=False) check("cwebp", "convert all images to WebP for webkit browsers", ["-quiet", "-alpha_cleanup", "-m", "6"]) ffmpeg = check("ffmpeg", "convert audio and video to HTML5 formats", ["-v", "warning", "-y"], run=False) if ffmpeg: @@ -152,7 +152,7 @@ if __name__ == "__main__": ffmpeg_check("muxing", ".E", ["ipod", "mp4", "ogg", "wav", "webm", "yuv4mpegpipe"], ffmpeg_formats) ffmpeg_check("decoding", ".{6}", ["mpeg4", "rawvideo", "pcm_s16le", "vorbis"], run_ffmpeg("-decoders")) ffmpeg_check("encoding", ".{6}", ["libx264", "rawvideo", "libtheora", "libvpx", "libvpx-vp9", "libfdk_aac", "libopus", "pcm_s16le"], run_ffmpeg("-encoders")) - check("npm", "install uglifyjs", ["--quiet"]) + check("npm", "install uglifyjs", run=False) check("webpmux", "assemble the WebP click-to-continue image") check("defluff", "decrease the size of DEFLATE files including gzip and PNG files", optional=True, run=False) check("pngquant", "quantize PNG images, improving compatibility and dramatically decreasing size", optional=True) @@ -163,6 +163,9 @@ if __name__ == "__main__": with open("Makefile.inc", "w") as f: f.write(''.join('%s := %s\n' % (k, list2cmdline(cmds[k])) for k in cmds)) + stderr.write("Making various directories\n") + os.mkdir("www/json") + if len(warnings): stderr.write("Warnings during configuration:\n") stderr.write('\n'.join(warnings) + '\n') -- cgit v1.2.3-54-g00ecf