Alon Bar-Lev has uploaded a new change for review.
Change subject: build: always clean maven output before build
......................................................................
build: always clean maven output before build
If snapshots (timestamp) are used then we get more than one artifact if
make clean is not run.
This confuses:
X=`find "$(MAVEN_OUTPUT_DIR)" -name
'engine-server-ear-$(POM_VERSION)*'.ear` && unzip -o "$$X" -d
"$(DESTDIR)$(PKG_EAR_DIR)"
Change-Id: I6db059914f94bfab95cf444a0485a8f73a2719f3
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M Makefile
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/13035/1
diff --git a/Makefile b/Makefile
index 3c67858..340fa99 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,7 @@
$(NULL)
$(BUILD_FILE):
+ -[ "$(MAVEN_OUTPUT_DIR_DEFAULT)" = "$(MAVEN_OUTPUT_DIR)" ] && rm -fr
"$(MAVEN_OUTPUT_DIR)"
export MAVEN_OPTS="${MAVEN_OPTS} -XX:MaxPermSize=512m"
$(MVN) \
$(BUILD_FLAGS) \
@@ -141,7 +142,7 @@
# Clean maven generated stuff:
$(MVN) clean $(EXTRA_BUILD_FLAGS)
rm -rf $(OUTPUT_RPMBUILD) $(OUTPUT_DIR) $(BUILD_FILE)
- [ "$(MAVEN_OUTPUT_DIR_DEFAULT)" = "$(MAVEN_OUTPUT_DIR)" ] && rm -fr
"$(MAVEN_OUTPUT_DIR)"
+ -[ "$(MAVEN_OUTPUT_DIR_DEFAULT)" = "$(MAVEN_OUTPUT_DIR)" ] && rm -fr
"$(MAVEN_OUTPUT_DIR)"
# Clean files generated from templates:
rm -rf $(GENERATED)
--
To view, visit http://gerrit.ovirt.org/13035
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6db059914f94bfab95cf444a0485a8f73a2719f3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
