From ce7ee43f1216b7bd3d1f568658f6c6b2f826e1f1 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Tue, 23 Sep 2014 14:05:55 +0100 Subject: [PATCH] Update manifests for Crosswalk 8+ Fixes https://crosswalk-project.org/jira/browse/XWALK-2569 --- .../xwalk-echo-app/manifest.json | 14 +++++------ hello_world/manifest.json | 9 ++------ simd-mandelbrot/manifest.json | 9 ++------ .../Crosswalk-6-resize/manifest.json | 8 ++----- .../Crosswalk-6-scale/manifest.json | 8 ++----- .../Crosswalk-8-resize/manifest.json | 2 +- .../Crosswalk-8-scale/manifest.json | 2 +- space-dodge-game/README.md | 23 ++++++++++--------- webgl/manifest.json | 9 ++------ webrtc/client/manifest.json | 9 ++------ 10 files changed, 33 insertions(+), 60 deletions(-) diff --git a/extensions-android/xwalk-echo-app/manifest.json b/extensions-android/xwalk-echo-app/manifest.json index 5c65451..06d0acc 100644 --- a/extensions-android/xwalk-echo-app/manifest.json +++ b/extensions-android/xwalk-echo-app/manifest.json @@ -1,12 +1,12 @@ { "name": "xwalk_echo_app", "version": "0.0.0.1", - "app": { - "launch":{ - "local_path": "index.html" + "start_url": "index.html", + "icons": [ + { + "src": "icon.png", + "type": "image/png", + "sizes": "96x96" } - }, - "icons": { - "96": "icon.png" - } + ] } diff --git a/hello_world/manifest.json b/hello_world/manifest.json index 70fd770..405f4f4 100644 --- a/hello_world/manifest.json +++ b/hello_world/manifest.json @@ -1,10 +1,5 @@ { "name": "HelloWorld", - "manifest_version": 1, - "version": "0.0.0.1", - "app": { - "launch":{ - "local_path": "index.html" - } - } + "xwalk_version": "0.0.0.1", + "start_url": "index.html" } diff --git a/simd-mandelbrot/manifest.json b/simd-mandelbrot/manifest.json index df0ca16..d242d97 100644 --- a/simd-mandelbrot/manifest.json +++ b/simd-mandelbrot/manifest.json @@ -1,10 +1,5 @@ { "name": "SIMD", - "manifest_version": 1, - "version": "0.0.0.1", - "app": { - "launch":{ - "local_path": "index.html" - } - } + "xwalk_version": "0.0.0.1", + "start_url": "index.html" } diff --git a/space-dodge-game/Crosswalk-6-resize/manifest.json b/space-dodge-game/Crosswalk-6-resize/manifest.json index e97cfe5..1a626c0 100644 --- a/space-dodge-game/Crosswalk-6-resize/manifest.json +++ b/space-dodge-game/Crosswalk-6-resize/manifest.json @@ -1,9 +1,5 @@ { "name": "space_dodge_game", - "version": "0.0.0.1", - "app": { - "launch": { - "local_path": "index.html" - } - } + "xwalk_version": "0.0.0.1", + "start_url": "index.html" } diff --git a/space-dodge-game/Crosswalk-6-scale/manifest.json b/space-dodge-game/Crosswalk-6-scale/manifest.json index e97cfe5..1a626c0 100644 --- a/space-dodge-game/Crosswalk-6-scale/manifest.json +++ b/space-dodge-game/Crosswalk-6-scale/manifest.json @@ -1,9 +1,5 @@ { "name": "space_dodge_game", - "version": "0.0.0.1", - "app": { - "launch": { - "local_path": "index.html" - } - } + "xwalk_version": "0.0.0.1", + "start_url": "index.html" } diff --git a/space-dodge-game/Crosswalk-8-resize/manifest.json b/space-dodge-game/Crosswalk-8-resize/manifest.json index b8d313e..2b5b03a 100644 --- a/space-dodge-game/Crosswalk-8-resize/manifest.json +++ b/space-dodge-game/Crosswalk-8-resize/manifest.json @@ -1,6 +1,6 @@ { "name": "space_dodge_game", - "version": "0.0.0.1", + "xwalk_version": "0.0.0.1", "start_url": "index.html", "orientation": "landscape", "display": "fullscreen", diff --git a/space-dodge-game/Crosswalk-8-scale/manifest.json b/space-dodge-game/Crosswalk-8-scale/manifest.json index b8d313e..2b5b03a 100644 --- a/space-dodge-game/Crosswalk-8-scale/manifest.json +++ b/space-dodge-game/Crosswalk-8-scale/manifest.json @@ -1,6 +1,6 @@ { "name": "space_dodge_game", - "version": "0.0.0.1", + "xwalk_version": "0.0.0.1", "start_url": "index.html", "orientation": "landscape", "display": "fullscreen", diff --git a/space-dodge-game/README.md b/space-dodge-game/README.md index ab112f2..c158eb9 100644 --- a/space-dodge-game/README.md +++ b/space-dodge-game/README.md @@ -1,6 +1,6 @@ # space dodge game -A simple side-scrolling HTML5 game where you fly a spaceship and you +A simple side-scrolling HTML5 game where you fly a spaceship and dodge stuff. The game is used as a basis for demonstrating various techniques for scaling a game to a device screen using Crosswalk. @@ -30,28 +30,32 @@ fit the application into the device screen: * Crosswalk-6-scale - * landscape orientation set with screen.lockOrientation() - * fullscreen set with --fullscreen option to make_apk.py + * landscape orientation set with `screen.lockOrientation()` + * fullscreen set with `--fullscreen` option to make_apk.py * whole game scaled in CSS to fit screen * Crosswalk-6-resize - * landscape orientation set with screen.lockOrientation() - * fullscreen set with --fullscreen option to make_apk.py + * landscape orientation set with `screen.lockOrientation()` + * fullscreen set with `--fullscreen` option to make_apk.py * game elements resized to fit screen * Crosswalk-8-scale * landscape orientation and fullscreen set in manifest - * xwalk_launch_screen enabled in manifest + * `xwalk_launch_screen` enabled in manifest * whole game scaled in CSS to fit screen * Crosswalk-8-resize * landscape orientation and fullscreen set in manifest - * xwalk_launch_screen enabled in manifest + * `xwalk_launch_screen` enabled in manifest * game elements resized to fit screen +The Crosswalk-6* versions should also work with Crosswalk 5 and 7 (6 +is the version they were tested with); the Crosswalk-8* versions should +work with Crosswalk version 8 or above. + ## Android packages To create an Android package for the game, follow the instructions at: @@ -60,9 +64,6 @@ https://crosswalk-project.org/#documentation/getting_started/run_on_android You will need the correct version of Crosswalk for the version of the code you intend to package (see above). -(The Crosswalk 6 version should also work for Crosswalk 5 and 7, but -6 is the version it was tested with.) - When building the Crosswalk 6 versions, you will need to pass the `--fullscreen` option for the game to run in fullscreen, e.g. @@ -70,7 +71,7 @@ When building the Crosswalk 6 versions, you will need to pass the python make_apk.py --fullscreen --manifest=Crosswalk-6-resize/manifest.json -This is not required for the Crosswalk 8 versions, e.g. +`--fullscreen` is not required for the Crosswalk 8 versions, e.g. python make_apk.py --manifest=Crosswalk-8-scale/manifest.json diff --git a/webgl/manifest.json b/webgl/manifest.json index 5d42b18..fbe8c63 100644 --- a/webgl/manifest.json +++ b/webgl/manifest.json @@ -1,10 +1,5 @@ { "name": "WebGLSample", - "manifest_version": 1, - "version": "0.0.0.1", - "app": { - "launch":{ - "local_path": "index.html" - } - } + "xwalk_version": "0.0.0.1", + "start_url": "index.html" } diff --git a/webrtc/client/manifest.json b/webrtc/client/manifest.json index 15a6cfb..ce09383 100644 --- a/webrtc/client/manifest.json +++ b/webrtc/client/manifest.json @@ -1,10 +1,5 @@ { "name": "WebRTC", - "description": "WebRTC client", - "version": "0.0.1", - "app": { - "launch": { - "local_path": "index.html" - } - } + "xwalk_version": "0.0.1", + "start_url": "index.html" }