From 9fd9cf55cf1b4581413f4d118fe257dce4a54eca Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Wed, 2 Feb 2011 11:38:30 +0800
Subject: [PATCH] Adding version number to phonegap jar/js files

---
 VERSION             |  1 +
 framework/build.xml | 39 +++++++++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 VERSION

diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000..965065db
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.9.3
diff --git a/framework/build.xml b/framework/build.xml
index 450ff5f9..be9e27c1 100755
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="PhoneGap" default="help">
 
+    <!-- LOAD VERSION -->
+    <loadfile property="version" srcFile="../VERSION">
+        <filterchain>
+            <striplinebreaks/>
+        </filterchain>
+    </loadfile>
+
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked in in Version
          Control Systems. -->
@@ -73,7 +80,7 @@
 				<include name="lint.js" />
 			</fileset>
 			<fileset dir="assets/www">
-				<include name="phonegap.js" />
+				<include name="phonegap-${version}.js" />
 			</fileset>
 		</concat>
 
@@ -100,15 +107,21 @@
     <target name="build-uncompressed-javascript">
 
       <!-- Clean up existing files -->
-      <delete file="assets/www/phonegap.js"/>
+      <delete file="assets/www/phonegap-${version}.min.js"/>
       <delete file="assets/www/phonegap-tmp.js"/>
-      <delete file="assets/www/phonegap-uncompressed.js"/>
+      <delete file="assets/www/phonegap-${version}.js"/>
       
       <!-- Create uncompressed JS file -->
-      <concat destfile="assets/www/phonegap.js">
+      <concat destfile="assets/www/phonegap-${version}.js">
         <fileset dir="assets/js" includes="phonegap.js.base" />
         <fileset dir="assets/js" includes="*.js" />
       </concat>
+
+      <!-- update project files to reference phonegap-x.x.x.js -->
+      <replaceregexp match="phonegap(.*)\.js" replace="phonegap-${version}.js" byline="true">
+        <fileset file="assets/www/index.html" />
+        <fileset file="../example/index.html" />
+      </replaceregexp>
     </target>
     
     <!-- Combine JavaScript files into one phonegap-uncompressed.js file.
@@ -116,24 +129,30 @@
     <target name="build-javascript">
         
       <!-- Clean up existing files -->
-      <delete file="assets/www/phonegap.js"/>
+      <delete file="assets/www/phonegap_${version}.min.js"/>
       <delete file="assets/www/phonegap-tmp.js"/>
-      <delete file="assets/www/phonegap-uncompressed.js"/>
+      <delete file="assets/www/phonegap_${version}.js"/>
         
       <!-- Create uncompressed JS file -->
-      <concat destfile="assets/www/phonegap-uncompressed.js">
+      <concat destfile="assets/www/phonegap-${version}.js">
         <fileset dir="assets/js" includes="phonegap.js.base" />
         <fileset dir="assets/js" includes="*.js" />
       </concat>
 
       <!-- Compress JS file -->
       <java jar="${basedir}/../util/yuicompressor/yuicompressor-2.4.2.jar" fork="true" failonerror="true">
-        <arg line="--nomunge -o assets/www/phonegap-tmp.js assets/www/phonegap-uncompressed.js"/>
+        <arg line="--nomunge -o assets/www/phonegap-tmp.js assets/www/phonegap-${version}.js"/>
       </java>
-      <concat destfile="assets/www/phonegap.js">
+      <concat destfile="assets/www/phonegap-${version}.min.js">
         <fileset dir="assets/js" includes="header.txt" />
         <fileset dir="assets/www" includes="phonegap-tmp.js" />
       </concat>
+
+      <!-- update project files to reference phonegap-x.x.x.min.js -->
+      <replaceregexp match="phonegap(.*)\.js" replace="phonegap-${version}.min.js" byline="true">
+        <fileset file="assets/www/index.html" />
+        <fileset file="../example/index.html" />
+      </replaceregexp>
         
       <!-- Delete temp file -->
       <delete file="assets/www/phonegap-tmp.js"/>
@@ -148,7 +167,7 @@
             "build-javascript" => "build-uncompressed-javascript".
     -->
     <target name="jar" depends="build-javascript, compile">
-      <jar jarfile="phonegap.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
+      <jar jarfile="phonegap-${version}.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
     </target>
 
     <target name="phonegap_debug" depends="build-javascript, debug">