altosdroid: Symlink red/green/gray LEDs via build system

Signed-off-by: Mike Beattie <mike@ethernal.org>

diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore
index 56d0776dcb42533b8362e284f195a68db3d8a751..7f0858eafbaefc752503fb6f4e89da24ca3ac5cc 100644 (file)
--- a/altosdroid/.gitignore
+++ b/altosdroid/.gitignore
@@ -4,3 +4,4 @@ gen
 libs
 google-play-services_lib
 src/org/altusmetrum/AltosDroid/BuildInfo.java
 libs
 google-play-services_lib
 src/org/altusmetrum/AltosDroid/BuildInfo.java

+res/drawable/*led.png

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index daa649631ce8b8e9757e7b1f2c3e163aaf1d3642..d21cacd87558c6227a69409875cafd9bc50d07ec 100644 (file)
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -13,8 +13,9 @@ AAPT=$(SDK)/platform-tools/aapt
 APKBUILDER=$(SDK)/tools/apkbuilder
 ZIPALIGN=$(SDK)/tools/zipalign
 
 APKBUILDER=$(SDK)/tools/apkbuilder
 ZIPALIGN=$(SDK)/tools/zipalign
 

-SRC_DIR=src/org/altusmetrum/AltosDroid
+JAVA_SRC_DIR=src/org/altusmetrum/AltosDroid

 EXT_LIBDIR=libs
 EXT_LIBDIR=libs

+DRAWABLE_DIR=res/drawable

 ALTOSLIB_SRCDIR=../altoslib
 ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
 ALTOSLIB_SRCDIR=../altoslib
 ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
 


@@ -28,7 +29,14 @@ SUPPORT_V4=$(EXT_LIBDIR)/$(SUPPORT_V4_JAR)
 GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/extras/google/google_play_services/libproject
 GOOGLE_PLAY_SERVICES_LIB=google-play-services_lib
 
 GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/extras/google/google_play_services/libproject
 GOOGLE_PLAY_SERVICES_LIB=google-play-services_lib
 

-SRC=$(SRC_DIR)/*.java
+JAVA_SRC=$(JAVA_SRC_DIR)/*.java
+
+DRAWABLES=\
+    $(DRAWABLE_DIR)/redled.png \
+    $(DRAWABLE_DIR)/greenled.png \
+    $(DRAWABLE_DIR)/grayled.png
+
+SRC=$(JAVA_SRC) $(DRAWABLES)

 
 all: $(all_target)
 
 
 all: $(all_target)
 


@@ -45,9 +53,12 @@ $(GOOGLE_PLAY_SERVICES_LIB): $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SE
        cp -a $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) .
        cd $(GOOGLE_PLAY_SERVICES_LIB) && $(SDK)/tools/android update project --target $(SDK_TARGET) --path .
 
        cp -a $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) .
        cd $(GOOGLE_PLAY_SERVICES_LIB) && $(SDK)/tools/android update project --target $(SDK_TARGET) --path .
 

-$(SRC_DIR)/BuildInfo.java: $(SRC)
+$(JAVA_SRC_DIR)/BuildInfo.java: $(JAVA_SRC)

        ./buildinfo.sh
 
        ./buildinfo.sh
 

+$(DRAWABLE_DIR)/%.png: ../icon/%.png
+       cd $(DRAWABLE_DIR) && ln -sf $(shell echo $(DRAWABLE_DIR) | sed 's|[^/]\+|..|g')/$< .
+

 if ANDROID
 install-release: bin/AltosDroid-release.apk
        $(ADB) install -r bin/AltosDroid-release.apk
 if ANDROID
 install-release: bin/AltosDroid-release.apk
        $(ADB) install -r bin/AltosDroid-release.apk


@@ -72,6 +83,7 @@ sign:
 clean: $(GOOGLE_PLAY_SERVICES_LIB)
        ant clean
        rm -rf $(EXT_LIBDIR)
 clean: $(GOOGLE_PLAY_SERVICES_LIB)
        ant clean
        rm -rf $(EXT_LIBDIR)

+       rm -f $(DRAWABLES)

        rm -rf $(GOOGLE_PLAY_SERVICES_LIB)
 
 else
        rm -rf $(GOOGLE_PLAY_SERVICES_LIB)
 
 else