cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject android commit: CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ as a project when importing
Date Sun, 26 Jan 2014 03:00:36 GMT
Updated Branches:
  refs/heads/3.4.x 06660383e -> 029d1561d


CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/
as a project when importing


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/029d1561
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/029d1561
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/029d1561

Branch: refs/heads/3.4.x
Commit: 029d1561dc61d7d2e7e4e3c0ca24f94b2fa40e50
Parents: 0666038
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Sat Jan 25 21:58:28 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Sat Jan 25 22:00:26 2014 -0500

----------------------------------------------------------------------
 bin/templates/project/custom_rules.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/029d1561/bin/templates/project/custom_rules.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/custom_rules.xml b/bin/templates/project/custom_rules.xml
index d0fedea..4b20e22 100644
--- a/bin/templates/project/custom_rules.xml
+++ b/bin/templates/project/custom_rules.xml
@@ -13,5 +13,9 @@
         </path>
         <echo message="Set jars path to: ${toString:project.all.jars.path}"/>
     </target>
+    <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" />
+    </target>
 </project>
 


Mime
View raw message