Skip to content

Instantly share code, notes, and snippets.

@comigor
Last active August 29, 2015 14:24
Show Gist options
  • Save comigor/5794e44204d7d1d70c83 to your computer and use it in GitHub Desktop.
Save comigor/5794e44204d7d1d70c83 to your computer and use it in GitHub Desktop.
Crosswalk patch for Meteor devel branch, based on https://github.com/copleykj/meteor/tree/cordova5-update
From aeb068a26dbedafea956c9abf5ebd41dc2ee79f1 Mon Sep 17 00:00:00 2001
From: Igor Borges <igor@borges.me>
Date: Thu, 9 Jul 2015 03:14:02 -0300
Subject: [PATCH] Crosswalk patch
---
packages/autoupdate/package.js | 2 +-
packages/coffeescript/package.js | 2 +-
packages/crosswalk/package.js | 9 +++++++++
packages/ddp/package.js | 2 +-
packages/fastclick/package.js | 2 +-
packages/launch-screen/package.js | 2 +-
packages/logging/package.js | 2 +-
packages/mobile-status-bar/package.js | 2 +-
packages/webapp/package.js | 2 +-
9 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 packages/crosswalk/package.js
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index c9aeeb1..3505397 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Update the client when new client code is available",
- version: '1.2.2'
+ version: '1.2.1'
});
Cordova.depends({
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 32200f7..d390cd2 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Javascript dialect with fewer braces and semicolons",
- version: "1.0.7"
+ version: "1.0.6"
});
Package.registerBuildPlugin({
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
new file mode 100644
index 0000000..8c9573e
--- /dev/null
+++ b/packages/crosswalk/package.js
@@ -0,0 +1,9 @@
+Package.describe({
+ name: 'crosswalk',
+ summary: 'Crosswalk integration for Cordova Android builds',
+ version: '1.2.0'
+});
+
+Cordova.depends({
+ 'cordova-plugin-crosswalk-webview': 'https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview/tarball/ef4d7244f107c86b85a75edd5492f8e2f63b1bd7'
+});
diff --git a/packages/ddp/package.js b/packages/ddp/package.js
index d53ea23..1bced9a 100644
--- a/packages/ddp/package.js
+++ b/packages/ddp/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor's latency-compensated distributed data framework",
- version: '1.2.0'
+ version: '1.1.0'
});
Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index 211f1c6..a9910ca 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Faster touch events on mobile",
- version: '1.0.6'
+ version: '1.0.3'
});
Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index be14063..6861ab1 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
// between such packages and the build tool.
name: 'launch-screen',
summary: 'Default and customizable launch screen on mobile.',
- version: '1.0.3'
+ version: '1.0.2'
});
Cordova.depends({
diff --git a/packages/logging/package.js b/packages/logging/package.js
index c837913..d7983af 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Logging facility.",
- version: '1.0.8'
+ version: '1.0.7'
});
Npm.depends({
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index ad96daf..e3b9c8c 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Good defaults for the mobile status bar",
- version: "1.0.4"
+ version: "1.0.3"
});
Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 2f4174d..48c5d27 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
Package.describe({
summary: "Serves a Meteor app over HTTP",
- version: '1.2.1'
+ version: '1.2.0'
});
Npm.depends({connect: "2.9.0",
--
2.4.1
From 5889a093a6579b735dd67088f15531971c673a3b Mon Sep 17 00:00:00 2001
From: Igor Borges <igor@borges.me>
Date: Fri, 10 Jul 2015 02:33:52 -0300
Subject: [PATCH] build fix
---
tools/commands.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/commands.js b/tools/commands.js
index 42be50c..43d5f2e 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -948,7 +948,7 @@ var buildCommand = function (options) {
} else if (platformName === 'android') {
files.cp_r(buildPath, files.pathJoin(platformPath, 'project'));
var apkPath = findApkPath(files.pathJoin(buildPath, 'build'), options.debug);
- files.copyFile(apkPath, files.pathJoin(platformPath, options.debug ? 'debug.apk' : 'release-unsigned.apk'));
+ files.copyFile(apkPath, files.pathJoin(platformPath, options.debug ? 'armv7-debug-unsigned.apk' : 'armv7-release-unsigned.apk'));
files.writeFile(
files.pathJoin(platformPath, 'README'),
"This is an auto-generated Gradle project for your Android application.\n\n" +
@@ -962,7 +962,7 @@ var buildCommand = function (options) {
};
var findApkPath = function (dirPath, debug) {
- return files.pathJoin(dirPath, 'outputs', 'apk', debug ? 'android-debug.apk' : 'android-release-unsigned.apk');
+ return files.pathJoin(dirPath, 'outputs', 'apk', debug ? 'android-armv7-debug-unsigned.apk' : 'android-armv7-release-unsigned.apk');
};
///////////////////////////////////////////////////////////////////////////////
--
2.4.1
@patrickleet
Copy link

Hey, glad to see work is being done to make crosswalk easy to use. Is there a PR associated with this?

@comigor
Copy link
Author

comigor commented Jul 20, 2015

@patrickleet Actually, no, because the package versions are specific of a singular project, and the build script depends on that crosswalk package above.
However, Martijn opened that issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment