Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: build: sync with engine ......................................................................
packaging: build: sync with engine remove pom installation as are irrelevant for reuse in this case. Change-Id: I2cebfc1964480e058fe53b5b67f5005114b6ffec Signed-off-by: Alon Bar-Lev <[email protected]> --- M .gitignore M Makefile A build/python-check.sh A build/shell-check.sh M ovirt-engine-reports.spec.in D reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data R reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data 7 files changed, 261 insertions(+), 148 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/12/23312/1 diff --git a/.gitignore b/.gitignore index 8c12ee7..c275f8e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ # generated files ########################### +build/python-check.sh.in ovirt-engine-reports.spec diff --git a/Makefile b/Makefile index 997607a..bec48df 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,43 @@ # information on the Apache Software Foundation, please see # <http://www.apache.org/>. +# +# CUSTOMIZATION-BEGIN +# +BUILD_UT=1 +EXTRA_BUILD_FLAGS= +BUILD_VALIDATION=0 + +PACKAGE_NAME=ovirt-engine-reports +MVN=mvn +PYTHON=python +PYFLAKES=pyflakes +PEP8=pep8 +PREFIX=/usr/local +LOCALSTATE_DIR=$(PREFIX)/var +BIN_DIR=$(PREFIX)/bin +SYSCONF_DIR=$(PREFIX)/etc +DATAROOT_DIR=$(PREFIX)/share +MAN_DIR=$(DATAROOT_DIR)/man +DOC_DIR=$(DATAROOT_DIR)/doc +PKG_DATA_DIR=$(DATAROOT_DIR)/ovirt-engine-reports +JAVA_DIR=$(DATAROOT_DIR)/java +PKG_JAVA_DIR=$(JAVA_DIR)/ovirt-engine-reports +PKG_SYSCONF_DIR=$(SYSCONF_DIR)/ovirt-engine-reports +PKG_JBOSS_MODULES=$(PKG_DATA_DIR)/modules +PKG_CACHE_DIR=$(LOCALSTATE_DIR)/cache/ovirt-engine-reports +PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/ovirt-engine-reports +PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/ovirt-engine-reports +PKG_STATE_DIR=$(LOCALSTATE_DIR)/lib/ovirt-engine-reports +JBOSS_HOME=/usr/share/jboss-as +PYTHON_DIR=$(PYTHON_SYS_DIR) +DEV_PYTHON_DIR= +PKG_USER=ovirt +PKG_GROUP=ovirt +# +# CUSTOMIZATION-END +# + include version.mak # major, minor, seq POM_VERSION:=$(shell cat pom.xml | grep '<ovirt-reports.version>' | sed -e 's/.*>\(.*\)<.*/\1/' -e 's/-SNAPSHOT//') @@ -28,147 +65,190 @@ 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-reports DISPLAY_VERSION=$(PACKAGE_VERSION) -MVN=mvn -EXTRA_BUILD_FLAGS= -BUILD_FLAGS= -OVIRT_REPORTS_NAME=$(PACKAGE_NAME) -PREFIX=/usr/local -BIN_DIR=$(PREFIX)/bin -SYSCONF_DIR=$(PREFIX)/etc -DATAROOT_DIR=$(PREFIX)/share -DATA_DIR=$(DATAROOT_DIR)/$(OVIRT_REPORTS_NAME) -MAVENPOM_DIR=$(DATAROOT_DIR)/maven-poms -JAVA_DIR=$(DATAROOT_DIR)/java -PKG_SYSCONF_DIR=$(SYSCONF_DIR)/ovirt-engine-reports -PKG_JAVA_DIR=$(JAVA_DIR)/$(OVIRT_REPORTS_NAME) -RPMBUILD=rpmbuild -PYTHON=python -PYTHON_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib as f;print(f())") -SPEC_FILE_IN=ovirt-engine-reports.spec.in -SPEC_FILE=$(PACKAGE_NAME).spec -OUTPUT_RPMBUILD=$(shell pwd -P)/tmp.rpmbuild +BUILD_FLAGS:= +ifeq ($(BUILD_UT),0) +BUILD_FLAGS:=$(BUILD_FLAGS) -D skipTests +endif +BUILD_FLAGS:=$(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS) + +PYTHON_SYS_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib as f;print(f())") OUTPUT_DIR=output TARBALL=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz -SRPM=$(OUTPUT_DIR)/$(PACKAGE_NAME)-$(RPM_VERSION)*.src.rpm ARCH=noarch BUILD_FILE=tmp.built -MAVEN_OUTPUT_DIR_DEFAULT=$(shell pwd -P)/tmp.repos -MAVEN_OUTPUT_DIR=$(MAVEN_OUTPUT_DIR_DEFAULT) +MAVEN_OUTPUT_DIR=. +BUILD_TARGET=install ARTIFACTS = \ - ChartsCustomizers \ - EngineAuthentication \ - ReportsLineBarChartTheme \ - ReportsPieChartTheme \ - ReportsStatus \ - WebadminLineBarChartTheme \ - CustomOvirtReportsQueryManipulator \ - $(NULL) + ChartsCustomizers \ + EngineAuthentication \ + ReportsLineBarChartTheme \ + ReportsPieChartTheme \ + ReportsStatus \ + WebadminLineBarChartTheme \ + CustomOvirtReportsQueryManipulator \ + $(NULL) -all: $(BUILD_FILE) +.SUFFIXES: +.SUFFIXES: .in + +.in: + sed \ + -e "s|@PKG_USER@|$(PKG_USER)|g" \ + -e "s|@PKG_GROUP@|$(PKG_GROUP)|g" \ + -e "s|@DATAROOT_DIR@|$(DATAROOT_DIR)|g" \ + -e "s|@PKG_SYSCONF_DIR@|$(PKG_SYSCONF_DIR)|g" \ + -e "s|@PKG_DATA_DIR@|$(PKG_DATA_DIR)|g" \ + -e "s|@PKG_LOG_DIR@|$(PKG_LOG_DIR)|g" \ + -e "s|@PKG_STATE_DIR@|$(PKG_STATE_DIR)|g" \ + -e "s|@PKG_JBOSS_MODULES@|$(PKG_JBOSS_MODULES)|g" \ + -e "s|@JBOSS_HOME@|$(JBOSS_HOME)|g" \ + -e "s|@DEV_PYTHON_DIR@|$(DEV_PYTHON_DIR)|g" \ + -e "s|@DWH_VARS@|$(PKG_SYSCONF_DIR)/ovirt-engine-reportsd.conf|g" \ + -e "s|@RPM_VERSION@|$(RPM_VERSION)|g" \ + -e "s|@RPM_RELEASE@|$(RPM_RELEASE)|g" \ + -e "s|@PACKAGE_NAME@|$(PACKAGE_NAME)|g" \ + -e "s|@PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \ + -e "s|@DISPLAY_VERSION@|$(DISPLAY_VERSION)|g" \ + -e "s|@PEP8@|$(PEP8)|g" \ + -e "s|@PYFLAKES@|$(PYFLAKES)|g" \ + $< > $@ + +GENERATED = \ + build/python-check.sh \ + ovirt-engine-reports.spec \ + $(NULL) + +all: \ + generated-files \ + validations \ + $(BUILD_FILE) \ + $(NULL) + +generated-files: $(GENERATED) + chmod a+x build/python-check.sh $(BUILD_FILE): export MAVEN_OPTS="${MAVEN_OPTS} -XX:MaxPermSize=512m" $(MVN) \ $(BUILD_FLAGS) \ - $(EXTRA_BUILD_FLAGS) \ - dependency:resolve-plugins - $(MVN) \ - $(BUILD_FLAGS) \ - $(EXTRA_BUILD_FLAGS) \ - -D skipTests \ - -D altDeploymentRepository=install::default::file://$(MAVEN_OUTPUT_DIR) \ - deploy + $(BUILD_TARGET) \ + $(NULL) touch $(BUILD_FILE) clean: $(MVN) clean $(EXTRA_BUILD_FLAGS) - rm -rf $(OUTPUT_RPMBUILD) $(SPEC_FILE) $(OUTPUT_DIR) $(BUILD_FILE) - [ "$(MAVEN_OUTPUT_DIR_DEFAULT)" = "$(MAVEN_OUTPUT_DIR)" ] && rm -fr "$(MAVEN_OUTPUT_DIR)" + rm -rf $(OUTPUT_DIR) $(BUILD_FILE) tmp.dev.flist + rm -rf $(GENERATED) test: $(MVN) install $(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS) install: \ - all \ - install_artifacts \ - install_files \ - $(NULL) + all \ + install-artifacts \ + install-layout \ + $(NULL) -# legacy -tarball: dist -dist: - sed \ - -e 's/@PACKAGE_NAME@/$(PACKAGE_NAME)/g' \ - -e 's/@PACKAGE_VERSION@/$(PACKAGE_VERSION)/g' \ - -e 's/@RPM_VERSION@/$(RPM_VERSION)/g' \ - -e 's/@RPM_RELEASE@/$(RPM_RELEASE)/g' \ - $(SPEC_FILE_IN) > $(SPEC_FILE) - git ls-files | tar --files-from /proc/self/fd/0 -czf $(TARBALL) $(SPEC_FILE) - rm -f $(SPEC_FILE) +.PHONY: ovirt-engine-reports.spec.in + +dist: ovirt-engine-reports.spec + git ls-files | tar --files-from /proc/self/fd/0 -czf "$(TARBALL)" ovirt-engine-reports.spec @echo - @echo You can use $(RPMBUILD) -tb $(TARBALL) to produce rpms + @echo For distro specific packaging refer to http://www.ovirt.org/Build_Binary_Package @echo -srpm: dist - rm -rf $(OUTPUT_RPMBUILD) - mkdir -p $(OUTPUT_RPMBUILD)/{SPECS,RPMS,SRPMS,SOURCES,BUILD,BUILDROOT} - mkdir -p $(OUTPUT_DIR) - $(RPMBUILD) -ts --define="_topdir $(OUTPUT_RPMBUILD)" $(TARBALL) - mv $(OUTPUT_RPMBUILD)/SRPMS/*.rpm $(OUTPUT_DIR) - rm -rf $(OUTPUT_RPMBUILD) - @echo - @echo srpm is ready at $(OUTPUT_DIR) - @echo - -rpm: srpm - rm -rf $(OUTPUT_RPMBUILD) - mkdir -p $(OUTPUT_RPMBUILD)/{SPECS,RPMS,SRPMS,SOURCES,BUILD,BUILDROOT} - mkdir -p $(OUTPUT_DIR) - $(RPMBUILD) --define="_topdir $(OUTPUT_RPMBUILD)" $(RPMBUILD_EXTRA_ARGS) --rebuild $(SRPM) - mv $(OUTPUT_RPMBUILD)/RPMS/$(ARCH)/*.rpm $(OUTPUT_DIR) - rm -rf $(OUTPUT_RPMBUILD) - @echo - @echo rpms are ready at $(OUTPUT_DIR) - @echo - -install_artifacts: - install -dm 755 $(DESTDIR)$(PKG_JAVA_DIR) - install -dm 755 $(DESTDIR)$(MAVENPOM_DIR) - - for artifact_id in $(ARTIFACTS); do \ - POM=`find "$(MAVEN_OUTPUT_DIR)" -name "$${artifact_id}-*.pom"`; \ - if ! [ -f "$${POM}" ]; then \ - echo "ERROR: Cannot find artifact $${artifact_id}"; \ - exit 1; \ - fi; \ - JAR=`echo "$${POM}" | sed 's/\.pom/.jar/'`; \ - install -p -m 644 "$${POM}" "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-$${artifact_id}.pom"; \ - [ -f "$${JAR}" ] && install -p -m 644 "$${JAR}" "$(DESTDIR)$(PKG_JAVA_DIR)/$${artifact_id}.jar"; \ +# copy SOURCEDIR to TARGETDIR +# exclude EXCLUDEGEN a list of files to exclude with .in +# exclude EXCLUDE a list of files. +copy-recursive: + ( cd "$(SOURCEDIR)" && find . -type d -printf '%P\n' ) | while read d; do \ + install -d -m 755 "$(TARGETDIR)/$${d}"; \ + done + ( \ + cd "$(SOURCEDIR)" && find . -type f -printf '%P\n' | \ + while read f; do \ + exclude=false; \ + for x in $(EXCLUDE_GEN); do \ + if [ "$(SOURCEDIR)/$${f}" = "$${x}.in" ]; then \ + exclude=true; \ + break; \ + fi; \ + done; \ + for x in $(EXCLUDE); do \ + if [ "$(SOURCEDIR)/$${f}" = "$${x}" ]; then \ + exclude=true; \ + break; \ + fi; \ + done; \ + $${exclude} || echo "$${f}"; \ + done \ + ) | while read f; do \ + src="$(SOURCEDIR)/$${f}"; \ + dst="$(TARGETDIR)/$${f}"; \ + [ -x "$${src}" ] && MASK=0755 || MASK=0644; \ + [ -n "$(DEV_FLIST)" ] && echo "$${dst}" | sed 's#^$(PREFIX)/##' >> "$(DEV_FLIST)"; \ + install -T -m "$${MASK}" "$${src}" "$${dst}"; \ done -install_files: - install -d $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/engine.conf.d - install -d $(DESTDIR)$(PKG_SYSCONF_DIR)/ovirt-engine-reports.conf.d - install -d $(DESTDIR)$(BIN_DIR) - install -d $(DESTDIR)$(DATA_DIR)/conf - install -d $(DESTDIR)$(DATA_DIR)/legacy-setup - install -d $(DESTDIR)$(DATA_DIR)/reports - install -d $(DESTDIR)$(DATA_DIR)/server-customizations +validations: generated-files + if [ "$(BUILD_VALIDATION)" != 0 ]; then \ + build/shell-check.sh && \ + build/python-check.sh; \ + fi - cp -a reports/repository_files/* $(DESTDIR)$(DATA_DIR)/reports - install -p -m 644 packaging/sys-etc/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/engine.conf.d - install -p -m 755 packaging/legacy-setup/ssl2jkstrust.py $(DESTDIR)$(DATA_DIR)/legacy-setup - install -p -m 755 packaging/legacy-setup/ovirt-engine-reports-setup.py $(DESTDIR)$(DATA_DIR)/legacy-setup - install -p -m 755 packaging/legacy-setup/common_utils.py $(DESTDIR)$(DATA_DIR)/legacy-setup - install -p -m 755 packaging/legacy-setup/decorators.py $(DESTDIR)$(DATA_DIR)/legacy-setup - install -p -m 644 packaging/conf/default_master.properties $(DESTDIR)$(DATA_DIR)/conf - install -p -m 644 packaging/conf/ovirt-engine-reports-proxy.conf.in $(DESTDIR)$(DATA_DIR)/conf - install -p -m 644 packaging/conf/reports.xml $(DESTDIR)$(DATA_DIR)/conf - cp -rpf server-customizations/* $(DESTDIR)$(DATA_DIR)/server-customizations +install-artifacts: + install -d "$(DESTDIR)$(PKG_JAVA_DIR)" + for artifact_id in $(ARTIFACTS); do \ + JAR=`find "$(MAVEN_OUTPUT_DIR)" -name "$${artifact_id}-*.jar" | grep -v tmp.repos`; \ + install -p -m 644 "$${JAR}" "$(DESTDIR)$(PKG_JAVA_DIR)/$${artifact_id}.jar"; \ + done - ln -s -f $(DATA_DIR)/legacy-setup/$(OVIRT_REPORTS_NAME)-setup.py $(DESTDIR)$(BIN_DIR)/$(OVIRT_REPORTS_NAME)-setup +install-packaging-files: \ + $(GENERATED) \ + $(NULL) + $(MAKE) copy-recursive SOURCEDIR=packaging/sys-etc TARGETDIR="$(DESTDIR)$(SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)" + $(MAKE) copy-recursive SOURCEDIR=server-customizations TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/server-customizations" EXCLUDE_GEN="$(GENERATED)" + $(MAKE) copy-recursive SOURCEDIR=reports/repository_files TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/reports" EXCLUDE_GEN="$(GENERATED)" + for d in conf legacy-setup; do \ + $(MAKE) copy-recursive SOURCEDIR="packaging/$${d}" TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/$${d}" EXCLUDE_GEN="$(GENERATED)"; \ + done + +install-layout: \ + install-packaging-files \ + $(NULL) + + install -dm 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/ovirt-engine-reports.conf.d" + install -dm 755 "$(DESTDIR)$(BIN_DIR)" + ln -sf ovirt_reports_bundle_en_US.properties.data "$(DESTDIR)$(PKG_DATA_DIR)/reports/resources/reports_resources/localization/ovirt_reports_bundle.properties.data" + ln -sf "$(PKG_DATA_DIR)/legacy-setup/ovirt-engine-reports-setup.py" "$(DESTDIR)$(BIN_DIR)/ovirt-engine-reports-setup" + +all-dev: + rm -f $(GENERATED) + $(MAKE) \ + all \ + DEV_PYTHON_DIR="$(PREFIX)$(PYTHON_SYS_DIR)" \ + $(NULL) + +install-dev: \ + all-dev \ + $(NULL) + + if [ -f "$(DESTDIR)$(PREFIX)/dev.$(PACKAGE_NAME).flist" ]; then \ + cat "$(DESTDIR)$(PREFIX)/dev.$(PACKAGE_NAME).flist" | while read f; do \ + rm -f "$(DESTDIR)$(PREFIX)/$${f}"; \ + done; \ + rm -f "$(DESTDIR)$(PREFIX)/dev.$(PACKAGE_NAME).flist"; \ + fi + + rm -f tmp.dev.flist + $(MAKE) \ + install \ + BUILD_VALIDATION=0 \ + PYTHON_DIR="$(PREFIX)$(PYTHON_SYS_DIR)" \ + DEV_FLIST=tmp.dev.flist \ + $(NULL) + cp tmp.dev.flist "$(DESTDIR)$(PREFIX)/dev.$(PACKAGE_NAME).flist" diff --git a/build/python-check.sh b/build/python-check.sh new file mode 100755 index 0000000..d82c79a --- /dev/null +++ b/build/python-check.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +PEP8="pep8" +PYFLAKES="pyflakes" +SRCDIR="$(dirname "$0")/.." + +cd "${SRCDIR}" + +ret=0 +FILES="$( + find build packaging -name '*.py' | grep -v legacy-setup | while read f; do + [ -e "${f}.in" ] || echo "${f}" + done +)" + +for exe in "${PYFLAKES}" "${PEP8}"; do + if ! which "${exe}" > /dev/null 2>&1; then + echo "WARNING: tool '${exe}' is missing" >&2 + else + "${exe}" ${FILES} || ret=1 + fi +done +exit ${ret} diff --git a/build/shell-check.sh b/build/shell-check.sh new file mode 100755 index 0000000..a3e984f --- /dev/null +++ b/build/shell-check.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +SRCDIR="$(dirname "$0")/.." +cd "${SRCDIR}" + +if [ -z "${VALIDATION_SHELL}" ]; then + # prefer dash over bash for POSIX complaint + [ -x /bin/dash ] && VALIDATION_SHELL="/bin/dash" || VALIDATION_SHELL="/bin/sh" +fi + +EXTRA_ARGS="" +# if bash use POSIX parsing +"${VALIDATION_SHELL}" --version 2>&1 | grep -q bash && EXTRA_ARGS="${EXTRA_ARGS} --posix" + +ret="$( + find packaging build -type f \( -executable -or -name '*.sh' -or -name '*.bash' \) -and -not -name '*.py' | while read f; do + read l < "${f}" + shell="/bin/sh" + candidate="${l#\#!}" + candidate="${candidate# *}" # remove leading spaces + candidate="${candidate% *}" # remove parameter + [ "${candidate}" != "${l}" ] && shell="${candidate}" + skip= + case "${shell}" in + /bin/sh) shell="${VALIDATION_SHELL} ${EXTRA_ARGS}" ;; + /bin/bash) ;; + /usr/bin/python) skip=1 ;; + *) + echo "ERROR: Unknown shell '${shell}' for '${f}'" + ret=1 + ;; + esac + if [ -z "${skip}" ]; then + ${shell} -n "${f}" || ret=1 + fi + echo "${ret}" + done | tail -n 1 +)" + +exit ${ret} diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in index a500562..ff2ba32 100644 --- a/ovirt-engine-reports.spec.in +++ b/ovirt-engine-reports.spec.in @@ -1,7 +1,6 @@ # Settings %global product_name Reports package for oVirt Virtualization Management %global product_description oVirt virtualization reports -%global install_poms 1 %global reports_name ovirt-engine-reports %global reports_java %{_javadir}/%{reports_name} @@ -21,7 +20,6 @@ PYTHON=%{__python} \\\ PYTHON_DIR=%{python_sitelib} \\\ JAVA_DIR=%{_javadir} \\\ - MAVENPOM_DIR=%{_mavenpomdir} \\\ PKG_JAVA_DIR=%{reports_java} \\\ %{?BUILD_FLAGS:BUILD_FLAGS="%{BUILD_FLAGS}"} \\\ %{?EXTRA_BUILD_FLAGS:EXTRA_BUILD_FLAGS="%{EXTRA_BUILD_FLAGS}"} @@ -70,43 +68,19 @@ %install rm -fr "%{buildroot}" +make %{make_common_opts} install DESTDIR="%{buildroot}" -# Use the makefile to do the normal installation, after that we -# will need to replace jar files with links to their actual -# locations: -make %{make_common_opts} install DESTDIR=%{buildroot} +# Compile python files +%{__python} -m compileall -f -q -d / "%{buildroot}" +%{__python} -O -m compileall -f -q -d / "%{buildroot}" # Needed for compatibility if package is different than the directory structure %if "%{name}" != "%{reports_name}" - ln -s -f %{_bindir}/%{reports_name}-setup %{buildroot}%{_bindir}/%{name}-setup + ln -s -f "%{_bindir}/%{reports_name}-setup" "%{buildroot}%{_bindir}/%{name}-setup" ln -s "%{reports_name}" "%{buildroot}%{reports_java}/../%{name}" %endif -# Register poms -%if !%{install_poms} -rm -fr "%{buildroot}%{_mavenpomdir}" -%else -for pom in %{buildroot}%{_mavenpomdir}/*.pom -do - pomdir=`dirname "${pom}"` - pom=`basename "${pom}"` - jpppom="JPP.${pom}" - mv "${pomdir}/${pom}" "${pomdir}/${jpppom}" - artifact_id=`echo "${pom}" | sed -e 's/^%{name}-//' -e 's/\.pom//'` - if [ -f "%{buildroot}%{reports_java}/${artifact_id}.jar" ] - then - %add_maven_depmap "${jpppom}" "%{name}/${artifact_id}.jar" - else - %add_maven_depmap "${jpppom}" - fi -done -%endif - -%post -%update_maven_depmap - %postun -%update_maven_depmap if [ "$1" -eq 0 ]; then if [ -d /usr/share/ovirt-engine/%{name}.war ]; then rm -rf /usr/share/ovirt-engine/%{name}.war @@ -125,10 +99,6 @@ %{_datadir}/%{reports_name} %if "%{name}" != "%{reports_name}" %{_javadir}/%{name} -%endif -%if %{install_poms} -%{_mavendepmapfragdir}/%{name} -%{_mavenpomdir}/JPP.%{name}-* %endif %{_bindir}/%{reports_name}-setup diff --git a/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data b/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data deleted file mode 120000 index b169fe5..0000000 --- a/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data +++ /dev/null @@ -1 +0,0 @@ -ovirt_reports_bundle.properties.data \ No newline at end of file diff --git a/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle.properties.data b/reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data similarity index 100% rename from reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle.properties.data rename to reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data -- To view, visit http://gerrit.ovirt.org/23312 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cebfc1964480e058fe53b5b67f5005114b6ffec Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
