From fca61ca7b53fe191c7cda7459eb954d1264189bc Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 19 Oct 2020 19:24:32 +0200 Subject: [PATCH] change copying of android java files a bit --- androidservice/androidservice.pro | 22 ++++++++++------ .../java}/io/guh/nymeaapp/Action.java | 0 .../guh/nymeaapp/NymeaAppControlService.java | 0 .../nymeaapp/NymeaAppControlsActivity.java | 0 .../io/guh/nymeaapp/NymeaAppService.java | 0 .../nymeaapp/NymeaAppServiceConnection.java | 0 .../java}/io/guh/nymeaapp/NymeaHost.java | 0 .../java}/io/guh/nymeaapp/State.java | 0 .../java}/io/guh/nymeaapp/Thing.java | 0 config.pri | 13 +++++++++- nymea-app/nymea-app.pro | 25 ++++++++----------- .../io/guh/nymeaapp/NymeaAppActivity.java | 0 .../nymeaapp/NymeaAppNotificationService.java | 0 13 files changed, 37 insertions(+), 23 deletions(-) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/Action.java (100%) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/NymeaAppControlService.java (100%) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/NymeaAppControlsActivity.java (100%) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/NymeaAppService.java (100%) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/NymeaAppServiceConnection.java (100%) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/NymeaHost.java (100%) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/State.java (100%) rename {nymea-app/platformintegration/android => androidservice/java}/io/guh/nymeaapp/Thing.java (100%) rename nymea-app/platformintegration/android/{ => java}/io/guh/nymeaapp/NymeaAppActivity.java (100%) rename nymea-app/platformintegration/android/{ => java}/io/guh/nymeaapp/NymeaAppNotificationService.java (100%) diff --git a/androidservice/androidservice.pro b/androidservice/androidservice.pro index 2f43ab8a..093a7da1 100644 --- a/androidservice/androidservice.pro +++ b/androidservice/androidservice.pro @@ -45,13 +45,19 @@ HEADERS += \ ../nymea-app/platformintegration/android/platformhelperandroid.h \ DISTFILES += \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/Action.java \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlService.java \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppService.java \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlsActivity.java \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppServiceConnection.java \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/Thing.java \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/State.java \ - ../nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaHost.java \ + java/io/guh/nymeaapp/Action.java \ + java/io/guh/nymeaapp/NymeaAppControlService.java \ + java/io/guh/nymeaapp/NymeaAppService.java \ + java/io/guh/nymeaapp/NymeaAppControlsActivity.java \ + java/io/guh/nymeaapp/NymeaAppServiceConnection.java \ + java/io/guh/nymeaapp/Thing.java \ + java/io/guh/nymeaapp/State.java \ + java/io/guh/nymeaapp/NymeaHost.java \ controlviews/Main.qml +QMAKE_COPY_DIR=cp -f -R -v +javafiles.commands = $(MKDIR) $${ANDROID_PACKAGE_SOURCE_DIR}/src; +javafiles.commands += $(COPY_DIR) $${PWD}/java/io $${ANDROID_PACKAGE_SOURCE_DIR}/src/ +QMAKE_EXTRA_TARGETS += javafiles +POST_TARGETDEPS += javafiles + diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/Action.java b/androidservice/java/io/guh/nymeaapp/Action.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/Action.java rename to androidservice/java/io/guh/nymeaapp/Action.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlService.java b/androidservice/java/io/guh/nymeaapp/NymeaAppControlService.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlService.java rename to androidservice/java/io/guh/nymeaapp/NymeaAppControlService.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlsActivity.java b/androidservice/java/io/guh/nymeaapp/NymeaAppControlsActivity.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppControlsActivity.java rename to androidservice/java/io/guh/nymeaapp/NymeaAppControlsActivity.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppService.java b/androidservice/java/io/guh/nymeaapp/NymeaAppService.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppService.java rename to androidservice/java/io/guh/nymeaapp/NymeaAppService.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppServiceConnection.java b/androidservice/java/io/guh/nymeaapp/NymeaAppServiceConnection.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppServiceConnection.java rename to androidservice/java/io/guh/nymeaapp/NymeaAppServiceConnection.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaHost.java b/androidservice/java/io/guh/nymeaapp/NymeaHost.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaHost.java rename to androidservice/java/io/guh/nymeaapp/NymeaHost.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/State.java b/androidservice/java/io/guh/nymeaapp/State.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/State.java rename to androidservice/java/io/guh/nymeaapp/State.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/Thing.java b/androidservice/java/io/guh/nymeaapp/Thing.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/Thing.java rename to androidservice/java/io/guh/nymeaapp/Thing.java diff --git a/config.pri b/config.pri index 9d0cae52..076e3907 100644 --- a/config.pri +++ b/config.pri @@ -10,4 +10,15 @@ APP_VERSION=$$member(VERSION_INFO, 0) APP_REVISION=$$member(VERSION_INFO, 1) DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\" -android:QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/ + +android: { + QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/ + + !equals(OVERLAY_PATH, ""):!equals(BRANDING, "") { + ANDROID_PACKAGE_SOURCE_DIR = $${OVERLAY_PATH}/packaging/android_$$BRANDING + } else { + ANDROID_PACKAGE_SOURCE_DIR = $${top_srcdir}/packaging/android + } + message("Andorid package source dir $${ANDROID_PACKAGE_SOURCE_DIR}") +} + diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 8b311a20..7bc95ec8 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -51,12 +51,6 @@ win32 { } android { - !equals(OVERLAY_PATH, ""):!equals(BRANDING, "") { - ANDROID_PACKAGE_SOURCE_DIR = $${OVERLAY_PATH}/packaging/android_$$BRANDING - } else { - ANDROID_PACKAGE_SOURCE_DIR = $${top_srcdir}/packaging/android - } - message("andorid package dir $${ANDROID_PACKAGE_SOURCE_DIR}") android-clang { FIREBASE_STL_VARIANT = c++ @@ -75,10 +69,8 @@ android { HEADERS += platformintegration/android/platformhelperandroid.h SOURCES += platformintegration/android/platformhelperandroid.cpp - QMAKE_COPY_DIR=cp -f -R -v - javafiles.commands = $$quote($(COPY_DIR) $${PWD}/platformintegration/android/io $${ANDROID_PACKAGE_SOURCE_DIR}/src/) - QMAKE_EXTRA_TARGETS += javafiles - POST_TARGETDEPS += javafiles + # https://bugreports.qt.io/browse/QTBUG-83165 + LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH} DISTFILES += \ $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \ @@ -90,11 +82,16 @@ android { $$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.properties \ $$ANDROID_PACKAGE_SOURCE_DIR/gradlew.bat \ $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE \ - platformintegration/android/io/guh/nymeaapp/NymeaAppActivity.java \ - platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java \ + platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java \ + platformintegration/android/java/io/guh/nymeaapp/NymeaAppNotificationService.java \ + + QMAKE_COPY_DIR=cp -f -R -v + QMAKE_MKDIR_COMMAND=echo tralala; mkdir + javafiles.commands = $(MKDIR) $${ANDROID_PACKAGE_SOURCE_DIR}/src/; + javafiles.commands += $(COPY_DIR) $${PWD}/platformintegration/android/java/io $${ANDROID_PACKAGE_SOURCE_DIR}/src/; + QMAKE_EXTRA_TARGETS += javafiles + POST_TARGETDEPS += javafiles - # https://bugreports.qt.io/browse/QTBUG-83165 - LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH} } macx: { diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppActivity.java b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppActivity.java rename to nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java diff --git a/nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppNotificationService.java similarity index 100% rename from nymea-app/platformintegration/android/io/guh/nymeaapp/NymeaAppNotificationService.java rename to nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppNotificationService.java