Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: default rpm packaging to build complete feature set
......................................................................
packaging: default rpm packaging to build complete feature set
executing rpmbuild -tb <tarball> should create fully functional product,
including all features and translations. so far build did not provide
extra locales available in source.
because gwt permutations takes a lot of time to be built, the following
macros were added to ease creation of partial packages:
ovirt_build_quick
quick build, good for automation, no GWT permutations, no
locales.
ovirt_build_minimal
minimal build, good for development, only firefox support, no
locales.
ovirt_build_gwt
build gwt components, default yes.
ovirt_build_locales
build locales, default yes.
example:
rpmbuild --define="ovirt_build_minimal 1" -tb <tarball>
Change-Id: I4fb610db6c6b6f9b209c816609613e47d7520baf
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M Makefile
M packaging/fedora/spec/ovirt-engine.spec.in
2 files changed, 29 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/14083/1
diff --git a/Makefile b/Makefile
index 9adb97d..010c143 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,18 @@
PACKAGE_NAME=ovirt-engine
DISPLAY_VERSION=$(PACKAGE_VERSION)
+BUILD_GWT=1
+BUILD_LOCALES=0
+
MVN=mvn
EXTRA_BUILD_FLAGS=
-BUILD_FLAGS=-P gwt-admin,gwt-user
+BUILD_FLAGS:=
+ifneq ($(BUILD_GWT),0)
+BUILD_FLAGS:=$(BUILD_FLAGS) -P gwt-admin,gwt-user
+endif
+ifneq ($(BUILD_LOCALES),0)
+BUILD_FLAGS:=$(BUILD_FLAGS) -P all-langs
+endif
ENGINE_NAME=$(PACKAGE_NAME)
PREFIX=/usr/local
LOCALSTATE_DIR=$(PREFIX)/var
@@ -217,9 +226,7 @@
rpm-quick:
$(MAKE) \
rpm \
- RPMBUILD_EXTRA_ARGS='--define="__jar_repack 0" \
- --define="BUILD_FLAGS -D dummy" \
- --define="EXTRA_BUILD_FLAGS -D skipTests=true -D
gwt.userAgent=gecko1_8"'
+ RPMBUILD_EXTRA_ARGS='--define="ovirt_build_quick 1"'
@echo
@echo WARNING:
@echo rpms produces from quick are partial!
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index 05683a3..2952769 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -13,6 +13,22 @@
%global require_maven 0
%endif
+%if 0%{?ovirt_build_quick}
+%global ovirt_build_gwt 0
+%global ovirt_build_locales 0
+%global __jar_repack 0
+%endif
+%if 0%{?ovirt_build_minimal}
+%global ovirt_build_locales 0
+%global EXTRA_BUILD_FLAGS -D gwt.userAgent=gecko1_8
+%endif
+%if 0%{!?ovirt_build_gwt:1}
+%global ovirt_build_gwt 1
+%endif
+%if 0%{!?ovirt_build_locales:1}
+%global ovirt_build_locales 1
+%endif
+
# Settings
%global product_name oVirt Engine
%global product_name_short oVirt Engine
@@ -72,6 +88,8 @@
%global make_common_opts \\\
-j1 \\\
+ BUILD_GWT=%{ovirt_build_gwt} \\\
+ BUILD_LOCALES=%{ovirt_build_locales} \\\
PACKAGE_NAME=%{name} \\\
RPM_VERSION=%{version} \\\
RPM_RELEASE=%{release} \\\
--
To view, visit http://gerrit.ovirt.org/14083
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fb610db6c6b6f9b209c816609613e47d7520baf
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
