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/06/03 21:29:18 UTC
[1/2] android commit: Add a comment to custom_rules.xml saying why we
move AndroidManifest.xml
Repository: cordova-android
Updated Branches:
refs/heads/master 2661e010d -> 94de0a7ce
Add a comment to custom_rules.xml saying why we move AndroidManifest.xml
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/94de0a7c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/94de0a7c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/94de0a7c
Branch: refs/heads/master
Commit: 94de0a7ce2a233cbadcff3489398b0e1bce0538c
Parents: 36e9fb2
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jun 3 15:28:45 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jun 3 15:29:06 2014 -0400
----------------------------------------------------------------------
bin/templates/project/custom_rules.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/94de0a7c/bin/templates/project/custom_rules.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/custom_rules.xml b/bin/templates/project/custom_rules.xml
index 4b20e22..66483d3 100644
--- a/bin/templates/project/custom_rules.xml
+++ b/bin/templates/project/custom_rules.xml
@@ -13,6 +13,7 @@
</path>
<echo message="Set jars path to: ${toString:project.all.jars.path}"/>
</target>
+ <!-- Rename AndroidManifest.xml so that Eclipse's import wizard doesn't detect ant-build as a project -->
<target name="-post-build">
<move file="ant-build/AndroidManifest.xml" tofile="ant-build/AndroidManifest.cordova.xml" failonerror="false" overwrite="true" />
<move file="CordovaLib/ant-build/AndroidManifest.xml" tofile="CordovaLib/ant-build/AndroidManifest.cordova.xml" failonerror="false" overwrite="true" />
[2/2] android commit: Remove +x from README.md
Posted by ag...@apache.org.
Remove +x from README.md
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/36e9fb29
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/36e9fb29
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/36e9fb29
Branch: refs/heads/master
Commit: 36e9fb292b17ac104c2967ee1925b17215e66c3f
Parents: 2661e01
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jun 3 15:28:35 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jun 3 15:29:06 2014 -0400
----------------------------------------------------------------------
README.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/36e9fb29/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
old mode 100755
new mode 100644