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. --- Makefile | 8 ++--- Modernizr | 2 +- config-all.json | 90 ++++++++++++++++++++++++++++++++++++++++++--------------- configure | 7 +++-- fastclick | 2 +- spin.js | 2 +- when | 2 +- 7 files changed, 80 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index fc1fdbc..64a8a62 100644 --- a/Makefile +++ b/Makefile @@ -143,10 +143,10 @@ JPG := $(shell find www/dump -name '*.jpg') WEBP := $(PNG:.png=.webp) $(JPG:.jpg=.webp) CTC_ANIM_SRC := www/dump/ui/ctc_strip.png CTC_ANIM_MORE_TMP := $(foreach n, 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 \ - 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 \ - 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 \ - 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 \ - 63, www/dump/ui/ctc_strip-$(n).png) + 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 \ + 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 \ + 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 \ + 63, www/dump/ui/ctc_strip-$(n).png) CTC_ANIM_TMP := www/dump/ui/ctc_strip-0.png $(CTC_ANIM_MORE_TMP) CTC_ANIM_TMP_WEBP := $(CTC_ANIM_TMP:%.png=%.webp) CTC_ANIM_TMP_ALL := $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP) diff --git a/Modernizr b/Modernizr index 744676c..4eba958 160000 --- a/Modernizr +++ b/Modernizr @@ -1 +1 @@ -Subproject commit 744676cdac58591c2b69011a2b222b593737d384 +Subproject commit 4eba9584ea7de64c304cc623daa716151eeae13b diff --git a/config-all.json b/config-all.json index ab34929..62f747e 100644 --- a/config-all.json +++ b/config-all.json @@ -1,20 +1,30 @@ { "classPrefix": "", "options": [ + "addTest", + "atRule", + "fnBind", + "html5printshiv", + "load", + "prefixedCSS", "setClasses", - "testProp", - "fnBind" + "testProp" ], "feature-detects": [ "test/applicationcache", "test/audio/loop", + "test/audio/preload", + "test/audio/webaudio", "test/audio", - "test/canvas/todataurl", + "test/blob", "test/canvas", "test/canvastext", "test/contextmenu", "test/cookies", + "test/css/all", "test/css/animations", + "test/css/backgroundblendmode", + "test/css/backgroundcliptext", "test/css/backgroundposition-shorthand", "test/css/backgroundposition-xy", "test/css/backgroundrepeat", @@ -25,12 +35,22 @@ "test/css/boxshadow", "test/css/boxsizing", "test/css/calc", + "test/css/chunit", "test/css/checked", "test/css/columns", "test/css/cubicbezierrange", + "test/css/displayrunin", + "test/css/displaytable", "test/css/ellipsis", + "test/css/escape", + "test/css/exunit", "test/css/filters", + "test/css/flexbox", + "test/css/flexboxlegacy", + "test/css/flexboxtweener", + "test/css/flexwrap", "test/css/fontface", + "test/css/generatedcontent", "test/css/gradients", "test/css/hsla", "test/css/hyphens", @@ -43,76 +63,100 @@ "test/css/opacity", "test/css/overflow-scrolling", "test/css/pointerevents", + "test/css/positionsticky", "test/css/pseudoanimations", "test/css/pseudotransitions", "test/css/reflections", + "test/css/regions", + "test/css/remunit", "test/css/resize", "test/css/rgba", "test/css/scrollbars", + "test/css/shapes", + "test/css/siblinggeneral", "test/css/subpixelfont", + "test/css/supports", + "test/css/target", "test/css/textshadow", + "test/css/textalignlast", "test/css/transforms", "test/css/transforms3d", "test/css/transformstylepreserve3d", "test/css/transitions", "test/css/userselect", + "test/css/vhunit", + "test/css/vmaxunit", + "test/css/vminunit", + "test/css/vwunit", + "test/css/will-change", + "test/css/wrapflow", "test/dom/classlist", "test/dom/createElement-attrs", "test/dom/dataset", "test/dom/documentfragment", - "test/elem/output", - "test/elem/progress-meter", - "test/elem/time", + "test/draganddrop", + "test/es5/array", + "test/es5/date", + "test/es5/function", + "test/es5/object", + "test/es5/strictmode", + "test/es5/string", + "test/es6/array", + "test/es6/math", + "test/es6/number", + "test/es6/object", + "test/es6/string", + "test/es5/syntax", + "test/es5/undefined", + "test/es5/specification", + "test/es6/contains", + "test/es6/promises", + "test/es6/generators", "test/event/oninput", + "test/eventlistener", "test/flash", "test/fullscreen-api", "test/history", - "test/ie8compat", "test/img/apng", - "test/img/webp-lossless", - "test/img/webp-alpha", - "test/img/webp-animation", "test/img/webp", "test/input", - "test/inputtypes", "test/json", + "test/network/xhr-responsetype-arraybuffer", + "test/network/xhr-responsetype-blob", + "test/network/xhr-responsetype-document", "test/network/xhr-responsetype-json", "test/network/xhr-responsetype-text", "test/network/xhr-responsetype", - "test/notification", + "test/network/xhr2", "test/pagevisibility-api", - "test/performance", "test/pointerevents", - "test/pointerlock-api", - "test/postmessage", - "test/quota-management-api", "test/requestanimationframe", "test/script/async", "test/script/defer", + "test/serviceworker", "test/storage/localstorage", "test/storage/sessionstorage", - "test/style/scoped", "test/svg/asimg", "test/svg/clippaths", "test/svg/filters", "test/svg/inline", + "test/svg/foreignobject", + "test/svg/smil", "test/svg", "test/touchevents", "test/typed-arrays", "test/unicode", "test/unicode-range", "test/url/data-uri", - "test/userdata", + "test/url/parser", + "test/vibration", "test/video/autoplay", "test/video/loop", "test/video/preload", "test/video", + "test/web-intents", "test/webanimations", "test/webgl/extensions", - "test/webgl", - "test/window/framed", - "test/workers/dataworkers", - "test/workers/sharedworkers", - "test/workers/webworkers" + "test/webgl" ] } 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') diff --git a/fastclick b/fastclick index d9f1d26..75b0aa0 160000 --- a/fastclick +++ b/fastclick @@ -1 +1 @@ -Subproject commit d9f1d26bddcad1f8e61a7a45e4472c53d6b5b0d8 +Subproject commit 75b0aa07910a7d8dd77b7d662e97ddddcf0837a6 diff --git a/spin.js b/spin.js index 59f7dce..0e48a68 160000 --- a/spin.js +++ b/spin.js @@ -1 +1 @@ -Subproject commit 59f7dcecf56065bebac5ac2cd61cb2b125000b22 +Subproject commit 0e48a6801502db1a9b323d32f6c5f2a702e423aa diff --git a/when b/when index b9a82a1..f9deaba 160000 --- a/when +++ b/when @@ -1 +1 @@ -Subproject commit b9a82a1821afc57aa190f2ccce8d0a943e807f49 +Subproject commit f9deaba123519936bbd9d7d99141415c1f2eeb67 -- cgit v1.2.3-54-g00ecf