From ef8e8a3ab406ee639d1940e7fb3e19a6fbc155ec Mon Sep 17 00:00:00 2001
From: Dave Johnson <dave@nitobi.com>
Date: Sun, 21 Aug 2011 00:29:07 -0700
Subject: [PATCH] Fix up a few things for the ant create to work on mac

---
 bin/create.js                             |  2 +-
 bin/create.xml                            | 18 ++++++++----------
 bin/templates/project/AndroidManifest.xml | 20 ++++++++++----------
 framework/build.xml                       |  6 +++---
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/bin/create.js b/bin/create.js
index 23065665..37e2977a 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -60,7 +60,7 @@ exec('android.bat update project --target '+TARGET+' --path framework');
 // compile phonegap.js and phonegap.jar
 // if you see an error about "Unable to resolve target" then you may need to 
 // update your android tools or install an additional Android platform version
-exec('ant.bat -v -f framework\\build.xml jar');
+exec('ant.bat -f framework\\build.xml jar');
 
 // copy in the project template
 exec('cmd /c xcopy bin\\templates\\project '+PROJECT_PATH+' /S /Y');
diff --git a/bin/create.xml b/bin/create.xml
index a578993d..c8c636a6 100644
--- a/bin/create.xml
+++ b/bin/create.xml
@@ -7,17 +7,20 @@
 
 	<target name="create">
 
+		<!-- this stuff is seriously stupid -->
 		<echo file="tmp/package.tmp">package-as-path=${package}</echo>
 		<replace file="tmp/package.tmp" token="." value="\\" />
 		<property file="tmp/package.tmp" />
+
 		<property name="activity.path" value="${project.path}/src/${package-as-path}/${activity}.java" />
 		<property name="manifest.path" value="${project.path}/AndroidManifest.xml" />
 
 		<!-- get the highest target on this machine -->
-		<exec executable="cmd" osfamily="windows" output="target.list.tmp">
+		<!-- this stuff is also seriously stupid -->
+		<exec executable="cmd" osfamily="windows" output="tmp/target.list.tmp">
 			<arg line="/c android.bat list targets"/>
 		</exec>
-		<exec executable="android" osfamily="mac,unix">
+		<exec executable="android" osfamily="mac" output="tmp/target.list.tmp">
 			<arg line="list targets"/>
 		</exec>
 		<replaceregexp file="tmp/target.list.tmp" match=".*id:\s([0-9]).*" replace="target=\1" flags="s" />
@@ -35,7 +38,7 @@
 		<exec executable="cmd" osfamily="windows">
 			<arg line="/c android.bat create project --target ${target} --path ${project.path} --package ${package} --activity ${activity}"/>
 		</exec>
-		<exec executable="android" osfamily="mac,unix">
+		<exec executable="android" osfamily="mac">
 			<arg line="create project --target ${target} --path ${project.path} --package ${package} --activity ${activity}"/>
 		</exec>
 
@@ -43,19 +46,14 @@
 		<exec executable="cmd" osfamily="windows">
 			<arg line="/c android.bat update project --target ${target} --path ${basedir}/framework"/>
 		</exec>
-		<exec executable="android" osfamily="mac,unix">
+		<exec executable="android" osfamily="mac">
 			<arg line="update project --target ${target} --path ${basedir}/framework"/>
 		</exec>
 
 		<!-- compile phonegap.js and phonegap.jar -->
 		<!--	// if you see an error about "Unable to resolve target" then you may need to 
 				// update your android tools or install an additional Android platform version -->
-		<exec executable="cmd" osfamily="windows">
-			<arg line="ant.bat -v -f ${basedir}/framework/build.xml jar"/>
-		</exec>
-		<exec executable="ant" osfamily="mac,unix">
-			<arg line="-v -f ${basedir}/framework/build.xml jar"/>
-		</exec>
+		<ant antfile="${basedir}/framework/build.xml" useNativeBasedir="true" inheritAll="false" />
 
 		<!-- copy in the project template -->
 		<copy todir="${project.path}" overwrite="true">
diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml
index 7f654257..2269f379 100644
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -32,17 +32,17 @@
 
     <application android:icon="@drawable/icon" android:label="@string/app_name"
     	android:debuggable="true">
-        <activity android:name=".StandAlone" android:windowSoftInputMode="adjustPan"
-                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+		<activity android:name="__ACTIVITY__" android:label="@string/app_name" 
+				  android:configChanges="orientation|keyboardHidden">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
         </activity>
-        <activity android:name="__ACTIVITY__" android:label="@string/app_name" 
-                  android:configChanges="orientation|keyboardHidden">
-            <intent-filter>
-            </intent-filter>
+        <activity android:name="com.phonegap.DroidGap" android:label="@string/app_name" 
+            	  android:configChanges="orientation|keyboardHidden">
+        	<intent-filter>
+        	</intent-filter>
         </activity>
     </application>
 
diff --git a/framework/build.xml b/framework/build.xml
index 275a9930..a253d2b1 100755
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -109,7 +109,7 @@
     <target name="build-javascript">
         
       <!-- Clean up existing files -->
-      <delete file="assets/www/phonegap_${version}.js"/>
+      <!--<delete file="assets/www/phonegap_${version}.js"/>-->
         
       <!-- Create uncompressed JS file -->
       <concat destfile="assets/www/phonegap-${version}.js">
@@ -120,14 +120,14 @@
       <!-- update project files to reference phonegap-x.x.x.min.js -->
       <replaceregexp match="phonegap(.*)\.js" replace="phonegap-${version}.js" byline="true">
          <fileset file="assets/www/index.html" /> 
-        <fileset file="../bin/templates/www/index.html" />
+        <fileset file="../bin/templates/project/assets/www/index.html" />
       </replaceregexp>
       <replaceregexp match="phonegapVersion = [\u0022].*[\u0022];" replace="phonegapVersion = ${dblQuote}${version}${dblQuote};" byline="true">
         <fileset file="src/com/phonegap/Device.java" />
       </replaceregexp>
         
       <!-- Delete temp file -->
-      <delete file="assets/www/phonegap-tmp.js"/>
+      <!--<delete file="assets/www/phonegap-tmp.js"/>-->
     </target>
 
     <!-- Build PhoneGap jar file that includes all native code, and PhoneGap JS file