# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1430696795 -10800
# Node ID b557812c45dbd1cc886646e1743f6cd7eaf22550
# Parent  345db647383a75deeef8753f1b0519a0d991a90e
generating the android (ant) project stuff from the makefile

diff -r 345db647383a -r b557812c45db android/AndroidManifest.xml
--- a/android/AndroidManifest.xml	Sun May 03 02:23:54 2015 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.mutantstargoat.labyrinth"
-	android:versionCode="1"
-	android:versionName="1.0">
-
-	<uses-sdk android:minSdkVersion="9"/>
-
-	<application android:label="labyrinth"
-			android:hasCode="false"
-			android:debuggable="true">
-			<!-- android:icon="@drawable/ic_launcher" -->
-
-		<activity android:name="android.app.NativeActivity"
-			android:label="Labyrinth">
-
-			<meta-data android:name="android.app.lib_name" android:value="labyrinth"/>
-
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-	</application>
-</manifest>
diff -r 345db647383a -r b557812c45db android/Makefile
--- a/android/Makefile	Sun May 03 02:23:54 2015 +0300
+++ b/android/Makefile	Mon May 04 02:46:35 2015 +0300
@@ -50,9 +50,13 @@
 	@mkdir -p libs/armeabi
 	$(CC) -o $@ -shared $(obj) $(LDFLAGS)
 
+ant_files = *.xml *.properties proguard-project.txt
+ant_dirs = bin libs res
+
 .PHONY: clean
 clean:
-	rm -f $(obj) $(lib) $(apk-release) $(apk-debug)
+	rm -f $(obj) $(lib) $(apk-release) $(apk-debug) $(ant_files)
+	rm -rf $(ant_dirs)
 
 .PHONY: install
 install: install-debug
@@ -77,6 +81,10 @@
 stop:
 	adb shell am force-stop $(pkg)
 
+AndroidManifest.xml:
+	android create project -p . -t $(android_platform) -k $(pkg) -a NativeActivity -n $(name)
+	cat manifest.xml.in | sed 's/$$APPNAME/$(name)/g' | sed 's/$$APPTITLE/$(title)/g' >$@
+
 .PHONY: update-project
 update-project: build.xml
-	android update project --path . --target $(android_platform)
+	android update project -p . -t $(android_platform)
diff -r 345db647383a -r b557812c45db android/build.xml
--- a/android/build.xml	Sun May 03 02:23:54 2015 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="labyrinth" 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 -r 345db647383a -r b557812c45db android/manifest.xml.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/android/manifest.xml.in	Mon May 04 02:46:35 2015 +0300
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="com.mutantstargoat.$APPNAME"
+	android:versionCode="1"
+	android:versionName="1.0">
+
+	<uses-sdk android:minSdkVersion="9"/>
+
+	<application android:label="$APPNAME"
+			android:hasCode="false"
+			android:debuggable="true">
+			<!-- android:icon="@drawable/ic_launcher" -->
+
+		<activity android:name="android.app.NativeActivity"
+			android:label="$APPTITLE">
+
+			<meta-data android:name="android.app.lib_name" android:value="$APPNAME"/>
+
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+	</application>
+</manifest>
diff -r 345db647383a -r b557812c45db proj.mk
--- a/proj.mk	Sun May 03 02:23:54 2015 +0300
+++ b/proj.mk	Mon May 04 02:46:35 2015 +0300
@@ -2,6 +2,7 @@
 
 src = $(wildcard $(root)/src/*.c)
 bin = labyrinth
+title = Labyrinth
 
 incpaths = -I$(root)/src
 libpaths =