From b3962202f4a5075ab7eb8f27be25b515a4206be4 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Fri, 28 Dec 2012 23:34:50 +0100
Subject: [PATCH] [DEV] better android compilation

---
 Makefile.Android.mk  | 30 ++++++++++++++++++++----------
 core/setup-target.mk |  3 ++-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Makefile.Android.mk b/Makefile.Android.mk
index c2f0c2d..194e01b 100644
--- a/Makefile.Android.mk
+++ b/Makefile.Android.mk
@@ -197,7 +197,8 @@ final : javaclean $(FINAL_FILE_ABSTRACTION) $(TARGET_OUT_STAGING)/AndroidManifes
 	
 	@# keytool is situated in $(JAVA_HOME)/bin ...
 	@echo "apk(Signed) <== apk"
-	@#generate the pass file :
+ifeq ("$(DEBUG)","1")
+	@#generate the pass file (debug mode does not request to have a complicated key) :
 	@echo "Pass$(PROJECT_NAME2)" > tmpPass.boo
 	@echo "PassK$(PROJECT_NAME2)" >> tmpPass.boo
 	@# verbose mode : -verbose
@@ -205,9 +206,17 @@ final : javaclean $(FINAL_FILE_ABSTRACTION) $(TARGET_OUT_STAGING)/AndroidManifes
 	    -keystore ./$(PROJECT_NAME2)-$(BUILD_DIRECTORY_MODE).jks \
 	    $(TARGET_OUT_STAGING)/build/$(PROJECT_NAME2)-unalligned.apk \
 	    alias$(PROJECT_NAME2) \
-	    < tmpPass.boo
-	
+	    < tmpPass.boo \
+	    2> /dev/null
 	$(Q)rm tmpPass.boo
+else
+	@# sign the application request loggin and password : 
+	$(Q)jarsigner \
+	    -keystore ./$(PROJECT_NAME2)-$(BUILD_DIRECTORY_MODE).jks \
+	    $(TARGET_OUT_STAGING)/build/$(PROJECT_NAME2)-unalligned.apk \
+	    alias$(PROJECT_NAME2)
+endif
+	
 	@echo "apk(aligned) <== apk"
 	$(Q)rm -f $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk
 	@# verbose mode : -v
@@ -216,8 +225,8 @@ final : javaclean $(FINAL_FILE_ABSTRACTION) $(TARGET_OUT_STAGING)/AndroidManifes
 	    $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk
 	@# copy file in the final stage :
 	$(Q)mkdir -p $(TARGET_OUT_FINAL)/
-	$(Q)cp $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
 	@echo "Generated out : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk"
+	$(Q)cp $(TARGET_OUT_STAGING)/$(PROJECT_NAME2).apk $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
 
 
 
@@ -225,17 +234,13 @@ install:
 	@echo ------------------------------------------------------------------------
 	@echo Install : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
 	@echo ------------------------------------------------------------------------
-	@# $(PROJECT_SDK)/platform-tools/adb kill-server
-	@# install application
 	$(Q)sudo $(PROJECT_SDK)/platform-tools/adb install -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
 
 uninstall:
 	@echo ------------------------------------------------------------------------
-	@echo UnInstall : $(TARGET_OUT_FINAL)/$(PROJECT_NAME2).apk
+	@echo UnInstall : $(PROJECT_NAME2)
 	@echo ------------------------------------------------------------------------
-	@echo  ... TODO ...
-	
-
+	$(Q)sudo $(PROJECT_SDK)/platform-tools/adb uninstall $(PROJECT_NAME2)
 
 log:
 	@echo ------------------------------------------------------------------------
@@ -243,3 +248,8 @@ log:
 	@echo ------------------------------------------------------------------------
 	$(Q)sudo $(PROJECT_SDK)/platform-tools/adb shell logcat
 
+shell:
+	@echo ------------------------------------------------------------------------
+	@echo Run android shell
+	@echo ------------------------------------------------------------------------
+	sudo $(PROJECT_SDK)/platform-tools/adb shell
diff --git a/core/setup-target.mk b/core/setup-target.mk
index cca6dd9..3ae512b 100644
--- a/core/setup-target.mk
+++ b/core/setup-target.mk
@@ -95,7 +95,8 @@ endif
 # define the target OS type for the compilation system ...
 TARGET_GLOBAL_CFLAGS += -D__TARGET_OS__$(TARGET_OS)
 # basic define of the build time :
-TARGET_GLOBAL_CFLAGS += -DBUILD_TIME="\"$(shell date)\"" \
+TARGET_GLOBAL_CFLAGS += -DBUILD_TIME="\"$(shell date +%Y-%m-%d_%T)\""
+
 
 ifeq ($(DEBUG),1)
 	TARGET_GLOBAL_CFLAGS += -DDEBUG_LEVEL=3