X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2FMakefile.am;h=686aeabfc5c6f39dae60a7ca5b33af2d13ccc365;hp=557a572208fc4e8d961fd6a4a74d57a4a8c688ad;hb=9791ebb256c2892663c072f7989e4b9bd34818a1;hpb=9b659904109f992b8a3e61efb94e81cdb19af1c9

diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am
index 557a5722..686aeabf 100644
--- a/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@ -1,33 +1,79 @@
 if ANDROID
-all_target=bin/AltosDroid-debug.apk bin/AltosDroid-release.apk
-clean_command=ant clean
+all_target=bin/AltosDroid-debug.apk
+if ANDROID_RELEASE
+all_target+=bin/AltosDroid-release.apk
+endif
 else
 all_target=
-clean_command=echo done
 endif
 
 SDK=$(ANDROID_SDK)
+SDK_TARGET=$(shell sed -ne 's/^target=//p' project.properties)
 
 DX=$(SDK)/platform-tools/dx
 ADB=$(SDK)/platform-tools/adb
 AAPT=$(SDK)/platform-tools/aapt
 APKBUILDER=$(SDK)/tools/apkbuilder
-ZIPALIGN=$(SDK)/tools/zipalign
+ZIPALIGN_A=$(SDK)/tools/zipalign
+ZIPALIGN_B=$(shell ls $(SDK)/build-tools/*/zipalign | tail -1)
+
+JAVA_SRC_DIR=src/org/altusmetrum/AltosDroid
+EXT_LIBDIR=libs
+DRAWABLE_DIR=res/drawable
+LAYOUT_DIR=res/layout
+MENU_DIR=res/menu
+VALUES_DIR=res/values
+XML_DIR=res/xml
+ALTOSLIB_SRCDIR=../altoslib
+ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar
+
+ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR)
+
+SUPPORT_V4_SRCDIR=$(SDK)/extras/android/support/v4
+SUPPORT_V4_JAR=android-support-v4.jar
+
+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
 
-SRC_DIR=src/org/altusmetrum/AltosDroid
+JAVA_SRC=$(JAVA_SRC_DIR)/*.java $(JAVA_SRC_DIR)/BuildInfo.java
 
-SRC=\
-	$(SRC_DIR)/AltosDroid.java \
-	$(SRC_DIR)/BluetoothChatService.java \
-	$(SRC_DIR)/DeviceListActivity.java
+DRAWABLES=\
+    $(DRAWABLE_DIR)/redled.png \
+    $(DRAWABLE_DIR)/greenled.png \
+    $(DRAWABLE_DIR)/grayled.png
+
+LAYOUTS=$(LAYOUT_DIR)/*.xml
+MENUS=$(MENU_DIR)/*.xml
+VALUES=$(VALUES_DIR)/*.xml
+XMLS=$(XML_DIR)/*.xml AndroidManifest.xml
+
+RES=$(LAYOUTS) $(MENUS) $(VALUES) $(XMLS)
+
+SRC=$(JAVA_SRC) $(DRAWABLES) $(RES)
 
 all: $(all_target)
 
-ALTOSLIB=bin/classes/AltosLib.jar
+.NOTPARALLEL:
+
+$(ALTOSLIB): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR)
+	mkdir -p $(EXT_LIBDIR)
+	cd $(EXT_LIBDIR) && ln -sf $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) .
+
+$(SUPPORT_V4): $(SUPPORT_V4_SRCDIR)/$(SUPPORT_V4_JAR)
+	mkdir -p $(EXT_LIBDIR)
+	cd $(EXT_LIBDIR) && ln -sf $(SUPPORT_V4_SRCDIR)/$(SUPPORT_V4_JAR) .
 
-$(ALTOSLIB):
-	mkdir -p bin/classes
-	cd bin/classes && ln -s ../../../altoslib/AltosLib.jar .
+$(GOOGLE_PLAY_SERVICES_LIB): $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB)
+	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 .
+
+$(JAVA_SRC_DIR)/BuildInfo.java: $(filter-out $(JAVA_SRC_DIR)/BuildInfo.java,$(shell echo $(JAVA_SRC)))
+	./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
@@ -36,13 +82,41 @@ install-release: bin/AltosDroid-release.apk
 install-debug: bin/AltosDroid-debug.apk
 	$(ADB) install -r bin/AltosDroid-debug.apk
 
-bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB)
+bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB)
 	ant debug
 
-bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
+bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB)
 	ant release
-endif
 
-clean:
-	$(clean_command)
+bin/AltosDroid-release.apk: bin/AltosDroid-release-unsigned.apk
+	jarsigner -sigalg SHA1withDSA -digestalg SHA1 \
+	   -keystore ~/altusmetrumllc/google-play-release.keystore \
+	   -storepass:file ~/altusmetrumllc/google-play-passphrase \
+	   -signedjar bin/AltosDroid-release-signed.apk \
+	   bin/AltosDroid-release-unsigned.apk AltosDroid
+	if [ -f $(ZIPALIGN_A) ]; then \
+		$(ZIPALIGN_A) -f 4 \
+		   bin/AltosDroid-release-signed.apk \
+		   bin/AltosDroid-release.apk; \
+	else \
+		$(ZIPALIGN_B) -f 4 \
+		   bin/AltosDroid-release-signed.apk \
+		   bin/AltosDroid-release.apk; \
+	fi
+
+release: bin/AltosDroid-release.apk
+
+clean-local: $(GOOGLE_PLAY_SERVICES_LIB)
+	ant clean
+	rm -f $(JAVA_SRC_DIR)/BuildInfo.java
+	rm -f $(DRAWABLES)
+	rm -rf $(EXT_LIBDIR)
+	rm -rf $(GOOGLE_PLAY_SERVICES_LIB)
+
+else
+
+clean-local:
+
+endif
 
+clean: clean-local