Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

By default ant is now building silently

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-01-27 10:32:29 +01:00
parent a6dfd45140
commit e0ac98f825
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Makefile
View file

@ -63,6 +63,7 @@ LIBLINPHONE_EXTENDED_SRC_FILES=
LIBLINPHONE_EXTENDED_C_INCLUDES= LIBLINPHONE_EXTENDED_C_INCLUDES=
LIBLINPHONE_EXTENDED_CFLAGS= LIBLINPHONE_EXTENDED_CFLAGS=
APP_STL=stlport_static APP_STL=stlport_static
ANT_SILENT=1
# Checks # Checks
CHECK_MSG=$(shell ./check_tools.sh) CHECK_MSG=$(shell ./check_tools.sh)
@ -85,6 +86,12 @@ else
HTTPS_CA_DIR=$(OPENSSL_DIR) HTTPS_CA_DIR=$(OPENSSL_DIR)
endif endif
ifeq ($(ANT_SILENT), 1)
ANT=ant -e -S
else
ANT=ant -e
endif
all: update-project generate-apk all: update-project generate-apk
ifeq ($(ENABLE_GPL_THIRD_PARTIES),1) ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
@echo "***************************************************************************" @echo "***************************************************************************"
@ -428,56 +435,56 @@ liblinphone_tester: update-project prepare-sources prepare-cunit prepare-liblinp
$(MAKE) -C liblinphone_tester $(MAKE) -C liblinphone_tester
javah: javah:
ant javah $(ANT) javah
generate-apk: java-clean generate-libs generate-apk: java-clean generate-libs
echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties
ant debug $(ANT) debug
generate-mediastreamer2-apk: java-clean generate-mediastreamer2-libs generate-mediastreamer2-apk: java-clean generate-mediastreamer2-libs
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \ @cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties && \ echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties && \
ant debug $(ANT) debug
uninstall: uninstall:
adb uninstall $(PACKAGE_NAME) adb uninstall $(PACKAGE_NAME)
install-apk: install-apk:
ant installd $(ANT) installd
release: update-project release: update-project
ant clean $(ANT) clean
echo "What is the version name for the release ?"; \ echo "What is the version name for the release ?"; \
read version; \ read version; \
echo "version.name=$$version" > default.properties echo "version.name=$$version" > default.properties
ant release $(ANT) release
run-linphone: run-linphone:
ant run $(ANT) run
run-liblinphone-tests: liblinphone_tester run-liblinphone-tests: liblinphone_tester
$(MAKE) -C liblinphone_tester run-all-tests $(MAKE) -C liblinphone_tester run-all-tests
run-basic-tests: update-project run-basic-tests: update-project
ant partial-clean $(ANT) partial-clean
$(MAKE) -C tests run-basic-tests $(MAKE) -C tests run-basic-tests
run-all-tests: update-project run-all-tests: update-project
ant partial-clean $(ANT) partial-clean
$(MAKE) -C tests run-all-tests $(MAKE) -C tests run-all-tests
clean-ndk-build: clean-ndk-build:
- $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS) - $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS)
ant clean $(ANT) clean
@if [ -f $(TOPDIR)/submodules/linphone/mediastreamer2/java/project.properties ]; then \ @if [ -f $(TOPDIR)/submodules/linphone/mediastreamer2/java/project.properties ]; then \
cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && ant clean; \ cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && $(ANT) clean; \
fi fi
.NOTPARALLEL clean-native: clean-ndk-build clean-ffmpeg clean-x264 clean-openh264 clean-vpx .NOTPARALLEL clean-native: clean-ndk-build clean-ffmpeg clean-x264 clean-openh264 clean-vpx
java-clean: java-clean:
ant clean $(ANT) clean
clean: clean-native java-clean clean: clean-native java-clean
@ -488,11 +495,11 @@ veryclean: clean
generate-sdk: liblinphone-android-sdk generate-sdk: liblinphone-android-sdk
liblinphone-android-sdk: generate-apk liblinphone-android-sdk: generate-apk
ant liblinphone-android-sdk $(ANT) liblinphone-android-sdk
linphone-android-sdk: generate-apk linphone-android-sdk: generate-apk
ant linphone-android-sdk $(ANT) linphone-android-sdk
mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \ @cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
ant mediastreamer2-sdk $(ANT) mediastreamer2-sdk

2
tests/ant.properties
View file

@ -15,5 +15,5 @@
# 'key.alias' for the name of the key to use. # 'key.alias' for the name of the key to use.
# The password will be asked during the build when you use the 'release' target. # The password will be asked during the build when you use the 'release' target.
tested.project.dir=../ tested.project.dir=.
test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner