Juan Hernandez has uploaded a new change for review. Change subject: packaging: Use POM_VERSION to locate artifacts ......................................................................
packaging: Use POM_VERSION to locate artifacts We currently use APP_VERSION to locate artifacts in the directory where they are deployed during the build, but this doesn't work if APP_VERSION is different to the version specified in the root POM. Change-Id: I6b780190ccb2c71b40f43f4697cd04c061fca9ad Signed-off-by: Juan Hernandez <[email protected]> --- M Makefile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/12939/1 diff --git a/Makefile b/Makefile index bf59f12..3c67858 100644 --- a/Makefile +++ b/Makefile @@ -238,7 +238,7 @@ install -dm 755 $(DESTDIR)$(PKG_EAR_DIR) install -dm 755 $(DESTDIR)$(MAVENPOM_DIR) - X=`find "$(MAVEN_OUTPUT_DIR)" -name 'engine-server-ear-$(APP_VERSION)*'.ear` && unzip -o "$$X" -d "$(DESTDIR)$(PKG_EAR_DIR)" + X=`find "$(MAVEN_OUTPUT_DIR)" -name 'engine-server-ear-$(POM_VERSION)*'.ear` && unzip -o "$$X" -d "$(DESTDIR)$(PKG_EAR_DIR)" for artifact_id in $(ARTIFACTS); do \ POM=`find "$(MAVEN_OUTPUT_DIR)" -name "$${artifact_id}-$(POM_VERSION)*.pom"`; \ @@ -398,7 +398,7 @@ # Uncompress and install the contents of the modules archives to # the directory containing engine modules: - find "$(MAVEN_OUTPUT_DIR)" -name "*-$(APP_VERSION)*-modules.zip" -exec unzip -o {} -d "$(DESTDIR)$(PKG_JBOSS_MODULES)" \; + find "$(MAVEN_OUTPUT_DIR)" -name "*-$(POM_VERSION)*-modules.zip" -exec unzip -o {} -d "$(DESTDIR)$(PKG_JBOSS_MODULES)" \; install_service: @echo "*** Deploying service" -- To view, visit http://gerrit.ovirt.org/12939 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b780190ccb2c71b40f43f4697cd04c061fca9ad Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
