Title: [opsview-perl] [702] Refactored cpanm's argument variables.
- Revision
- 702
- Author
- pknight
- Date
- 2012-07-19 18:01:39 +0100 (Thu, 19 Jul 2012)
Log Message
Refactored cpanm's argument variables.
Modified Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-07-19 16:34:50 UTC (rev 701)
+++ trunk/Makefile 2012-07-19 17:01:39 UTC (rev 702)
@@ -621,7 +621,11 @@
PERL_DEV_MODULES += Devel::NYTProf
CPANM = PERL_CPANM_HOME=${WORKDIR}/cpanm_work tools/cpanm
-CPANM_ARGS = -L $(DESTDIR)${prefix} --notest
+CPANM_COMMON_ARGS = -L $(DESTDIR)${prefix} --notest
+CPANM_LOCAL_MIRROR = --mirror file://${WORKDIR}/cpanm/sources --module-dir=${WORKDIR}/cpanm/sources
+CPANM_REMOTE_MIRROR = --mirror http://search.cpan.org/CPAN
+CPANM_LOCAL_ARGS = ${CPANM_COMMON_ARGS} ${CPANM_LOCAL_MIRROR}
+CPANM_REMOTE_ARGS = ${CPANM_COMMON_ARGS} ${CPANM_REMOTE_MIRROR}
all: version
@@ -633,12 +637,12 @@
install: all
# force upgrade of ExtUtils::MakeMaker
- MAKE_MAKER_INSTALL=1 MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror-only --force --patch-dir=patches ExtUtils::MakeMaker
+ MAKE_MAKER_INSTALL=1 MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_LOCAL_ARGS} --mirror-only --force --patch-dir=patches ExtUtils::MakeMaker
# install selected modules
if [ "x${ONLY_MODULES}" != "x" ]; then \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror file://${WORKDIR}/cpanm/sources --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${ONLY_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_LOCAL_ARGS} --mirror-only --force --patch-dir=patches ${ONLY_MODULES}; \
else \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror file://${WORKDIR}/cpanm/sources --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${PERL_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_LOCAL_ARGS} --mirror-only --force --patch-dir=patches ${PERL_MODULES}; \
fi
# You have to set DESTDIR= and MAKEFILE= here because cpanm seems to use it later, thus creating two sets of DESTDIR locations
#chown -R ${USER}.${GROUP} ${DESTDIR}${prefix}
@@ -647,9 +651,9 @@
install-dev:
# You have to set DESTDIR= and MAKEFILE= here because cpanm seems to use it later, thus creating two sets of DESTDIR locations
if [ "x${ONLY_MODULES}" != "x" ]; then \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror http://search.cpan.org/CPAN --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${ONLY_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_LOCAL_ARGS} --mirror-only --force --patch-dir=patches ${ONLY_MODULES}; \
else \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror http://search.cpan.org/CPAN --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${PERL_DEV_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_LOCAL_ARGS} --mirror-only --force --patch-dir=patches ${PERL_DEV_MODULES}; \
fi
chown -R ${USER}.${GROUP} ${DESTDIR}${prefix}
$(MAKE) setup-links-root-dev
@@ -658,9 +662,9 @@
# Use make svnaddmods to add for svn commit
newmods:
if [ "x${ONLY_MODULES}" != "x" ]; then \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror http://search.cpan.org/CPAN --force --patch-dir=patches --save-dists=${WORKDIR}/cpanm/sources --save-dists-flatdir ${ONLY_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_REMOTE_ARGS} --force --patch-dir=patches --save-dists=${WORKDIR}/cpanm/sources --save-dists-flatdir ${ONLY_MODULES}; \
else \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror http://search.cpan.org/CPAN --force --patch-dir=patches --save-dists=${WORKDIR}/cpanm/sources --save-dists-flatdir ${PERL_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_REMOTE_ARGS} --force --patch-dir=patches --save-dists=${WORKDIR}/cpanm/sources --save-dists-flatdir ${PERL_MODULES}; \
fi
svnaddmods:
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
