Skip to content

Commit

Permalink
Optimize RHV Manager build options in spec file
Browse files Browse the repository at this point in the history
1. Remove code in comments, such as '#if' or '#raw', which was
   supported only in maven-build

2. Remove maven options which were needed only when building in MEAD

Signed-off-by: Martin Perina <mperina@redhat.com>
  • Loading branch information
mwperina committed Sep 29, 2022
1 parent ff14c88 commit c25c3f3
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions ovirt-engine.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,14 @@
%if 0%{!?ovirt_build_all_user_agents:1}
%global ovirt_build_all_user_agents 1
%endif
# define "rhv_build 1" to perform RHV Manager build
#if True
%global rhv_build 1
#else

# Set "rhv_build 1" to perform RHV Manager build
%global rhv_build 0
#end if

#
# CUSTOMIZATION-END
#

#raw

# Do not repack .jar files, as it takes a long time and doesn't have a
# real benefit:
Expand Down Expand Up @@ -148,10 +145,8 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
%if %{rhv_build}
%global wildfly_overlay_modules ""
%define extra_common_opts \\\
MVN=true \\\
BUILD_ENV_VALIDATION=0 \\\
JBOSS_HOME=/opt/rh/eap7/root/usr/share/wildfly \\\
MAVEN_OUTPUT_DIR=%{_sourcedir}
JBOSS_HOME=/opt/rh/eap7/root/usr/share/wildfly
%else
%global wildfly_overlay_modules "/usr/share/ovirt-engine-wildfly-overlay/modules"
%endif
Expand Down

0 comments on commit c25c3f3

Please sign in to comment.