Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5e99955 authored by Adnan Begovic's avatar Adnan Begovic
Browse files

cm: Fixup maven artifact publish inclusions. 

TICKET: CYNGNOS-1529
Change-Id: Ie7307d43f0b38b179ae42b7c54a790bb7e4c5ea5
parent b4b87594

build/core/clear_vars.mk

+6 −1
Original line number Diff line number Diff line
@@ -9,3 +9,8 @@ LOCAL_MAVEN_VERSION := 
LOCAL_MAVEN_CLASSIFIER :=

LOCAL_MAVEN_PACKAGING :=

LOCAL_MAVEN_REPO :=

LOCAL_MAVEN_POM :=

LOCAL_MAVEN_TARGET_MODULE :=

LOCAL_MAVEN_REPO_ID :=

LOCAL_MAVEN_SOURCES :=

LOCAL_MAVEN_JAVADOC :=
 
 No newline at end of file

build/core/maven_artifact_publish.mk

+8 −8
Original line number Diff line number Diff line
@@ -15,27 +15,26 @@ 
full_target := $(call doc-timestamp-for,$(LOCAL_MODULE))



ifeq ($(strip $(LOCAL_MAVEN_POM)),)

  $(error LOCAL_MAVEN_POM not defined.)

  $(warning LOCAL_MAVEN_POM not defined.)

endif

ifeq ($(strip $(LOCAL_MAVEN_REPO)),)

  $(error LOCAL_MAVEN_REPO not defined.)

endif

ifeq ($(strip $(LOCAL_MAVEN_FILE_PATH)),)

  $(error LOCAL_MAVEN_FILE_PATH not defined.)

  $(warning LOCAL_MAVEN_REPO not defined.)

endif

ifeq ($(strip $(LOCAL_MAVEN_REPO_ID)),)

  $(error LOCAL_MAVEN_REPO_ID not defined.)

  $(warning LOCAL_MAVEN_REPO_ID not defined.)

endif





$(full_target): pomfile := $(LOCAL_MAVEN_POM)

$(full_target): repo := $(LOCAL_MAVEN_REPO)

ifdef LOCAL_MAVEN_FILE_PATH

$(full_target): path_to_file := $(LOCAL_MAVEN_FILE_PATH)

endif

$(full_target): repoId := $(LOCAL_MAVEN_REPO_ID)

$(full_target): classifier := $(LOCAL_MAVEN_CLASSIFIER)

$(full_target): sources := $(LOCAL_MAVEN_SOURCES)

$(full_target): javadoc := $(LOCAL_MAVEN_JAVADOC)



ifdef LOCAL_MAVEN_FILE_PATH

$(full_target):

	$(hide) mvn -e -X gpg:sign-and-deploy-file \

		    -DpomFile=$(pomfile) \
@@ -46,4 +45,5 @@ $(full_target): 
			-Dsources=$(sources) \

			-Djavadoc=$(javadoc)

	@echo -e ${CL_GRN}"Publishing:"${CL_RST}" $@"

endif

$(LOCAL_MODULE): $(full_target)