From: Martin Vajnar <martin.vajnar@gmail.com>
Date: Fri, 13 Sep 2013 13:31:38 +0000 (+0200)
Subject: ANDROID: allow compilation from command line add new orte_config.h
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/orte/eurobot.git/commitdiff_plain/d074611ce54db31067d6d5c9f9f3770cd528b763

ANDROID: allow compilation from command line add new orte_config.h

This allows compilation of native code with ndk-build and of Java part with
ant.
---

diff --git a/orte/Robot_Demo/build.xml b/orte/Robot_Demo/build.xml
new file mode 100644
index 0000000..75cd3f2
--- /dev/null
+++ b/orte/Robot_Demo/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="RoboDruid" 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 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" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- 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' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (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})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- 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>
diff --git a/orte/Robot_Demo/gen/org/ocera/orte/R.java b/orte/Robot_Demo/gen/org/ocera/orte/R.java
deleted file mode 100644
index d6c47c6..0000000
--- a/orte/Robot_Demo/gen/org/ocera/orte/R.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-package org.ocera.orte;
-
-public final class R {
-	public static final class drawable {
-		public static final int ic_launcher = 0x7f020000;
-	}
-	public static final class string {
-		public static final int app_name = 0x7f040000;
-	}
-	public static final class style {
-		public static final int AppBaseTheme = 0x7f050000;
-		public static final int AppTheme = 0x7f050001;
-	}
-}
diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/BuildConfig.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/BuildConfig.java
deleted file mode 100644
index 7d1bf6f..0000000
--- a/orte/Robot_Demo/gen/org/ocera/orte/demo/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package org.ocera.orte.demo;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
deleted file mode 100644
index 81bf7ef..0000000
--- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.ocera.orte.demo;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int ic_launcher=0x7f020000;
-        public static final int logo_cvut=0x7f020001;
-        public static final int logo_flamingos=0x7f020002;
-    }
-    public static final class id {
-        public static final int about=0x7f07001a;
-        public static final int crane=0x7f070017;
-        public static final int editText1=0x7f07000a;
-        public static final int editText2=0x7f07000d;
-        public static final int editText3=0x7f070010;
-        public static final int editText4=0x7f070013;
-        public static final int exit=0x7f07001b;
-        public static final int hokuyo=0x7f070016;
-        public static final int hokuyo_view=0x7f070004;
-        public static final int hokuyo_view_bg=0x7f070003;
-        public static final int imageView1=0x7f070001;
-        public static final int magnet=0x7f070018;
-        public static final int managers=0x7f070006;
-        public static final int ownIP=0x7f070007;
-        public static final int scrollView1=0x7f070000;
-        public static final int scrollView2=0x7f070005;
-        public static final int scrollView3=0x7f070008;
-        public static final int speed=0x7f070014;
-        public static final int speed_mon=0x7f070015;
-        public static final int tableRow1=0x7f070009;
-        public static final int tableRow2=0x7f07000b;
-        public static final int tableRow3=0x7f07000e;
-        public static final int tableRow4=0x7f070011;
-        public static final int textView1=0x7f070002;
-        public static final int textView2=0x7f07000c;
-        public static final int textView3=0x7f07000f;
-        public static final int textView4=0x7f070012;
-        public static final int voltage=0x7f070019;
-    }
-    public static final class layout {
-        public static final int about_dialog=0x7f030000;
-        public static final int hokuyo_view=0x7f030001;
-        public static final int managers_view=0x7f030002;
-        public static final int status_dialog=0x7f030003;
-    }
-    public static final class menu {
-        public static final int activity_main=0x7f060000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-    }
-    public static final class style {
-        /** 
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-         */
-        public static final int AppBaseTheme=0x7f050000;
-        /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
- Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
-         */
-        public static final int AppTheme=0x7f050001;
-        public static final int voltage_dialog=0x7f050002;
-    }
-}
diff --git a/orte/libaorte/build.xml b/orte/libaorte/build.xml
new file mode 100644
index 0000000..83e6f13
--- /dev/null
+++ b/orte/libaorte/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="libaorte" 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 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" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- 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' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (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})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- 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>
diff --git a/orte/libaorte/gen/org/ocera/orte/BuildConfig.java b/orte/libaorte/gen/org/ocera/orte/BuildConfig.java
deleted file mode 100644
index 9113210..0000000
--- a/orte/libaorte/gen/org/ocera/orte/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package org.ocera.orte;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/orte/libaorte/gen/org/ocera/orte/R.java b/orte/libaorte/gen/org/ocera/orte/R.java
deleted file mode 100644
index 65affb1..0000000
--- a/orte/libaorte/gen/org/ocera/orte/R.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.ocera.orte;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static int ic_launcher=0x7f020000;
-    }
-    public static final class string {
-        public static int app_name=0x7f030000;
-    }
-    public static final class style {
-        /** 
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-         */
-        public static int AppBaseTheme=0x7f040000;
-        /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
-         */
-        public static int AppTheme=0x7f040001;
-    }
-}
diff --git a/orte/libaorte/src/org/ocera/orte/package-info.java b/orte/libaorte/src/org/ocera/orte/package-info.java
deleted file mode 100644
index 4c539ef..0000000
--- a/orte/libaorte/src/org/ocera/orte/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author martin
- *
- */
-package org.ocera.orte;
\ No newline at end of file
diff --git a/orte/libaorte/src/org/ocera/orte/tools/package-info.java b/orte/libaorte/src/org/ocera/orte/tools/package-info.java
deleted file mode 100644
index c5f1808..0000000
--- a/orte/libaorte/src/org/ocera/orte/tools/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author martin
- *
- */
-package org.ocera.orte.tools;
\ No newline at end of file
diff --git a/orte/libaorte/src/org/ocera/orte/types/package-info.java b/orte/libaorte/src/org/ocera/orte/types/package-info.java
deleted file mode 100644
index 407634e..0000000
--- a/orte/libaorte/src/org/ocera/orte/types/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author martin
- *
- */
-package org.ocera.orte.types;
\ No newline at end of file