From 9fccdf5b88a92ce46421e8640ee5303fb50f0f00 Mon Sep 17 00:00:00 2001
From: Piotr Gurgul <pgurgul@google.com>
Date: Tue, 25 Aug 2009 10:59:55 -0700
Subject: [PATCH] Alias rules properties names update

android-tools change to android.tools.dir
sdk-folder to sdk.dir
resource-dir to resource.dir
out-package to out.package
Some minor style changes introduced.
---
 tools/scripts/alias_rules.xml      | 24 ++++++++++++------------
 tools/scripts/build.alias.template |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/scripts/alias_rules.xml b/tools/scripts/alias_rules.xml
index bc7de7cdc..18b978e28 100644
--- a/tools/scripts/alias_rules.xml
+++ b/tools/scripts/alias_rules.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="alias_rules" default="package">
 
-    <!-- No user servicable parts below. -->
+    <!-- No user serviceable parts below. -->
 
     <!-- Input directories -->
-    <property name="resource-dir" value="res" />
+    <property name="resource.dir" value="res" />
 
     <!-- The final package file to generate -->
-    <property name="out-package" value="${ant.project.name}.apk" />
+    <property name="out.package" value="${ant.project.name}.apk" />
 
     <!-- Tools -->
-    <condition property="aapt" value="${android-tools}/aapt.exe" else="${android-tools}/aapt" >
-        <os family="windows"/>
+    <condition property="aapt" value="${android.tools.dir}/aapt.exe" else="${android.tools.dir}/aapt">
+        <os family="windows" />
     </condition>
-    <condition property="adb" value="${android-tools}/adb.exe" else="${android-tools}/adb" >
-        <os family="windows"/>
+    <condition property="adb" value="${android.tools.dir}/adb.exe" else="${android.tools.dir}/adb">
+        <os family="windows" />
     </condition>
-    <property name="android-jar" value="${sdk-folder}/android.jar" />
+    <property name="android.jar" value="${sdk.dir}/android.jar" />
 
     <!-- Rules -->
 
@@ -29,11 +29,11 @@
             <arg value="-M" />
             <arg value="AndroidManifest.xml" />
             <arg value="-S" />
-            <arg value="${resource-dir}" />
+            <arg value="${resource.dir}" />
             <arg value="-I" />
-            <arg value="${android-jar}" />
+            <arg value="${android.jar}" />
             <arg value="-F" />
-            <arg value="${out-package}" />
+            <arg value="${out.package}" />
         </exec>
     </target>
 
@@ -45,7 +45,7 @@
         <echo>Sending package to default emulator...</echo>
         <exec executable="${adb}" failonerror="true">
             <arg value="install" />
-            <arg value="${out-package}" />
+            <arg value="${out.package}" />
         </exec>
     </target>
 
diff --git a/tools/scripts/build.alias.template b/tools/scripts/build.alias.template
index b60529599..4771b6303 100644
--- a/tools/scripts/build.alias.template
+++ b/tools/scripts/build.alias.template
@@ -4,16 +4,16 @@
     <!-- The build.properties file can be created by you and is never touched
          by activitycreator. If you want to manually set properties, this is
          the best place to set them. -->
-    <property file="build.properties"/>
+    <property file="build.properties" />
 
     <!-- The default.properties file is created and updated by activitycreator.
          It will set any properties not already defined by build.properties. -->
-    <property file="default.properties"/>
+    <property file="default.properties" />
 
     <!-- ************************************************************************************* -->
-    <!-- Import the default Android build rules. 
+    <!-- Import the default Android build rules.
          This requires ant 1.6.0 or above. -->
 
-    <import file="${sdk-folder}/tools/lib/alias_rules.xml" />
+    <import file="${sdk.dir}/tools/lib/alias_rules.xml" />
 
 </project>