Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: build: move all customization vars to makefile prefix ......................................................................
packaging: build: move all customization vars to makefile prefix Change-Id: I57e2748ad6651c746e89dc0f91af1f65a57a3ab0 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile 1 file changed, 51 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/15737/1 diff --git a/Makefile b/Makefile index ddb6711..c6ea26a 100644 --- a/Makefile +++ b/Makefile @@ -21,52 +21,25 @@ # information on the Apache Software Foundation, please see # <http://www.apache.org/>. -include version.mak -# major, minor, seq -POM_VERSION:=$(shell cat pom.xml | grep '<engine.version>' | sed -e 's/.*>\(.*\)<.*/\1/' -e 's/-SNAPSHOT//') -# major, minor from pom and fix -APP_VERSION=$(shell echo $(POM_VERSION) | sed 's/\([^.]*\.[^.]\)\..*/\1/').$(FIX_RELEASE) -RPM_VERSION=$(APP_VERSION) -PACKAGE_VERSION=$(APP_VERSION)$(if $(MILESTONE),_$(MILESTONE)) -PACKAGE_NAME=ovirt-engine -DISPLAY_VERSION=$(PACKAGE_VERSION) - +# +# CUSTOMIZATION-BEGIN +# BUILD_GWT=1 BUILD_GWT_USERPORTAL=1 BUILD_GWT_WEBADMIN=1 BUILD_LOCALES=0 BUILD_UT=0 -DEV_BUILD_GWT_DRAFT=0 - -MVN=mvn EXTRA_BUILD_FLAGS= -BUILD_FLAGS:= -ifneq ($(BUILD_GWT),0) -ifneq ($(BUILD_GWT_USERPORTAL),0) -BUILD_FLAGS:=$(BUILD_FLAGS) -P gwt-user -endif -ifneq ($(BUILD_GWT_WEBADMIN),0) -BUILD_FLAGS:=$(BUILD_FLAGS) -P gwt-admin -endif -endif -ifneq ($(BUILD_LOCALES),0) -BUILD_FLAGS:=$(BUILD_FLAGS) -P all-langs -endif -ifeq ($(BUILD_UT),0) -BUILD_FLAGS:=$(BUILD_FLAGS) -D skipTests -endif -BUILD_FLAGS:=$(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS) - +DEV_REBUILD=1 +DEV_BUILD_GWT_DRAFT=0 DEV_EXTRA_BUILD_FLAGS= DEV_EXTRA_BUILD_FLAGS_GWT=-D gwt.userAgent=gecko1_8 -DEV_BUILD_FLAGS:= -ifneq ($(DEV_BUILD_GWT_DRAFT),0) -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 + +PACKAGE_NAME=ovirt-engine ENGINE_NAME=$(PACKAGE_NAME) +MVN=mvn +RPMBUILD=rpmbuild +PYTHON=python PREFIX=/usr/local LOCALSTATE_DIR=$(PREFIX)/var ENGINE_STATE=$(LOCALSTATE_DIR)/lib/$(ENGINE_NAME) @@ -87,15 +60,49 @@ PKG_CACHE_DIR=$(LOCALSTATE_DIR)/cache/$(ENGINE_NAME) PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/$(ENGINE_NAME) PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/$(ENGINE_NAME) +SPICE_DIR=/usr/share/spice +JBOSS_HOME=/usr/share/jboss-as +PYTHON_DIR=$(PYTHON_SYS_DIR) PKG_USER=ovirt PKG_GROUP=ovirt -SPICE_DIR=/usr/share/spice -RPMBUILD=rpmbuild -PYTHON=python -JBOSS_HOME=/usr/share/jboss-as -PYTHON_SYS_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib as f;print(f())") -PYTHON_DIR=$(PYTHON_SYS_DIR) +# +# CUSTOMIZATION-END +# +include version.mak +# major, minor, seq +POM_VERSION:=$(shell cat pom.xml | grep '<engine.version>' | sed -e 's/.*>\(.*\)<.*/\1/' -e 's/-SNAPSHOT//') +# major, minor from pom and fix +APP_VERSION=$(shell echo $(POM_VERSION) | sed 's/\([^.]*\.[^.]\)\..*/\1/').$(FIX_RELEASE) +RPM_VERSION=$(APP_VERSION) +PACKAGE_VERSION=$(APP_VERSION)$(if $(MILESTONE),_$(MILESTONE)) +DISPLAY_VERSION=$(PACKAGE_VERSION) + +BUILD_FLAGS:= +ifneq ($(BUILD_GWT),0) +ifneq ($(BUILD_GWT_USERPORTAL),0) +BUILD_FLAGS:=$(BUILD_FLAGS) -P gwt-user +endif +ifneq ($(BUILD_GWT_WEBADMIN),0) +BUILD_FLAGS:=$(BUILD_FLAGS) -P gwt-admin +endif +endif +ifneq ($(BUILD_LOCALES),0) +BUILD_FLAGS:=$(BUILD_FLAGS) -P all-langs +endif +ifeq ($(BUILD_UT),0) +BUILD_FLAGS:=$(BUILD_FLAGS) -D skipTests +endif +BUILD_FLAGS:=$(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS) + +DEV_BUILD_FLAGS:= +ifneq ($(DEV_BUILD_GWT_DRAFT),0) +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) + +PYTHON_SYS_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib as f;print(f())") OUTPUT_RPMBUILD=$(shell pwd -P)/tmp.rpmbuild OUTPUT_DIR=output TARBALL=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz @@ -104,7 +111,7 @@ BUILD_FILE=tmp.built MAVEN_OUTPUT_DIR_DEFAULT=$(shell pwd -P)/tmp.repos MAVEN_OUTPUT_DIR=$(MAVEN_OUTPUT_DIR_DEFAULT) -DEV_REBUILD=1 +BUILD_TARGET=deploy ARTIFACTS = \ backend \ -- To view, visit http://gerrit.ovirt.org/15737 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57e2748ad6651c746e89dc0f91af1f65a57a3ab0 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
