You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/10/25 03:26:30 UTC

[12/17] git commit: Fix createproject.sh to work with hard-coded activity.java filename

Fix createproject.sh to work with hard-coded activity.java filename


Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/bbefd2ae
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/bbefd2ae
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/bbefd2ae

Branch: refs/heads/master
Commit: bbefd2aeb60b19e18f65f5caff3032d21a98b996
Parents: d9b8c49
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Oct 21 15:47:03 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Oct 24 21:26:07 2014 -0400

----------------------------------------------------------------------
 createproject.sh | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/bbefd2ae/createproject.sh
----------------------------------------------------------------------
diff --git a/createproject.sh b/createproject.sh
index 2e29065..ef16c40 100755
--- a/createproject.sh
+++ b/createproject.sh
@@ -114,6 +114,9 @@ set +x
 if [[ "$PLATFORMS" = *android* ]]; then
     echo 'var fs = require("fs");
           var fname = "platforms/android/src/org/apache/appharness/CordovaAppHarness.java";
+          if (!fs.existsSync(fname)) {
+              fname = "platforms/android/src/org/apache/appharness/MainActivity.java";
+          }
           var tname = "'$AH_PATH'/template-overrides/Activity.java";
           var orig = fs.readFileSync(fname, "utf8");
           var templ = fs.readFileSync(tname, "utf8");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org