commit 3ed67fe0c8cdb70c66d20f9c2a8b76c7bcb818ad
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jul 9 09:55:39 2014 +0200
Store our "builddir" location in JAVAPACKAGES_CACHE_DIR
and export this var in %mnv_install and %add_maven_depmap
macros.d/macros.fjava | 1 +
macros.d/macros.xmvn | 1 +
python/javapackages/common/config.py | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/macros.d/macros.fjava b/macros.d/macros.fjava
index be5b9d6..926c173 100644
--- a/macros.d/macros.fjava
+++ b/macros.d/macros.fjava
@@ -50,6 +50,7 @@
%add_maven_depmap(f:a:v:) \
set -e \
+%{lua:
posix.setenv("JAVAPACKAGES_CACHE_DIR",rpm.expand("%{_builddir}") ) }
\
# default values \
%if %# == 0 \
_pompart="JPP-%{?scl:%{pkg_name}}%{!?scl:%{name}}.pom" \
diff --git a/macros.d/macros.xmvn b/macros.d/macros.xmvn
index 80158fe..4dafa96 100644
--- a/macros.d/macros.xmvn
+++ b/macros.d/macros.xmvn
@@ -141,6 +141,7 @@
# buildroot. It is intended to be placed in %install section of spec file.
#
%mvn_install(J:X) \
+%{lua:
posix.setenv("JAVAPACKAGES_CACHE_DIR",rpm.expand("%{_builddir}") ) }
\
xmvn-install %{?-X} -R .xmvn-reactor -n %{?scl:%{pkg_name}}%{!?scl:%{name}} -d
"%{buildroot}" \
jdir="%{-J*:%{-J*}}%{!-J*:target/site/apidocs}" \
if [ -d "${jdir}" ]; then \
diff --git a/python/javapackages/common/config.py b/python/javapackages/common/config.py
index 42aabcf..b79626b 100644
--- a/python/javapackages/common/config.py
+++ b/python/javapackages/common/config.py
@@ -36,7 +36,7 @@ def get_buildroot():
def get_builddir():
try:
- builddir = os.environ['RPM_BUILD_DIR']
+ builddir = os.environ['JAVAPACKAGES_CACHE_DIR']
except KeyError:
- raise Exception("RPM_BUILD_DIR environment is not set")
+ raise Exception("JAVAPACKAGES_CACHE_DIR environment is not set")
return os.path.abspath(builddir)
Show replies by date