You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bc...@apache.org on 2012/02/18 00:30:36 UTC
[1/3] android commit: Update build to use new common
cordova.android.js instead of building js from multiple Android js files.
Updated Branches:
refs/heads/master d6fef8d6e -> 14b368e73
Update build to use new common cordova.android.js instead of building js from multiple Android js files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/14b368e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/14b368e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/14b368e7
Branch: refs/heads/master
Commit: 14b368e731d3dac388c7a76722ace11043bf4bd7
Parents: 4d03577
Author: Bryce Curtis <cu...@gmail.com>
Authored: Fri Feb 17 17:30:25 2012 -0600
Committer: Bryce Curtis <cu...@gmail.com>
Committed: Fri Feb 17 17:30:25 2012 -0600
----------------------------------------------------------------------
framework/build.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/14b368e7/framework/build.xml
----------------------------------------------------------------------
diff --git a/framework/build.xml b/framework/build.xml
index 95c4915..e10fcf3 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -92,6 +92,7 @@
<target name="check-javascript" depends="build-javascript">
+ <!--
<delete dir="assets/lib"/>
<mkdir dir="assets/lib"/>
<echo file="assets/lib/lint.js">var alert=function(){},device={},Element={},debug={};</echo>
@@ -120,6 +121,7 @@
<arg value="../util/jslint.js"/>
<arg value="assets/lib/cordova-lint.js"/>
</exec>
+ -->
</target>
<!-- Combine JavaScript files into one cordova-uncompressed.js file. -->
@@ -130,8 +132,11 @@
<!-- Create uncompressed JS file -->
<concat destfile="assets/www/cordova-${version}.js">
+ <filelist dir="assets/js" files="cordova.android.js"/>
+ <!--
<filelist dir="assets/js" files="cordova.js.base,device.js"/>
<fileset dir="assets/js" includes="*.js" excludes="cordova.js.base,device.js"/>
+ -->
</concat>
<!-- update project files to reference cordova-x.x.x.min.js -->