You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2018/11/24 11:43:40 UTC
[cordova-mobile-spec] branch janpio-cleanup updated (48d6a94 ->
c532262)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a change to branch janpio-cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-mobile-spec.git.
from 48d6a94 README iteration
new 5e01ac5 better console.log
new 2dd47cc iterate README
new 430efaf fix formatting of www/index.html
new c16beea fix location of key and build-extra.gradle for cordova-anroid 7.x
new c532262 Move instructions of Cordova Plugin File-Transfer tests server to its repo: https://github.com/apache/cordova-labs/tree/cordova-filetransfer
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 23 ++------------------
createmobilespec/README.md | 42 ++++++++----------------------------
createmobilespec/createmobilespec.js | 16 +++++++-------
www/index.html | 15 +++++++++----
4 files changed, 30 insertions(+), 66 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-mobile-spec] 05/05: Move instructions of Cordova Plugin
File-Transfer tests server to its repo:
https://github.com/apache/cordova-labs/tree/cordova-filetransfer
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-mobile-spec.git
commit c53226202cd4d286b7d339980ac471a87fb94174
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sat Nov 24 12:29:41 2018 +0100
Move instructions of Cordova Plugin File-Transfer tests server to its repo: https://github.com/apache/cordova-labs/tree/cordova-filetransfer
---
README.md | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index 3ad9448..2681e85 100644
--- a/README.md
+++ b/README.md
@@ -26,25 +26,6 @@ This repository contains a special Cordova app that provides a set of automated
After setting this project up, you can ...
-### Running a Local File-Transfer Server
+### Cordova Plugin File-Transfer Tests
-If the `cordova-vm` file-transfer server at http://cordova-vm.apache.org:5000 (which is used for the `cordova-plugin-file-transfer` tests) is offline, you can also run the server locally:
-
-- https://github.com/apache/cordova-labs/tree/cordova-filetransfer
-- Checkout and run the server:
- ```shell
- git clone https://github.com/apache/cordova-labs.git
- cd cordova-labs
- git checkout cordova-filetransfer
- node server.js
- ```
-- Overwrite [this variable](https://github.com/apache/cordova-plugin-file-transfer/blob/9b322dec6790f6d273b8f707bc07976d778c4cf6/tests/plugin.xml#L33) for the test plugin. Run this in your mobilespec test project:
- ```shell
- cordova plugin rm cordova-plugin-file-transfer-tests
- cordova plugin add path/to/cordova-plugin-file-transfer/tests --variable FILETRANSFER_SERVER_ADDRESS="http://yourlocal-IPAddressHere:5000"
- ```
- - Get your local ip by running:
- ```shell
- ifconfig # Linux, macOS
- ipconfig # Windows
- ```
+Tests of Cordova Plugin File-Transfer require a test server. [Follow these instructions to install and run the server and configure the plugin.](https://github.com/apache/cordova-labs/tree/cordova-filetransfer)
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-mobile-spec] 02/05: iterate README
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-mobile-spec.git
commit 2dd47cc76a2d32c725f0065e26eea8e15bf55329
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sat Nov 24 03:07:15 2018 +0100
iterate README
---
createmobilespec/README.md | 42 +++++++++---------------------------------
1 file changed, 9 insertions(+), 33 deletions(-)
diff --git a/createmobilespec/README.md b/createmobilespec/README.md
index 80b3148..13cb1c5 100644
--- a/createmobilespec/README.md
+++ b/createmobilespec/README.md
@@ -42,49 +42,25 @@ and a way to use the platform-centered workflow instead of the CLI.
The easiest and quickest way to achieve this is by using `cordova-coho`:
- ```
+ ```shell
# Create a new folder, e.g. `cordova` and `cd cordova` into it.
git clone https://github.com/apache/cordova-coho.git
cd cordova-coho & npm install & cd ..
- node cordova-coho/coho repo-clone -r mobile-spec -r js -r lib -r plugman -r cli
- // -r android -r plugins
+ node cordova-coho/coho repo-clone -r mobile-spec -r tools -r plugins -r active-platforms
node cordova-coho/coho npm-link
```
-2.
- ```
- cd cordova-mobile-spec\createmobilespec & npm install & cd ..
- ```
-The following projects need to be checked out as peers (= in the same directory):
-
- * `cordova-mobile-spec` (this project)
- * `cordova-js`
- * `cordova-lib`
- * `cordova-plugman`
- * `cordova-cli`
- * All Cordova core plugins
- * All platforms to test (e.g., `cordova-android`, `cordova-ios` or `cordova-windows`)
-
-
-2. Run `npm install` in the following locations:
+ After this you should have 40+ folders in your `cordova` folder.
- * `cordova-mobile-spec/createmobilespec` (also contains this `README`)
- * `cordova-lib`
- * `cordova-cli`
-
-
-Each git repo should be checked out to the state or edited with the content
-that you want to test.
-
-(Be **aware** that it **will not download** missing
-plugin content from the [plugin registry](http://plugins.cordova.io) nor does
-it fetch platforms from the npm repository. (Except, I think it does...))
+2. As `cordova-mobile-spec` has a special structure, you have to install dependencies in `createmobilespec` manually:
+ ```shell
+ cd cordova-mobile-spec/createmobilespec & npm install & cd ../..
+ ```
+3. You are now ready to use `createmobilespec.js` with the commands below.
## Usage
-The `createmobilespec.js` script needs to be invoked from a specific current working directory: the one where you have all the git repos cloned.
-
-So if you were to do an `ls` in that directory, you should see all the git repos including `cordova-mobile-spec`. Thus an invocation should look like:
+The `createmobilespec.js` script also needs to be invoked from the "main" folder you created before (`cordova`):
cordova-mobile-spec/createmobilespec/createmobilespec.js
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-mobile-spec] 04/05: fix location of key and
build-extra.gradle for cordova-anroid 7.x
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-mobile-spec.git
commit c16beea19db490b0a187da37acd3e0ef980099e7
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sat Nov 24 12:28:48 2018 +0100
fix location of key and build-extra.gradle for cordova-anroid 7.x
---
createmobilespec/createmobilespec.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/createmobilespec/createmobilespec.js b/createmobilespec/createmobilespec.js
index c50397d..357d1c6 100755
--- a/createmobilespec/createmobilespec.js
+++ b/createmobilespec/createmobilespec.js
@@ -520,11 +520,11 @@ if (argv.plugman) {
console.log("platformArg: " + cli + " " + platformArg);
var linkPlatformsFlag = (argv.link || argv.linkplatforms) ? ' --link' : '';
executeShellCommand(cli + ' platform add "' + platformArg + '" --verbose' + linkPlatformsFlag);
- // TODO
+
if (platform == 'android') {
- shelljs.cp(path.join(__dirname, 'helper_files', 'android-debug-key.properties'), path.join('platforms', 'android'));
- shelljs.cp(path.join(__dirname, 'helper_files', 'android-debug-key.p12'), path.join('platforms', 'android'));
- shelljs.cp(path.join(__dirname, 'helper_files', 'build-extras.gradle'), path.join('platforms', 'android'));
+ shelljs.cp(path.join(__dirname, 'helper_files', 'android-debug-key.properties'), path.join('platforms', 'android', 'app'));
+ shelljs.cp(path.join(__dirname, 'helper_files', 'android-debug-key.p12'), path.join('platforms', 'android', 'app'));
+ shelljs.cp(path.join(__dirname, 'helper_files', 'build-extras.gradle'), path.join('platforms', 'android', 'app'));
}
});
popd();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-mobile-spec] 03/05: fix formatting of www/index.html
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-mobile-spec.git
commit 430efaf0b3321b36178a958f0c724ce17be39234
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sat Nov 24 12:27:49 2018 +0100
fix formatting of www/index.html
---
www/index.html | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/www/index.html b/www/index.html
index 943b4ec..b867707 100644
--- a/www/index.html
+++ b/www/index.html
@@ -25,18 +25,23 @@
<head>
<meta name="viewport" content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
<!-- Inject CSP -->
<script type="text/javascript" src="csp-incl.js"></script>
<title>Cordova Mobile Spec</title>
- <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script type="text/javascript" charset="utf-8" src="cordova-incl.js"></script>
- <script type="text/javascript" charset="utf-8" src="main.js"></script>
- <script type="text/javascript" charset="utf-8" src="doesnotexist/notcordova.js"></script><!-- CB-6764 -->
+ <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
+ <script type="text/javascript" charset="utf-8" src="cordova-incl.js"></script>
+ <script type="text/javascript" charset="utf-8" src="main.js"></script>
+
+ <!-- CB-6764 -->
+ <script type="text/javascript" charset="utf-8" src="doesnotexist/notcordova.js"></script>
</head>
<body id="stage" class="theme">
+
<h1>Apache Cordova Tests</h1>
+
<div id="info">cordova.version: <span id="cordova"> </span>
Platform: <span id="platform"> </span>
Version: <span id="version"> </span>
@@ -44,6 +49,7 @@ UUID: <span id="uuid"> </span>
Model: <span id="model"> </span>
Width: <span id="width"> </span>, Height: <span id="height"></span>, Color Depth: <span id="colorDepth"></span>
User-Agent: <span id="user-agent"> </span></div>
+
<a href="cdvtests/index.html#?showBack" class="btn large">Plugin Tests (Automatic and Manual)</a>
<a href="battery/index.html" class="btn large">Battery</a>
<a href="benchmarks/index.html" class="btn large">Benchmarks</a>
@@ -53,5 +59,6 @@ User-Agent: <span id="user-agent"> </span></div>
<a href="misc/index.html" class="btn large">Misc Content</a>
<a href="sql/index.html" class="btn large">Web SQL</a>
<a href="storage/index.html" class="btn large">Local Storage</a>
+
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-mobile-spec] 01/05: better console.log
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-mobile-spec.git
commit 5e01ac5ce1f787ad7f81542a8ebeb2c6be31c90f
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sat Nov 24 03:06:59 2018 +0100
better console.log
---
createmobilespec/createmobilespec.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/createmobilespec/createmobilespec.js b/createmobilespec/createmobilespec.js
index 94a7f72..c50397d 100755
--- a/createmobilespec/createmobilespec.js
+++ b/createmobilespec/createmobilespec.js
@@ -328,7 +328,7 @@ if (!fs.existsSync(path.join("cordova-coho", "coho"))) {
process.exit(3);
}
if (argv.global) {
- console.log("Creating project. Using globally installed tools, downloadable platforms and plugins, and local mobile-spec.");
+ console.log("### Creating project. Using globally installed tools, downloadable platforms and plugins, and local mobile-spec.");
console.log("To clone needed repositories:");
console.log(" ." + path.sep + "cordova-coho" + path.sep + "coho repo-clone -r mobile-spec");
console.log("To update all repositories:");
@@ -343,9 +343,9 @@ if (argv.global) {
repos.push("js");
}
if (argv.globalplugins) {
- console.log("Creating project from downloadable plugins, local tools and platforms, and local mobile-spec. If you have any errors, it may be from missing repositories.");
+ console.log("### Creating project from downloadable plugins, local tools and platforms, and local mobile-spec. If you have any errors, it may be from missing repositories.");
} else {
- console.log("Creating project from local git repos. If you have any errors, it may be from missing repositories.");
+ console.log("### Creating project from local git repos. If you have any errors, it may be from missing repositories.");
repos.push("plugins");
}
@@ -419,7 +419,7 @@ function verifyNpmLinkOf(linkedModule, installedModule) {
}
if (!argv.skiplink) {
- console.log("Checking if you are using master branch of tools");
+ console.log("Checking if you are using master branch of tools (js, lib, plugman, cli)");
// if js, lib, plugman, and cli have master checked out, should npm link.
var jsBranch = getBranchName("cordova-js");
var libBranch = getBranchName("cordova-lib");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org