--- android/TrainInfo/build.xml	2011/04/20 19:17:56	1359
+++ android/TrainInfo/build.xml	2011/11/28 09:13:16	1639
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="TrainInfo" default="help">
 
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
          source.dir
@@ -17,6 +16,9 @@
          out.dir
              The name of the output directory. Default is 'bin'.
 
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
          Properties related to the SDK location or the project target should
          be updated using the 'android' tool with the 'update' action.
 
@@ -24,82 +26,79 @@
          application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android'
+    <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
          This file is an integral part of the build system for your
          application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
+    <loadproperties srcFile="project.properties" />
 
-    <!-- Custom Android task to deal with the project target, and import the
-         proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
 
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
 
+    <target name="-pre-build">
 
-	<target name="-pre-build">
+        <echo message="--TrainInfoCommon--" />
+        <ant dir="../TrainInfoCommon/" antfile="../TrainInfoCommon/build.xml" inheritAll="false" />
+        <copy todir="libs">
+            <fileset dir="../TrainInfoCommon">
+                <include name="*.jar"/>
+            </fileset>
+        </copy>
+        <echo message="--TrainInfoCommon END--" />
+
+        <echo message="--GenericJavaUtils--" />
+        <ant dir="../GenericJavaUtils/" antfile="../GenericJavaUtils/build.xml" inheritAll="false" />
+        <copy file="../GenericJavaUtils/GenericJavaUtils.jar" todir="libs" />
+        <echo message="--GenericJavaUtils END--" />
 
-		<echo message="--TrainInfoCommon--" />
-		<ant dir="../TrainInfoCommon/" antfile="../TrainInfoCommon/build.xml" inheritAll="false" />
-		<copy todir="libs">
-			<fileset dir="../TrainInfoCommon">
-				<include name="*.jar"/>
-			</fileset>
-		</copy>
-		<echo message="--TrainInfoCommon END--" />
-
-		<echo message="--GenericJavaUtils--" />
-		<ant dir="../GenericJavaUtils/" antfile="../GenericJavaUtils/build.xml" inheritAll="false" />
-		<copy file="../GenericJavaUtils/GenericJavaUtils.jar" todir="libs" />
-		<echo message="--GenericJavaUtils END--" />
+    </target>
 
-	</target>
-	
 
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
 <!--
     <target name="-pre-build">
     </target>
     <target name="-pre-compile">
     </target>
 
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
     <target name="-post-compile">
     </target>
 -->
 
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+    <!-- Import the actual build file.
 
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the
-               <setup> task.
+               <import> task.
              - customize it to your needs.
-         - Customize the whole script.
+         - Customize the whole content of build.xml
              - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />. 
+               into this file, replacing the <import> task.
              - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <setup />
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>