You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/05/17 02:54:54 UTC
[02/22] [CB-3307] Rename cordova-VERSION.js -> cordova.js
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8a95ed8e/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 1caeb8a..57ad752 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
<html>
<head>
<title></title>
- <script src="cordova-2.6.0.js"></script>
+ <script src="cordova.js"></script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8a95ed8e/framework/build.xml
----------------------------------------------------------------------
diff --git a/framework/build.xml b/framework/build.xml
index 9e7b127..989dbb2 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -26,8 +26,7 @@
</filterchain>
</loadfile>
- <!-- check that the version of ant is at least 1.8.0, as is needed
- for the dblQuote property -->
+ <!-- check that the version of ant is at least 1.8.0 -->
<antversion property="thisantversion" atleast="1.8.0" />
<fail message="The required minimum version of ant is 1.8.0, you have ${ant.version}"
unless="thisantversion" />
@@ -80,9 +79,6 @@
-->
<property file="ant.properties" />
- <!-- We need to setup the double quote. -->
- <property name="dblQuote">"</property>
-
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
@@ -136,33 +132,10 @@
-->
<import file="${sdk.dir}/tools/ant/build.xml" />
- <!-- Combine JavaScript files into one cordova-uncompressed.js file. -->
- <target name="build-javascript" depends="clean">
-
- <!-- Clean up existing files -->
- <!--<delete file="assets/www/cordova_${version}.js"/>-->
-
- <!-- Create uncompressed JS file -->
- <concat destfile="assets/www/cordova-${version}.js">
- <filelist dir="assets/js" files="cordova.android.js"/>
- </concat>
-
- <!-- update project files to reference cordova-x.x.x.min.js -->
- <replaceregexp match="cordova(.*)\.js" replace="cordova-${version}.js" byline="true">
- <fileset file="assets/www/index.html" />
- <fileset file="../bin/templates/project/assets/www/index.html" />
- </replaceregexp>
-
- <!-- This is sketchy, but it works, ${dblQuote} does not -->
- <replaceregexp match="cordovaVersion = [\u0022].*[\u0022];" replace='cordovaVersion = ${dblQuote}${version}${dblQuote};' byline="true">
- <fileset file="src/org/apache/cordova/Device.java" />
- </replaceregexp>
- </target>
-
<!-- Build Cordova jar file that includes all native code, and Cordova JS file
that includes all JavaScript code.
-->
- <target name="jar" depends="build-javascript, -compile">
+ <target name="jar" depends="-compile">
<jar jarfile="cordova-${version}.jar" basedir="bin/classes" excludes="org/apache/cordova/R.class,org/apache/cordova/R$*.class"/>
</target>
@@ -195,10 +168,10 @@
</junit>
</target>
- <target name="cordova_debug" depends="build-javascript, debug">
+ <target name="cordova_debug" depends="debug">
</target>
- <target name="cordova_release" depends="build-javascript, release">
+ <target name="cordova_release" depends="release">
</target>
</project>
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8a95ed8e/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index aa316c5..d9d9928 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends CordovaPlugin {
public static final String TAG = "Device";
- public static String cordovaVersion = "2.6.0"; // Cordova version
+ public static String cordovaVersion = "dev"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID