From c3004ce6a1bb6e9c9b35fe72e7c8cae7aedb7d68 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@belledonne-communications.com>
Date: Wed, 28 Dec 2011 14:38:14 +0100
Subject: [PATCH] updated build.xml

---
 build.xml | 171 ++++++++++++++++++++++++++----------------------------
 1 file changed, 81 insertions(+), 90 deletions(-)

diff --git a/build.xml b/build.xml
index 8a4d9369c..a692a36aa 100644
--- a/build.xml
+++ b/build.xml
@@ -1,94 +1,85 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- WARNING: Eclipse auto-generated file.
-              Any modifications will be overwritten.
-              To include a user specific buildfile here, simply create one in the same
-              directory with the processing instruction <?eclipse.ant.import?>
-              as the first entry and export the buildfile again. -->
-<project basedir="." default="build" name="linphone-android">
-    <property environment="env"/>
-    <property name="debuglevel" value="source,lines,vars"/>
-    <property name="target" value="1.6"/>
-    <property name="source" value="1.6"/>
-    <path id="Android 3.2.libraryclasspath">
-        <pathelement location="/Users/buildbot/sdk/platforms/android-13/android.jar"/>
-    </path>
-    <path id="linphone-android.classpath">
-        <pathelement location="bin/classes"/>
-        <path refid="Android 3.2.libraryclasspath"/>
-    </path>
-    <target name="init">
-        <mkdir dir="bin/classes"/>
-        <copy includeemptydirs="false" todir="bin/classes">
-            <fileset dir="gen">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-        <copy includeemptydirs="false" todir="bin/classes">
-            <fileset dir="submodules/linphone/mediastreamer2/java/src">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-                <exclude name="org/linphone/mediastream/MediastreamerActivity.java"/>
-            </fileset>
-        </copy>
-        <copy includeemptydirs="false" todir="bin/classes">
-            <fileset dir="submodules/linphone/java/j2se">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-        <copy includeemptydirs="false" todir="bin/classes">
-            <fileset dir="submodules/linphone/java/common">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-        <copy includeemptydirs="false" todir="bin/classes">
-            <fileset dir="submodules/linphone/coreapi/help/java">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-        <copy includeemptydirs="false" todir="bin/classes">
-            <fileset dir="src">
-                <exclude name="**/*.launch"/>
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="LinphoneLauncherActivity" 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. -->
+    <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
+             The name of the source directory. Default is 'src'.
+         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.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- 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. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- 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>
-    <target name="clean">
-        <delete dir="bin/classes"/>
+    <target name="-pre-compile">
     </target>
-    <target depends="clean" name="cleanall"/>
-    <target depends="build-subprojects,build-project" name="build"/>
-    <target name="build-subprojects"/>
-    <target depends="init" name="build-project">
-        <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin/classes" source="${source}" target="${target}">
-            <src path="gen"/>
-            <classpath refid="linphone-android.classpath"/>
-        </javac>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin/classes" source="${source}" target="${target}">
-            <src path="submodules/linphone/mediastreamer2/java/src"/>
-            <exclude name="org/linphone/mediastream/MediastreamerActivity.java"/>
-            <classpath refid="linphone-android.classpath"/>
-        </javac>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin/classes" source="${source}" target="${target}">
-            <src path="submodules/linphone/java/j2se"/>
-            <classpath refid="linphone-android.classpath"/>
-        </javac>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin/classes" source="${source}" target="${target}">
-            <src path="submodules/linphone/java/common"/>
-            <classpath refid="linphone-android.classpath"/>
-        </javac>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin/classes" source="${source}" target="${target}">
-            <src path="submodules/linphone/coreapi/help/java"/>
-            <classpath refid="linphone-android.classpath"/>
-        </javac>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin/classes" source="${source}" target="${target}">
-            <src path="src"/>
-            <classpath refid="linphone-android.classpath"/>
-        </javac>
+
+    /* 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>
-    <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
+-->
+
+    <!-- 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
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               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"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
 </project>