You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2014/04/30 17:44:21 UTC
[2/4] git commit: Remove dev preferences from config
Remove dev preferences from config
Project: http://git-wip-us.apache.org/repos/asf/cordova-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-labs/commit/f695e4bf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-labs/tree/f695e4bf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-labs/diff/f695e4bf
Branch: refs/heads/cdvtest
Commit: f695e4bf9a13617582b5cd188221f5b25bfc7381
Parents: 42f74c3
Author: Michal Mocny <mm...@gmail.com>
Authored: Fri Apr 25 15:20:11 2014 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Fri Apr 25 15:41:00 2014 -0400
----------------------------------------------------------------------
cordova-app-test-harness/config.xml | 2 --
.../hooks/before_prepare/pre-prepare.js | 16 ----------------
.../hooks/before_prepare/pre-prepare.sh | 16 ++++++++++++++++
cordova-plugin-test-framework/plugin.xml | 16 +---------------
4 files changed, 17 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/f695e4bf/cordova-app-test-harness/config.xml
----------------------------------------------------------------------
diff --git a/cordova-app-test-harness/config.xml b/cordova-app-test-harness/config.xml
index 7d55342..142dae6 100644
--- a/cordova-app-test-harness/config.xml
+++ b/cordova-app-test-harness/config.xml
@@ -9,8 +9,6 @@
<content src="index.html" />
<access origin="http://www.apache.org/*" />
<access origin="https://www.googleapis.com/*" />
- <content src="http://192.168.1.147:8000/android" />
- <access origin="http://192.168.1.147:8000" />
<preference name="fullscreen" value="true" />
<preference name="webviewbounce" value="false" />
http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/f695e4bf/cordova-app-test-harness/hooks/before_prepare/pre-prepare.js
----------------------------------------------------------------------
diff --git a/cordova-app-test-harness/hooks/before_prepare/pre-prepare.js b/cordova-app-test-harness/hooks/before_prepare/pre-prepare.js
deleted file mode 100755
index 8b21f18..0000000
--- a/cordova-app-test-harness/hooks/before_prepare/pre-prepare.js
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -d "plugins/org.apache.cordova.test-framework" ]; then
- exit
-fi
-
-mkdir -p plugins platforms
-
-cordova platform add android
-cordova platform add ios
-
-cordova plugin add ~/dev/cordova/cordova-labs/cordova-plugin-test-framework
-cordova plugin add ~/dev/cordova/cordova-plugin-contacts
-cordova plugin add ~/dev/cordova/cordova-plugin-device
-cordova plugin add ~/dev/cordova/cordova-plugin-device-motion
-cordova plugin add ~/dev/cordova/cordova-plugin-geolocation
http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/f695e4bf/cordova-app-test-harness/hooks/before_prepare/pre-prepare.sh
----------------------------------------------------------------------
diff --git a/cordova-app-test-harness/hooks/before_prepare/pre-prepare.sh b/cordova-app-test-harness/hooks/before_prepare/pre-prepare.sh
new file mode 100755
index 0000000..09d8408
--- /dev/null
+++ b/cordova-app-test-harness/hooks/before_prepare/pre-prepare.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ -d "plugins/org.apache.cordova.test-framework" ]; then
+ exit
+fi
+
+mkdir -p plugins platforms
+
+cordova platform add android
+cordova platform add ios
+
+cordova plugin add ~/dev/cordova/cordova-labs/cordova-plugin-test-framework --searchpath ~/dev/cordova/cordova-labs
+cordova plugin add ~/dev/cordova/cordova-plugin-contacts --searchpath ~/dev/cordova
+cordova plugin add ~/dev/cordova/cordova-plugin-device --searchpath ~/dev/cordova
+cordova plugin add ~/dev/cordova/cordova-plugin-device-motion --searchpath ~/dev/cordova
+cordova plugin add ~/dev/cordova/cordova-plugin-geolocation --searchpath ~/dev/cordova
http://git-wip-us.apache.org/repos/asf/cordova-labs/blob/f695e4bf/cordova-plugin-test-framework/plugin.xml
----------------------------------------------------------------------
diff --git a/cordova-plugin-test-framework/plugin.xml b/cordova-plugin-test-framework/plugin.xml
index 25ed129..dc21287 100644
--- a/cordova-plugin-test-framework/plugin.xml
+++ b/cordova-plugin-test-framework/plugin.xml
@@ -10,22 +10,8 @@
<license>Apache 2.0</license>
<keywords>cordova,test</keywords>
- <dependency id="org.apache.cordova.appsettings" url="." subdir="cordova-plugin-appsettings" />
+ <dependency id="org.apache.cordova.appsettings" />
<js-module src="www/test.js" name="test" />
- <!-- android -->
- <platform name="android">
- <config-file target="res/xml/config.xml" parent="/*">
- <access origin="http://172.23.188.139" />
- </config-file>
- </platform>
-
- <!-- ios -->
- <platform name="ios">
- <config-file target="config.xml" parent="/*">
- <access origin="http://172.23.188.139" ></access>
- </config-file>
- </platform>
-
</plugin>