Skip to content

Commit

Permalink
Let xmvn handle pom files installation
Browse files Browse the repository at this point in the history 
Signed-off-by: Martin Perina <mperina@redhat.com>
  • Loading branch information
@mwperina
mwperina committed Sep 15, 2022
1 parent afe3bc8 commit 3b1b49c
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 101 deletions.
32 changes: 0 additions & 32 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ install: \
all \
install-layout \
install_artifacts \
install_poms \
$(NULL)

.PHONY: ovirt-engine.spec.in
Expand Down Expand Up @@ -425,37 +424,6 @@ install_artifacts:
"$(DESTDIR)$(PKG_DOC_DIR)/AuditLogMessages.properties"
chmod 0644 "$(DESTDIR)$(PKG_DOC_DIR)/AuditLogMessages.properties"

install_poms:
install -dm 755 "$(DESTDIR)$(MAVENPOM_DIR)"
install -m 644 backend/manager/extensions-tool/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-extensions-tool.pom"
install -m 644 backend/manager/sso-client-registration-tool/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-sso-client-registration-tool.pom"
install -m 644 backend/manager/logutils/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-logutils.pom"
install -m 644 backend/manager/modules/aaa/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-aaa.pom"
install -m 644 backend/manager/modules/bll/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-bll.pom"
install -m 644 backend/manager/modules/branding/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-branding.pom"
install -m 644 backend/manager/modules/builtin-extensions/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-builtin.pom"
install -m 644 backend/manager/modules/common/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-common.pom"
install -m 644 backend/manager/modules/compat/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-compat.pom"
install -m 644 backend/manager/modules/dal/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-dal.pom"
install -m 644 backend/manager/modules/extensions-manager/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-extensions-manager.pom"
install -m 644 backend/manager/modules/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-manager-modules.pom"
install -m 644 backend/manager/modules/restapi/interface/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-interface.pom"
install -m 644 backend/manager/modules/restapi/interface/common/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-common-parent.pom"
install -m 644 backend/manager/modules/restapi/interface/common/jaxrs/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-interface-common-jaxrs.pom"
install -m 644 backend/manager/modules/restapi/interface/definition/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-restapi-definition.pom"
install -m 644 backend/manager/modules/restapi/jaxrs/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-restapi-jaxrs.pom"
install -m 644 backend/manager/modules/restapi/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-restapi-parent.pom"
install -m 644 backend/manager/modules/restapi/types/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-restapi-types.pom"
install -m 644 backend/manager/modules/scheduler/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-scheduler.pom"
install -m 644 backend/manager/modules/searchbackend/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-searchbackend.pom"
install -m 644 backend/manager/modules/utils/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-utils.pom"
install -m 644 backend/manager/modules/uutils/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-uutils.pom"
install -m 644 backend/manager/modules/vdsbroker/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-vdsbroker.pom"
install -m 644 backend/manager/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-manager.pom"
install -m 644 backend/manager/tools/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-tools.pom"
install -m 644 backend/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-backend.pom"
install -m 644 pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-root.pom"

install-packaging-files: \
$(GENERATED) \
$(NULL)
Expand Down
153 changes: 84 additions & 69 deletions ovirt-engine.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,47 +897,90 @@ ln -s "%{engine_name}" "%{buildroot}%{engine_java}/../%{name}"
# Order of the sequence of %mvn_package & %mvn_artifact matters
# Registration should start with the most top level pom and go down
#
while read package pom; do
pomdir="$(dirname "%{_mavenpomdir}/${pom}")"
pom="$(basename "${pom}")"
artifact_id="$(echo "${pom}" | sed -e 's/^%{name}-//' -e 's/\.pom//')"
if [ -f "%{buildroot}%{engine_java}/${artifact_id}.jar" ]; then
%mvn_package ":${artifact_id}*" "${package}"
%mvn_artifact "%{buildroot}${pomdir}/${pom}" "%{buildroot}%{engine_java}/${artifact_id}.jar"
else
%mvn_package ":${artifact_id}*" "${package}"
%mvn_artifact "%{buildroot}${pomdir}/${pom}"
fi
done << __EOF__
base %{name}-root.pom
backend %{name}-backend.pom
backend %{name}-manager.pom
backend %{name}-manager-modules.pom
backend %{name}-aaa.pom
backend %{name}-bll.pom
backend %{name}-builtin.pom
backend %{name}-dal.pom
backend %{name}-scheduler.pom
backend %{name}-searchbackend.pom
backend %{name}-vdsbroker.pom
base %{name}-branding.pom
base %{name}-common.pom
base %{name}-compat.pom
base %{name}-extensions-manager.pom
base %{name}-logutils.pom
base %{name}-utils.pom
base %{name}-uutils.pom
restapi %{name}-restapi-parent.pom
restapi %{name}-interface.pom
restapi %{name}-common-parent.pom
restapi %{name}-interface-common-jaxrs.pom
restapi %{name}-restapi-definition.pom
restapi %{name}-restapi-jaxrs.pom
restapi %{name}-restapi-types.pom
tools %{name}-extensions-tool.pom
tools %{name}-sso-client-registration-tool.pom
tools %{name}-tools.pom
__EOF__
%mvn_package ":root" base
%mvn_artifact "%{buildroot}/pom.xml"

%mvn_package ":backend" "backend"
%mvn_artifact "%{buildroot}/backend/pom.xml"

%mvn_package ":manager" "backend"
%mvn_artifact "%{buildroot}/backend/manager/pom.xml"

%mvn_package ":manager-modules" "backend"
%mvn_artifact "%{buildroot}/backend/manager/modules/pom.xml"

%mvn_package ":aaa" "backend"
%mvn_artifact "%{buildroot}$/backend/manager/modules/aaa/pom.xml" "%{buildroot}%{engine_java}/aaa.jar"

%mvn_package ":bll" "backend"
%mvn_artifact "%{buildroot}$/backend/manager/modules/bll/pom.xml" "%{buildroot}%{engine_java}/bll.jar"

%mvn_package ":builtin" "backend"
%mvn_artifact "%{buildroot}$/backend/manager/modules/builtin/pom.xml" "%{buildroot}%{engine_java}/builtin.jar"

%mvn_package ":dal" "backend"
%mvn_artifact "%{buildroot}$/backend/manager/modules/dal/pom.xml" "%{buildroot}%{engine_java}/dal.jar"

%mvn_package ":scheduler" "backend"
%mvn_artifact "%{buildroot}$/backend/manager/modules/scheduler/pom.xml" "%{buildroot}%{engine_java}/scheduler.jar"

%mvn_package ":searchbackend" "backend"
%mvn_artifact "%{buildroot}$/backend/manager/modules/searchbackend/pom.xml" "%{buildroot}%{engine_java}/searchbackend.jar"

%mvn_package ":vdsbroker" "backend"
%mvn_artifact "%{buildroot}$/backend/manager/modules/vdsbroker/pom.xml" "%{buildroot}%{engine_java}/vdsbroker.jar"

%mvn_package ":branding" "base"
%mvn_artifact "%{buildroot}$/backend/manager/modules/branding/pom.xml" "%{buildroot}%{engine_java}/branding.jar"

%mvn_package ":common" "base"
%mvn_artifact "%{buildroot}$/backend/manager/modules/common/pom.xml" "%{buildroot}%{engine_java}/common.jar"

%mvn_package ":compat" "base"
%mvn_artifact "%{buildroot}$/backend/manager/modules/compat/pom.xml" "%{buildroot}%{engine_java}/compat.jar"

%mvn_package ":extensions-manager" "base"
%mvn_artifact "%{buildroot}$/backend/manager/modules/extensions-manager/pom.xml" "%{buildroot}%{engine_java}/extensions-manager.jar"

%mvn_package ":logutils" "base"
%mvn_artifact "%{buildroot}$/backend/manager/logutils/pom.xml" "%{buildroot}%{engine_java}/logutils.jar"

%mvn_package ":utils" "base"
%mvn_artifact "%{buildroot}$/backend/manager/modules/utils/pom.xml" "%{buildroot}%{engine_java}/utils.jar"

%mvn_package ":uutils" "base"
%mvn_artifact "%{buildroot}$/backend/manager/modules/uutils/pom.xml" "%{buildroot}%{engine_java}/uutils.jar"

%mvn_package ":restapi-parent" "restapi"
%mvn_artifact "%{buildroot}/backend/manager/modules/restapi/pom.xml"

%mvn_package ":interface" "restapi"
%mvn_artifact "%{buildroot}/backend/manager/modules/restapi/interface/pom.xml"

%mvn_package ":common-parent" "restapi"
%mvn_artifact "%{buildroot}/backend/manager/modules/restapi/interface/common/pom.xml"

%mvn_package ":interface-common-jaxrs" "restapi"
%mvn_artifact "%{buildroot}/backend/manager/modules/restapi/interface/common/jaxrs/pom.xml" "%{buildroot}%{engine_java}/interface-common-jaxrs.jar"

%mvn_package ":restapi-definition" "restapi"
%mvn_artifact "%{buildroot}/backend/manager/modules/restapi/interface/definition/pom.xml" "%{buildroot}%{engine_java}/restapi-definition.jar"

%mvn_package ":restapi-jaxrs" "restapi"
%mvn_artifact "%{buildroot}/backend/manager/modules/restapi/jaxrs/pom.xml" "%{buildroot}%{engine_java}/restapi-jaxrs.jar"

%mvn_package ":restapi-types" "restapi"
%mvn_artifact "%{buildroot}/backend/manager/modules/restapi/types/pom.xml" "%{buildroot}%{engine_java}/restapi-types.jar"

%mvn_package ":extensions-tool" "tools"
%mvn_artifact "%{buildroot}/backend/manager/extensions-tool/pom.xml" "%{buildroot}%{engine_java}/extensions-tool.jar"

%mvn_package ":sso-client-registration-tool" "tools"
%mvn_artifact "%{buildroot}/backend/manager/sso-client-registration-tool/pom.xml" "%{buildroot}%{engine_java}/sso-client-registration-tool.jar"

%mvn_package ":tools" "tools"
%mvn_artifact "%{buildroot}/backend/manager/tools/pom.xml" "%{buildroot}%{engine_java}/tools.jar"


%if "%{name}" != "%{engine_name}"
sed -i 's#%{_javadir}/%{name}#%{engine_java}#' .mfiles*
Expand Down Expand Up @@ -1148,16 +1191,6 @@ fi
%{_javadir}/%{name}
%endif

%{_mavenpomdir}/ovirt-engine-branding.pom
%{_mavenpomdir}/ovirt-engine-common.pom
%{_mavenpomdir}/ovirt-engine-compat.pom
%{_mavenpomdir}/ovirt-engine-extensions-manager.pom
%{_mavenpomdir}/ovirt-engine-logutils.pom
%{_mavenpomdir}/ovirt-engine-root.pom
%{_mavenpomdir}/ovirt-engine-utils.pom
%{_mavenpomdir}/ovirt-engine-uutils.pom


%if %{rhv_build}
%files -n rhvm
%license LICENSE
Expand Down Expand Up @@ -1207,17 +1240,6 @@ fi
%{engine_etc}/osinfo.conf.d/
%{engine_jboss_modules}/

%{_mavenpomdir}/ovirt-engine-aaa.pom
%{_mavenpomdir}/ovirt-engine-backend.pom
%{_mavenpomdir}/ovirt-engine-bll.pom
%{_mavenpomdir}/ovirt-engine-builtin.pom
%{_mavenpomdir}/ovirt-engine-dal.pom
%{_mavenpomdir}/ovirt-engine-manager-modules.pom
%{_mavenpomdir}/ovirt-engine-manager.pom
%{_mavenpomdir}/ovirt-engine-scheduler.pom
%{_mavenpomdir}/ovirt-engine-searchbackend.pom
%{_mavenpomdir}/ovirt-engine-vdsbroker.pom

%{engine_data}/services/ovirt-engine
%{_unitdir}/ovirt-engine.service

Expand Down Expand Up @@ -1347,13 +1369,6 @@ fi
%license LICENSE
%{engine_restapi_war}/
%{engine_apidoc_war}/
%{_mavenpomdir}/ovirt-engine-interface.pom
%{_mavenpomdir}/ovirt-engine-interface-common-jaxrs.pom
%{_mavenpomdir}/ovirt-engine-common-parent.pom
%{_mavenpomdir}/ovirt-engine-restapi-definition.pom
%{_mavenpomdir}/ovirt-engine-restapi-parent.pom
%{_mavenpomdir}/ovirt-engine-restapi-jaxrs.pom
%{_mavenpomdir}/ovirt-engine-restapi-types.pom

%files webadmin-portal
%license LICENSE
Expand Down

0 comments on commit 3b1b49c

Please sign in to comment.