Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: build: rework use of build flags ......................................................................
packaging: build: rework use of build flags construct build flags as late binding and use only one variable in make targets. Change-Id: I9950ba118211f90177185ce7b29c002ca505be61 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/15736/1 diff --git a/Makefile b/Makefile index e5a1666..ddb6711 100644 --- a/Makefile +++ b/Makefile @@ -55,11 +55,16 @@ ifeq ($(BUILD_UT),0) BUILD_FLAGS:=$(BUILD_FLAGS) -D skipTests endif +BUILD_FLAGS:=$(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS) + DEV_EXTRA_BUILD_FLAGS= -DEV_EXTRA_BUILD_FLAGS_GWT:=-D gwt.userAgent=gecko1_8 +DEV_EXTRA_BUILD_FLAGS_GWT=-D gwt.userAgent=gecko1_8 +DEV_BUILD_FLAGS:= ifneq ($(DEV_BUILD_GWT_DRAFT),0) -DEV_EXTRA_BUILD_FLAGS_GWT:=$(DEV_EXTRA_BUILD_FLAGS_GWT) -Dgwt.draftCompile=true +DEV_BUILD_FLAGS:=$(DEV_BUILD_FLAGS) -Dgwt.draftCompile=true endif +DEV_BUILD_FLAGS:=$(DEV_BUILD_FLAGS) $(DEV_EXTRA_BUILD_FLAGS) +DEV_BUILD_FLAGS:=$(DEV_BUILD_FLAGS) $(DEV_EXTRA_BUILD_FLAGS_GWT) BUILD_TARGET=deploy ENGINE_NAME=$(PACKAGE_NAME) PREFIX=/usr/local @@ -193,7 +198,6 @@ export MAVEN_OPTS="${MAVEN_OPTS} -XX:MaxPermSize=512m" $(MVN) \ $(BUILD_FLAGS) \ - $(EXTRA_BUILD_FLAGS) \ -D altDeploymentRepository=install::default::file://$(MAVEN_OUTPUT_DIR) \ $(BUILD_TARGET) touch $(BUILD_FILE) @@ -510,8 +514,7 @@ [ -n "$(DEBUG_MODULE)" ] || ( echo "Please specify DEBUG_MODULE" && false ) cd "frontend/webadmin/modules/$(DEBUG_MODULE)" && \ $(MVN) \ - $(DEV_EXTRA_BUILD_FLAGS) \ - $(DEV_EXTRA_BUILD_FLAGS_GWT) \ + $(DEV_BUILD_FLAGS) \ -Dgwt.noserver=true \ -Pgwtdev,gwt-admin,gwt-user \ gwt:debug @@ -521,7 +524,7 @@ rm -f $(GENERATED) $(MAKE) \ all \ - EXTRA_BUILD_FLAGS="$(DEV_EXTRA_BUILD_FLAGS_GWT) $(DEV_EXTRA_BUILD_FLAGS)" \ + EXTRA_BUILD_FLAGS="$(DEV_BUILD_FLAGS)" \ $(NULL) install-dev: \ @@ -530,7 +533,7 @@ $(MAKE) \ install \ - EXTRA_BUILD_FLAGS="$(DEV_EXTRA_BUILD_FLAGS_GWT) $(DEV_EXTRA_BUILD_FLAGS)" \ + EXTRA_BUILD_FLAGS="$(DEV_BUILD_FLAGS)" \ PYTHON_DIR="$(PREFIX)$(PYTHON_SYS_DIR)" \ $(NULL) install -d "$(DESTDIR)$(LOCALSTATE_DIR)/tmp" -- To view, visit http://gerrit.ovirt.org/15736 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9950ba118211f90177185ce7b29c002ca505be61 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
