* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-01 12:44 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-01 12:44 UTC (permalink / raw
To: gentoo-commits
commit: f341338423e9da1d9ea541a5a862fade2d2475d6
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Aug 1 12:28:12 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Aug 1 12:28:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f3413384
roverlay.py: remove "[python] -OO"
-OO removes docstrings, which makes depres console commands undocumented.
This commit therefore removes the -OO switch (-O may be added later, but the
roverlay.py script is mainly used for testing since installed versions have
their own script).
---
roverlay.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roverlay.py b/roverlay.py
index 37f1fa0..fd1b3e8 100755
--- a/roverlay.py
+++ b/roverlay.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -OO
+#!/usr/bin/python
# -*- coding: utf-8 -*-
# R overlay -- main script
# Copyright (C) 2012 André Erdmann <dywi@mailerd.de>
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2020-11-24 10:41 Benda XU
0 siblings, 0 replies; 146+ messages in thread
From: Benda XU @ 2020-11-24 10:41 UTC (permalink / raw
To: gentoo-commits
commit: 33e08a5e30aa4f81d2887cda260391169bd937d2
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 03:14:29 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 03:14:29 2020 +0000
URL: https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=33e08a5e
roverlay-9999.ebuild: bump to EAPI=7.
Bump to Python 3.8.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
roverlay-9999.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 1d0caef..a2d2888 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=5
+EAPI=7
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python3_8 )
PYTHON_REQ_USE="ssl,threads(+),readline(+)"
EGIT_REPO_URI='git://anongit.gentoo.org/proj/R_overlay.git'
-DOCS=()
+DOCS=( examples )
HTML_DOCS=( doc/html/. )
-EXAMPLES=( examples/. )
inherit user distutils-r1 git-r3 bash-completion-r1
@@ -30,9 +28,7 @@ DEPEND="
compress-config? ( app-arch/bzip2 )"
RDEPEND="
sys-apps/portage
- dev-python/mako[${PYTHON_USEDEP}]
- xz? ( $(python_gen_cond_dep dev-python/backports-lzma[$(python_gen_usedep python2_7)] python2_7 ) )
- virtual/python-futures[${PYTHON_USEDEP}]"
+ dev-python/mako[${PYTHON_USEDEP}]"
pkg_preinst() {
enewgroup roverlay
@@ -53,6 +49,10 @@ python_install_all() {
BASHCOMPDIR="${D}/$(get_bashcompdir)" \
COMPRESSED_CONFIG="$(usex compress-config 1 0)" \
install-nonpy
+
+ insinto /usr/share/roverlay/eclass
+ doins files/eclass/R-packages.eclass
+ doins -r files/hooks
}
pkg_config() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2015-11-05 5:15 Benda XU
0 siblings, 0 replies; 146+ messages in thread
From: Benda XU @ 2015-11-05 5:15 UTC (permalink / raw
To: gentoo-commits
commit: 11bc8c9224f262c977db7b3e55acbaf8db830644
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 05:14:40 2015 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 05:14:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=11bc8c92
roverlay-9999.ebuild: gentoo git URLs change.
https://www.gentoo.org/news/2015/04/25/anongit-overlays.html
roverlay-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 028a457..1d0caef 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE="ssl,threads(+),readline(+)"
-EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
+EGIT_REPO_URI='git://anongit.gentoo.org/proj/R_overlay.git'
DOCS=()
HTML_DOCS=( doc/html/. )
@@ -16,7 +16,7 @@ EXAMPLES=( examples/. )
inherit user distutils-r1 git-r3 bash-completion-r1
DESCRIPTION="Automatically generated overlay of R packages"
-HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
+HOMEPAGE="https://cgit.gentoo.org/proj/R_overlay.git"
SRC_URI=""
LICENSE="GPL-2+"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2015-01-26 17:41 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2015-01-26 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 09d5138c0451c50df704dafa342ac2b1afbf3d63
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Dec 9 22:27:40 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Dec 9 22:27:40 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=09d5138c
roverlay-9999.ebuild: update PYTHON_TARGETS
---
roverlay-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 2b3cacb..028a457 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE="ssl,threads(+),readline(+)"
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
@@ -31,7 +31,7 @@ DEPEND="
RDEPEND="
sys-apps/portage
dev-python/mako[${PYTHON_USEDEP}]
- xz? ( $(python_gen_cond_dep dev-python/backports-lzma[$(python_gen_usedep python{2_7,3_2})] python{2_7,3_2} ) )
+ xz? ( $(python_gen_cond_dep dev-python/backports-lzma[$(python_gen_usedep python2_7)] python2_7 ) )
virtual/python-futures[${PYTHON_USEDEP}]"
pkg_preinst() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-07-16 15:14 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-07-16 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 26bf3116e64fcf19cef6d2ac1e79aec3c41c247c
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sun Jul 13 15:41:18 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sun Jul 13 15:41:18 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=26bf3116
roverlay-9999.ebuild: drop dep on python-argparse
virtual/python-argparse is masked
---
roverlay-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 290bd51..2b3cacb 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -30,7 +30,6 @@ DEPEND="
compress-config? ( app-arch/bzip2 )"
RDEPEND="
sys-apps/portage
- virtual/python-argparse[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
xz? ( $(python_gen_cond_dep dev-python/backports-lzma[$(python_gen_usedep python{2_7,3_2})] python{2_7,3_2} ) )
virtual/python-futures[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: bfb238aef165f859e4491b859671b026c29e5869
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May 7 01:28:49 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May 7 01:28:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=bfb238ae
fix typo in Makefile
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index d61ae2e..8211aac 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,7 @@ PHONY += generate-files
generate-files: $(addprefix generate-,config doc manifest licenses)
PHONY += generate-files-commit
-generate-files-commit: gemerate-files
+generate-files-commit: generate-files
{ ! $(X_GIT) status --porcelain -- . | grep ^[MADRCU]; }
$(X_GIT) add -vu -- \
R-overlay.conf \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 35c9ad10b0903d9cf367550dd69f7680ba54a02f
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Apr 3 19:15:41 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Apr 3 19:15:41 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=35c9ad10
Makefile, "dist": create a separate -doc tarball
---
Makefile | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 090841a..2b973f5 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ COMPRESSED_CONFIG := n
RELEASE_NOT_DIRTY := n
RELEASE_DIRTY_SUFFIX := -dirty
VBUMP_COMMIT := y
+DIST_PYDOC := y
MANIFEST := $(S)/MANIFEST
LICENSES_FILE := $(S)/files/licenses
@@ -87,6 +88,12 @@ SELFDOC := $(SRC_DOCDIR)/pydoc
_TRUE_WORDS := y Y 1 yes YES true TRUE
+ifeq ($(DIST_PYDOC),$(filter $(DIST_PYDOC),$(_TRUE_WORDS)))
+_DIST_PYDOC_DEP := $(SELFDOC)
+else
+_DIST_PYDOC_DEP :=
+endif
+
# _f_recursive_install ( src_root, src_names, dest_root, file_mode )
#
# Recursively installs files from <src_root>/<%name> to <dest_root>/<%name>
@@ -260,7 +267,7 @@ generate-files-commit: gemerate-files
# creates a src tarball (.tar.bz2)
PHONY += dist
-dist: distclean generate-files | $(PKG_DISTDIR)
+dist: distclean generate-files $(_DIST_PYDOC_DEP) | $(PKG_DISTDIR)
ifeq ($(X_BZIP2)$(X_GZIP)$(X_XZ),)
$(error at least one of X_BZIP2, X_GZIP, X_XZ must be set)
endif
@@ -280,19 +287,24 @@ else
endif
$(eval MY_$@_FILE := $(PKG_DISTDIR)/$(DISTNAME)_$(MY_$@_VER).tar)
-
+ $(eval MY_$@_DOCFILE := $(PKG_DISTDIR)/$(DISTNAME)-doc_$(MY_$@_VER).tar)
$(X_GIT) archive --worktree-attributes --format=tar HEAD \
--prefix=$(DISTNAME)_$(MY_$@_VER)/ > $(MY_$@_FILE).make_tmp
+ tar c -C $(SRC_DOCDIR)/ . -f $(MY_$@_DOCFILE).make_tmp
+
ifneq ($(X_BZIP2),)
- $(X_BZIP2) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2
+ $(X_BZIP2) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2
+ $(X_BZIP2) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).bz2
endif
ifneq ($(X_GZIP),)
- $(X_GZIP) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).gz
+ $(X_GZIP) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).gz
+ $(X_GZIP) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).gz
endif
ifneq ($(X_XZ),)
- $(X_XZ) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).xz
+ $(X_XZ) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).xz
+ $(X_XZ) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).xz
endif
rm -- $(MY_$@_FILE).make_tmp
@@ -439,8 +451,9 @@ help:
@echo ' (default: $(VBUMP_COMMIT))'
@echo ' setver - set $(MY_$@_GENITIVE) version to VER'
@echo ' (default: <not set>)'
- @echo ' dist - create source tarball(s) in PKG_DISTDIR:'
- @echo ' DISTNAME_<version>.tar.<compression suffix>'
+ @echo ' dist - create source tarballs in PKG_DISTDIR:'
+ @echo ' DISTNAME_<version>.tar.<suffix>'
+ @echo ' DISTNAME-doc_<version>.tar.<suffix>'
@echo ' (implies "distclean" and "generate-files")'
@echo ' (PKG_DISTDIR: $(PKG_DISTDIR:$(CURDIR)/%=%))'
@echo ' (DISTNAME: $(DISTNAME))'
@@ -497,6 +510,8 @@ endif
@echo ' matches its version (n) or not (y) [$(RELEASE_NOT_DIRTY)]'
@echo '* RELEASE_DIRTY_SUFFIX - suffix for "dirty" dist tarballs [$(RELEASE_DIRTY_SUFFIX)]'
@echo '* DISTNAME - base name for source tarballs [$(DISTNAME)]'
+ @echo '* DIST_PYDOC - whether to include pydoc files in the doc'
+ @echo ' tarball (y) or not (n) [$(DIST_PYDOC)]'
@echo '* PKG_DISTDIR - directory for storing source tarballs'
@echo ' [$(PKG_DISTDIR:$(CURDIR)/%=%)]'
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 92616609309a3e5775463e880438a3e8ef2a5ddc
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Apr 3 19:37:43 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Apr 3 19:37:43 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=92616609
update roverlay-9999.ebuild
* fix python deps
* create "roverlay" group during pkg_preinst()
* compress config during src_compile()
* adopt Makefile changes
---
roverlay-9999.ebuild | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index abe6b6a..290bd51 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -25,42 +25,35 @@ KEYWORDS=""
IUSE="compress-config xz +prebuilt-documentation"
DEPEND="
- dev-python/setuptools
+ dev-python/setuptools[${PYTHON_USEDEP}]
!prebuilt-documentation? ( >=dev-python/docutils-0.9 )
compress-config? ( app-arch/bzip2 )"
RDEPEND="
sys-apps/portage
- virtual/python-argparse
+ virtual/python-argparse[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
- xz? ( $(python_gen_cond_dep dev-python/backports-lzma[${PYTHON_USEDEP}] python{2_7,3_2}) )
+ xz? ( $(python_gen_cond_dep dev-python/backports-lzma[$(python_gen_usedep python{2_7,3_2})] python{2_7,3_2} ) )
virtual/python-futures[${PYTHON_USEDEP}]"
-pkg_setup() {
+pkg_preinst() {
enewgroup roverlay
}
-python_prepare_all() {
- distutils-r1_python_prepare_all
+python_compile_all() {
+ use prebuilt-documentation || emake htmldoc
if use compress-config; then
einfo "Compressing dependency rules and license map"
emake X_COMPRESS=bzip2 BUILDDIR="${S}/compressed" compress-config
fi
}
-python_compile_all() {
- use prebuilt-documentation || emake htmldoc
-}
-
python_install_all() {
distutils-r1_python_install_all
emake BUILDDIR="${S}/compressed" DESTDIR="${D}" \
- install-data $(usex compress-config install-config{-compressed,})
-
- # could be done in the Makefile as well
- dobin "${S}/bin/install/${PN}-setup-interactive"
-
- newbashcomp "${S}/files/misc/${PN}.bashcomp" "${PN}"
+ BASHCOMPDIR="${D}/$(get_bashcompdir)" \
+ COMPRESSED_CONFIG="$(usex compress-config 1 0)" \
+ install-nonpy
}
pkg_config() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 41a330fd5e60b914b69a38c29339e4c7784d4ed5
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Apr 3 19:53:13 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Apr 3 19:53:13 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=41a330fd
Makefile, "dist": remove useless check
---
Makefile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Makefile b/Makefile
index 1e96354..d61ae2e 100644
--- a/Makefile
+++ b/Makefile
@@ -272,9 +272,6 @@ generate-files-commit: gemerate-files
# creates a src tarball (.tar.bz2)
PHONY += dist
dist: distclean generate-files $(_DIST_PYDOC_DEP) | $(PKG_DISTDIR)
-ifeq ($(DIST_TAR)$(DIST_BZIP2)$(DIST_GZIP)$(DIST_XZ),)
- $(error at least one of DIST_{TAR,BZIP2,GZIP,XZ} must be set)
-endif
$(eval MY_$@_BASEVER := $(shell cat $(VERSION_FILE)))
test -n '$(MY_$@_BASEVER)'
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 122127fc0c786f1e33f90968575c10c690c50344
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Apr 3 19:22:59 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Apr 3 19:22:59 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=122127fc
Makefile: DIST_{TAR,BZIP2,GZIP,XZ}
---
Makefile | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 2b973f5..1e96354 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,10 @@ RELEASE_NOT_DIRTY := n
RELEASE_DIRTY_SUFFIX := -dirty
VBUMP_COMMIT := y
DIST_PYDOC := y
+DIST_TAR := n
+DIST_GZIP := n
+DIST_BZIP2 := y
+DIST_XZ := n
MANIFEST := $(S)/MANIFEST
LICENSES_FILE := $(S)/files/licenses
@@ -268,8 +272,8 @@ generate-files-commit: gemerate-files
# creates a src tarball (.tar.bz2)
PHONY += dist
dist: distclean generate-files $(_DIST_PYDOC_DEP) | $(PKG_DISTDIR)
-ifeq ($(X_BZIP2)$(X_GZIP)$(X_XZ),)
- $(error at least one of X_BZIP2, X_GZIP, X_XZ must be set)
+ifeq ($(DIST_TAR)$(DIST_BZIP2)$(DIST_GZIP)$(DIST_XZ),)
+ $(error at least one of DIST_{TAR,BZIP2,GZIP,XZ} must be set)
endif
$(eval MY_$@_BASEVER := $(shell cat $(VERSION_FILE)))
test -n '$(MY_$@_BASEVER)'
@@ -294,19 +298,25 @@ endif
tar c -C $(SRC_DOCDIR)/ . -f $(MY_$@_DOCFILE).make_tmp
-ifneq ($(X_BZIP2),)
+ifeq ($(DIST_BZIP2),$(filter $(DIST_BZIP2),$(_TRUE_WORDS)))
$(X_BZIP2) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2
$(X_BZIP2) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).bz2
endif
-ifneq ($(X_GZIP),)
+ifeq ($(DIST_GZIP),$(filter $(DIST_GZIP),$(_TRUE_WORDS)))
$(X_GZIP) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).gz
$(X_GZIP) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).gz
endif
-ifneq ($(X_XZ),)
+ifeq ($(DIST_XZ),$(filter $(DIST_XZ),$(_TRUE_WORDS)))
$(X_XZ) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).xz
$(X_XZ) -c $(MY_$@_DOCFILE).make_tmp > $(MY_$@_DOCFILE).xz
endif
+ifeq ($(DIST_TAR),$(filter $(DIST_TAR),$(_TRUE_WORDS)))
+ mv -f -- $(MY_$@_FILE).make_tmp $(MY_$@_FILE)
+ mv -f -- $(MY_$@_DOCFILE).make_tmp $(MY_$@_DOCFILE)
+else
rm -- $(MY_$@_FILE).make_tmp
+ rm -- $(MY_$@_DOCFILE).make_tmp
+endif
# rule for compressing a deprule file
@@ -514,6 +524,11 @@ endif
@echo ' tarball (y) or not (n) [$(DIST_PYDOC)]'
@echo '* PKG_DISTDIR - directory for storing source tarballs'
@echo ' [$(PKG_DISTDIR:$(CURDIR)/%=%)]'
+ @echo '* DIST_TAR - whether to create .tar tarballs [$(DIST_TAR)]'
+ @echo '* DIST_BZIP2 - whether to create .tar.bz2 tarballs [$(DIST_BZIP2)]'
+ @echo '* DIST_GZIP - whether to create .tar.gzip tarballs [$(DIST_GZIP)]'
+ @echo '* DIST_XZ - whether to create .tar.xz tarballs [$(DIST_XZ)]'
+
PHONY += FORCE
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 8a76e7a8a17e118fcc9b6d6c3ac1a670fa10e0cb
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Apr 2 20:27:11 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Apr 2 20:27:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8a76e7a8
Makefile: add 'generate-files-commit' target
---
Makefile | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Makefile b/Makefile
index 505f0cf..1b43925 100644
--- a/Makefile
+++ b/Makefile
@@ -175,6 +175,18 @@ generate-config: \
PHONY += generate-files
generate-files: generate-config generate-doc generate-manifest generate-licenses
+PHONY += generate-files-commit
+generate-files-commit:
+ { ! $(X_GIT) status --porcelain -- . | grep ^[MADRCU]; }
+ $(X_GIT) add -vu -- \
+ R-overlay.conf \
+ R-overlay.conf.others \
+ config/R-overlay.conf.install \
+ config/R-overlay.conf.install.others \
+ doc/html/ \
+ files/licenses
+ $(X_GIT) commit -m "update generated files"
+
# creates a src tarball (.tar.bz2)
PHONY += release
release: generate-files
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 2ce133ed2f4c8bd6d1eeee7e1ad285c3284c903d
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Apr 3 19:00:02 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Apr 3 19:00:02 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2ce133ed
update .gitignore
---
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitignore b/.gitignore
index c065ba1..82072ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,10 @@
/release
/build
/dist
+/R_Overlay.egg-info/
+/roverlay_files.list
+
+/tmp/
# roverlay output files / directories, e.g. the created overlay
/log
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 316c754b535d2564ea2175a453b903ac4889c606
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Apr 3 18:47:22 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Apr 3 18:47:22 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=316c754b
Makefile overhaul
* added a "help" target
* moved pydoc creation to Makefile (bin/build/do_pydoc.sh no longer necessary)
* moved html doc creation to Makefile (allows parallelization)
* support parallel deprules compression (_compress-deprules)
* enforce file/dir mode for all installed files
(use recursive "install", not "cp -r")
* "dist" target: compress with bzip2, gzip and xz, depending on
X_BZIP2, X_GZIP, X_XZ
* removed broken "install-roverlay" target
* "install-pymodules" renamed to "install" as it installs
scripts/binaries as well
* "install-config-compressed" dropped in favor of COMPRESSED_CONFIG=0|1
(in "install-config")
* added "install-bashcomp", "install-nonpy"
* removed uninstall-roverlay, renamed uninstall-pymodules->uninstall
These changes are incompatible with the current roverlay-9999.ebuild's
src_install().
---
Makefile | 492 ++++++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 347 insertions(+), 145 deletions(-)
diff --git a/Makefile b/Makefile
index 1b43925..2efca5a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,61 +1,117 @@
# Some make targets for testing / distribution
+# run "make help" to list them
# don't create bytecode files when running py scripts (racy)
unexport PYTHONDONTWRITEBYTECODE
export PYTHONDONTWRITEBYTECODE=y
+_PRJNAME := R_Overlay
+_PN := roverlay
+DISTNAME := $(_PN)
+
+SHELL ?= sh
+
+S := $(CURDIR)
+# !!! for proper outdir $O support,
+# generate-* and install-* have to modified
+O := $(S)
+BUILDDIR := $(O)/tmp
+
DESTDIR := /
DESTTREE := $(DESTDIR)usr/
-DATADIR := $(DESTTREE)share
-BINDIR := $(DESTTREE)bin
-CONFDIR := $(DESTDIR)etc
+DATADIR := $(DESTTREE)share
+BINDIR := $(DESTTREE)bin
+CONFDIR := $(DESTDIR)etc
+BASHCOMPDIR := $(DATADIR)/bash-completion
+
+DIRMODE := 0755
+INSMODE := 0644
+EXEMODE := 0755
-BUILDDIR := ./tmp
+_DODIR = install -m $(DIRMODE) -d
+_DOINS = install -m $(INSMODE)
+_DOEXE = install -m $(EXEMODE)
+
+PYMOD_FILE_LIST := $(O)/$(_PN)_files.list
+
+_SETUP_PY_DIRS := $(addprefix $(S)/,build/ $(_PRJNAME).egg-info/)
+_PYMOD_DIRS := $(addprefix $(S)/,roverlay/)
ROVERLAY_TARGET_TYPE := gentoo
+COMPRESSED_CONFIG := n
RELEASE_NOT_DIRTY := n
RELEASE_DIRTY_SUFFIX := -dirty
VBUMP_COMMIT := y
-PYMOD_FILE_LIST := ./roverlay_files.list
-
-MANIFEST := $(CURDIR)/MANIFEST
-LICENSES_FILE := $(CURDIR)/files/licenses
-VERSION_FILE := $(CURDIR)/VERSION
+MANIFEST := $(S)/MANIFEST
+LICENSES_FILE := $(S)/files/licenses
+VERSION_FILE := $(S)/VERSION
+HTML_DOCS := usage
+HTMLDOC_TITLE := Automatically Generated Overlay of R packages
X_GIT := git
-
-MANIFEST_GEN := ./bin/build/create_manifest.sh
-LICENSES_GEN := ./bin/build/make-licenses.sh
-X_SETVER := ./bin/build/setver.sh
-RV_SETUP := ./bin/roverlay-setup
-
-SETUP_PY := ./setup.py
-PKG_DISTDIR := ./release
-
-LOGDIR := ./log
-
-ROVERLAY_MAIN := ./roverlay.py
+X_RST2HTML := rst2html.py
+X_GZIP := gzip
+X_BZIP2 := bzip2
+X_XZ := xz
+X_COMPRESS := $(X_BZIP2)
+ifeq ($(X_COMPRESS),$(X_BZIP2))
+X_COMPRESS_SUFFIX := .bz2
+else ifeq ($(X_COMPRESS),$(X_GZIP))
+X_COMPRESS_SUFFIX := .gz
+else ifeq ($(X_COMPRESS),$(X_XZ))
+X_COMPRESS_SUFFIX := .xz
+else
+X_COMPRESS_SUFFIX :=
+endif
PYVER :=
PYTHON := python$(PYVER)
-PYDOC_SH := ./bin/build/do_pydoc.sh
-X_COMPRESS := bzip2
-RST_HTML := ./bin/build/roverlay_rst2html.sh
+_SCRIPTS_DIR := $(S)/bin
+_BUILDSCRIPTS := $(_SCRIPTS_DIR)/build
+
+MANIFEST_GEN := $(_BUILDSCRIPTS)/create_manifest.sh
+LICENSES_GEN := $(_BUILDSCRIPTS)/make-licenses.sh
+X_SETVER := $(_BUILDSCRIPTS)/setver.sh
+PYDOC_SH := $(_BUILDSCRIPTS)/do_pydoc.sh
+RV_SETUP := $(_SCRIPTS_DIR)/$(_PN)-setup
+X_RUN_TESTS := $(_SCRIPTS_DIR)/run_tests
-SRC_DOCDIR := ./doc
+SETUP_PY := $(S)/setup.py
+PKG_DISTDIR := $(O)/release
+LOGDIR := $(S)/log
+SRC_DOCDIR := $(S)/doc
SELFDOC := $(SRC_DOCDIR)/pydoc
+_TRUE_WORDS := y Y 1 yes YES true TRUE
+
+# _f_recursive_install ( src_root, src_names, dest_root, file_mode )
+#
+# Recursively installs files from <src_root>/<%name> to <dest_root>/<%name>
+# for each name in <src_names>.
+#
+_f_recursive_install = ( \
+ cd $(1)/ && find $(2) -type f -print0 | \
+ xargs -0 -n 1 -I '{FILE}' $(SHELL) -c \
+ 'set -- install -m "$(4)" -D -- "{FILE}" "$(3)/{FILE}" && \
+ echo "$${*}" && "$${@}"' \
+)
+
+# _f_install_config_files ( src_dir )
+#
+# Installs "optionally compressable" files from src_dir to CONFDIR/_PN.
+# (i.e. config files not installed by install-config-common)
+#
+_f_install_config_files = $(call _f_recursive_install,$(1),\
+ license.map simple-deprules.d/,$(CONFDIR)/$(_PN),$(INSMODE))
+
+
PHONY += all
all:
-PHONY += check
-check:
- @true
-
PHONY += version
version:
@cat $(VERSION_FILE)
@@ -63,7 +119,7 @@ version:
PHONY += setver
setver: $(X_SETVER)
ifeq ($(VER),)
- $(error $$VER is not set.)
+ $(error $$VER is not set)
else
$< $(VER)
endif
@@ -71,94 +127,110 @@ endif
PHONY += version-bump
version-bump: $(X_SETVER)
{ ! $(X_GIT) status --porcelain -- $(notdir $(VERSION_FILE)) | grep .; }
-ifeq ($(VBUMP_COMMIT),$(filter $(VBUMP_COMMIT),y Y 1 yes YES true TRUE))
+ifeq ($(VBUMP_COMMIT),$(filter $(VBUMP_COMMIT),$(_TRUE_WORDS)))
X_GIT="$(X_GIT)" $< --reset --git-add --git-commit --git-tag +
else
X_GIT="$(X_GIT)" $< --reset --git-add +
endif
PHONY += test
-test: ./bin/run_tests
- ./bin/run_tests
+test: $(X_RUN_TESTS)
+ $<
PHONY += clean
clean:
- rm -rf ./build/ $(BUILDDIR)/
+ rm -rf -- $(_SETUP_PY_DIRS) $(BUILDDIR)/
+ rm -f -- $(wildcard $(PKG_DISTDIR)/*.make_tmp)
PHONY += clean-log
clean-log:
- rm -rf -- $(LOGDIR)
+ rm -rf -- $(LOGDIR)/
-PHONY += _pyclean
-_pyclean: | clean
- find . \( -name "*.pyc" -or -name "*.pyo" \) -delete -print
+PHONY += pyclean
+pyclean:
+ find $(_PYMOD_DIRS) -name '*.py[co]' -delete -print
-PHONY += _pydoc_clean
-_pydoc_clean:
+PHONY += pydoc_clean
+pydoc_clean:
+# rm -f -- $(wildcard $(SELFDOC)/*.html)
rm -f -- $(SELFDOC)/*.html
- test ! -d $(SELFDOC) || rmdir --ignore-fail-on-non-empty -- $(SELFDOC)/
PHONY += distclean
-distclean: clean _pyclean _pydoc_clean
+distclean: clean pyclean pydoc_clean
+ test ! -d $(SELFDOC) || rmdir --ignore-fail-on-non-empty -- $(SELFDOC)/
+
+$(PKG_DISTDIR) $(BUILDDIR) $(BUILDDIR)/config:
+ mkdir -p -- "$@"
-$(BUILDDIR):
- @install -d $(BUILDDIR)
+$(SELFDOC)/roverlay: $(S)/roverlay
+ mkdir -p -- $(@D)
+ ln -nfsT -- $< $@
# generates selfdocs (using pydoc) in $(SELFDOC)/
-$(SELFDOC): | _pydoc_clean
- -mkdir $(SELFDOC)
- ln -snfT -- ../../roverlay $(SELFDOC)/roverlay
- $(PYDOC_SH) $(SELFDOC)
+$(SELFDOC): FORCE pydoc_clean | $(SELFDOC)/roverlay
+ test -e $@/roverlay
+ cd $@ && find roverlay/ -type f -name '*.py' | \
+ sed -e 's,[.]py$$,,' -e 's,\/,.,g' -e 's,[.]__init__$$,,' | \
+ xargs pydoc -w
+ ln -nfsT -- roverlay.html $@/index.html
+ rm -f $@/roverlay
# alias to $(SELFDOC)
PHONY += pydoc
pydoc: $(SELFDOC)
+$(SRC_DOCDIR)/html/%.html: $(SRC_DOCDIR)/rst/%.rst
+ @mkdir -p $(@D)
+ $(X_RST2HTML) --title '$(HTMLDOC_TITLE)' --date '$<' '$@'
+
PHONY += htmldoc
-htmldoc: $(SRC_DOCDIR)/rst/usage.rst
- @install -d $(SRC_DOCDIR)/html
- $(RST_HTML) $(SRC_DOCDIR)/rst/usage.rst $(SRC_DOCDIR)/html/usage.html
+htmldoc: $(addsuffix .html,$(addprefix $(SRC_DOCDIR)/html/,$(HTML_DOCS)))
PHONY += generate-doc
generate-doc: htmldoc
$(MANIFEST): $(MANIFEST_GEN) FORCE
+ @mkdir -p $(@D)
$< > $@
PHONY += generate-manifest
generate-manifest: $(MANIFEST)
-$(LICENSES_FILE): $(LICENSES_GEN) FORCE | $(CURDIR)/files
+$(LICENSES_FILE): $(LICENSES_GEN) FORCE
+ @mkdir -p $(@D)
$< $@
PHONY += generate-licenses
-generate-licenses: $(CURDIR)/files/licenses
+generate-licenses: $(LICENSES_FILE)
-
-$(CURDIR)/config/R-overlay.conf.install: $(RV_SETUP) FORCE | $(CURDIR)/config
+$(S)/config/R-overlay.conf.install: $(RV_SETUP) FORCE
+ @mkdir -p $(@D)
ROVERLAY_INSTALLED=1 $< --target-type gentoo \
-O $@ \
- -D $(DATADIR)/roverlay \
- --conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \
- -A $(CONFDIR)/roverlay/files \
+ -D $(DATADIR)/$(_PN) \
+ --conf-root $(CONFDIR)/$(_PN) --my-conf-root $(CONFDIR)/$(_PN) \
+ -A $(CONFDIR)/$(_PN)/files \
mkconfig
-$(CURDIR)/config/R-overlay.conf.install.others: $(RV_SETUP) FORCE | $(CURDIR)/config
+$(S)/config/R-overlay.conf.install.others: $(RV_SETUP) FORCE
+ @mkdir -p $(@D)
ROVERLAY_INSTALLED=1 $< --target-type foreign \
-O $@ \
- -D $(DATADIR)/roverlay \
- --conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \
- -A $(CONFDIR)/roverlay/files \
+ -D $(DATADIR)/$(_PN) \
+ --conf-root $(CONFDIR)/$(_PN) --my-conf-root $(CONFDIR)/$(_PN) \
+ -A $(CONFDIR)/$(_PN)/files \
mkconfig
-$(CURDIR)/R-overlay.conf: $(RV_SETUP) FORCE
+$(S)/R-overlay.conf: $(RV_SETUP) FORCE
+ @mkdir -p $(@D)
ROVERLAY_INSTALLED=0 $< --target-type gentoo \
-O $@ --prjroot-relpath \
-D files --conf-root config --my-conf-root config -A files -W workdir \
mkconfig
-$(CURDIR)/R-overlay.conf.others: $(RV_SETUP) FORCE
+$(S)/R-overlay.conf.others: $(RV_SETUP) FORCE
+ @mkdir -p $(@D)
ROVERLAY_INSTALLED=0 $< --target-type foreign \
-O $@ --prjroot-relpath \
-D files --conf-root config --my-conf-root config -A files -W workdir \
@@ -166,17 +238,17 @@ $(CURDIR)/R-overlay.conf.others: $(RV_SETUP) FORCE
PHONY += generate-config
generate-config: \
- $(CURDIR)/config/R-overlay.conf.install \
- $(CURDIR)/config/R-overlay.conf.install.others \
- $(CURDIR)/R-overlay.conf \
- $(CURDIR)/R-overlay.conf.others
+ $(S)/config/R-overlay.conf.install \
+ $(S)/config/R-overlay.conf.install.others \
+ $(S)/R-overlay.conf \
+ $(S)/R-overlay.conf.others
PHONY += generate-files
-generate-files: generate-config generate-doc generate-manifest generate-licenses
+generate-files: $(addprefix generate-,config doc manifest licenses)
PHONY += generate-files-commit
-generate-files-commit:
+generate-files-commit: gemerate-files
{ ! $(X_GIT) status --porcelain -- . | grep ^[MADRCU]; }
$(X_GIT) add -vu -- \
R-overlay.conf \
@@ -188,117 +260,247 @@ generate-files-commit:
$(X_GIT) commit -m "update generated files"
# creates a src tarball (.tar.bz2)
-PHONY += release
-release: generate-files
+PHONY += dist
+dist: distclean generate-files | $(PKG_DISTDIR)
+ifeq ($(X_BZIP2)$(X_GZIP)$(X_XZ),)
+ $(error at least one of X_BZIP2, X_GZIP, X_XZ must be set)
+endif
$(eval MY_$@_BASEVER := $(shell cat $(VERSION_FILE)))
test -n '$(MY_$@_BASEVER)'
- $(eval MY_$@_HEADREF := $(shell git rev-parse --verify HEAD))
+
+ $(eval MY_$@_HEADREF := $(shell $(X_GIT) rev-parse --verify HEAD))
test -n '$(MY_$@_HEADREF)'
- $(eval MY_$@_VREF := $(shell git rev-parse --verify $(MY_$@_BASEVER) 2>/dev/null))
-ifeq ($(RELEASE_NOT_DIRTY),$(filter $(RELEASE_NOT_DIRTY),y Y 1 yes YES true TRUE))
+
+ $(eval MY_$@_VREF := $(shell $(X_GIT) rev-parse --verify $(MY_$@_BASEVER) 2>/dev/null))
+
+ifeq ($(RELEASE_NOT_DIRTY),$(filter $(RELEASE_NOT_DIRTY),$(_TRUE_WORDS)))
$(eval MY_$@_VER := $(MY_$@_BASEVER))
else
$(eval MY_$@_VER := $(MY_$@_BASEVER)$(shell \
test "$(MY_$@_HEADREF)" = "$(MY_$@_VREF)" || echo '$(RELEASE_DIRTY_SUFFIX)'))
endif
- $(eval MY_$@_FILE := $(PKG_DISTDIR)/roverlay_$(MY_$@_VER).tar)
- install -d -m 0755 -- $(PKG_DISTDIR)
- git archive --worktree-attributes --format=tar HEAD \
- --prefix=roverlay_$(MY_$@_VER)/ > $(MY_$@_FILE).make_tmp
+ $(eval MY_$@_FILE := $(PKG_DISTDIR)/$(DISTNAME)_$(MY_$@_VER).tar)
+
- bzip2 -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2
+ $(X_GIT) archive --worktree-attributes --format=tar HEAD \
+ --prefix=$(DISTNAME)_$(MY_$@_VER)/ > $(MY_$@_FILE).make_tmp
+
+ifneq ($(X_BZIP2),)
+ $(X_BZIP2) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).bz2
+endif
+ifneq ($(X_GZIP),)
+ $(X_GZIP) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).gz
+endif
+ifneq ($(X_XZ),)
+ $(X_XZ) -c $(MY_$@_FILE).make_tmp > $(MY_$@_FILE).xz
+endif
rm -- $(MY_$@_FILE).make_tmp
-PHONY += dist
-dist: distclean release
+# rule for compressing a deprule file
+$(BUILDDIR)/config/simple-deprules.d/%$(X_COMPRESS_SUFFIX): \
+ $(S)/config/simple-deprules.d/%
+
+ @mkdir -p $(@D)
+ $(X_COMPRESS) -c $< > $@
+
+# rule for compressing all deprule files
+PHONY += _compress-deprules
+_compress-deprules: $(shell \
+ find $(S)/config/simple-deprules.d/ -type f | sed \
+ -e 's,^$(S)/,$(BUILDDIR)/,' -e 's,$$,$(X_COMPRESS_SUFFIX),')
PHONY += compress-config
-compress-config: $(BUILDDIR)
- @install -d $(BUILDDIR)/config
- cp -vLr -p --no-preserve=ownership config/simple-deprules.d $(BUILDDIR)/config/
- find $(BUILDDIR)/config/simple-deprules.d/ -type f -print0 | xargs -0 -n 5 --verbose $(X_COMPRESS)
- $(X_COMPRESS) -c config/license.map > $(BUILDDIR)/config/license.map
-
-PHONY += install-roverlay
-install-roverlay: ./roverlay.py
- install -T -D -- ./roverlay.py $(BINDIR)/roverlay
-
-PHONY += install-pymodules
-install-pymodules: ./setup.py
- $(PYTHON) ./setup.py install --record $(PYMOD_FILE_LIST)
-
-PHONY += install-config-common
-install-config-common:
- install -m 0755 -d $(CONFDIR)/roverlay
- install -m 0644 -t $(CONFDIR)/roverlay \
+compress-config: _compress-deprules | $(BUILDDIR)/config
+ $(X_COMPRESS) -c config/license.map > $(BUILDDIR)/config/license.map
+
+
+PHONY += install-config
+install-config:
+ $(_DODIR) $(CONFDIR)/$(_PN)
+ $(_DOINS) -t $(CONFDIR)/$(_PN) \
config/description_fields.conf config/repo.list \
config/package_rules config/hookrc
ifeq ($(ROVERLAY_TARGET_TYPE),gentoo)
- install -m 0644 -T \
- config/R-overlay.conf.install $(CONFDIR)/roverlay/R-overlay.conf
+ $(_DOINS) -T \
+ config/R-overlay.conf.install $(CONFDIR)/$(_PN)/R-overlay.conf
else
- install -m 0644 -T \
- config/R-overlay.conf.install.others $(CONFDIR)/roverlay/R-overlay.conf
+ $(_DOINS) -T \
+ config/R-overlay.conf.install.others $(CONFDIR)/$(_PN)/R-overlay.conf
+endif
+ifeq ($(COMPRESSED_CONFIG),$(filter $(COMPRESSED_CONFIG),$(_TRUE_WORDS)))
+ $(call _f_install_config_files,$(BUILDDIR)/config)
+else
+ $(call _f_install_config_files,$(S)/config)
endif
-PHONY += install-config-compressed
-install-config-compressed: install-config-common
- cp -vLr -p --no-preserve=ownership \
- $(BUILDDIR)/config/simple-deprules.d $(BUILDDIR)/config/license.map \
- $(CONFDIR)/roverlay/
-
-PHONY += install-config
-install-config: install-config-common
- cp -vLr -p --no-preserve=ownership \
- config/simple-deprules.d config/license.map \
- $(CONFDIR)/roverlay/
-
-
-# license.map deprules
PHONY += install-data
install-data:
- install -m 0755 -d \
- $(DATADIR)/roverlay \
- $(DATADIR)/roverlay/shlib $(DATADIR)/roverlay/hooks \
- $(DATADIR)/roverlay/eclass $(DATADIR)/roverlay/mako_templates
+ $(_DODIR) -- \
+ $(addprefix $(DATADIR)/$(_PN)/,shlib hooks eclass mako_templates)
ifeq ($(ROVERLAY_TARGET_TYPE),gentoo)
- install -m 0644 -- files/setup.defaults $(DATADIR)/setup.defaults
+ $(_DOINS) -- files/setup.defaults $(DATADIR)/setup.defaults
else
- install -m 0644 -- files/setup.defaults.others $(DATADIR)/setup.defaults
- install -m 0644 -- $(LICENSES_FILE) $(DATADIR)/roverlay/licenses
+ $(_DOINS) -- files/setup.defaults.others $(DATADIR)/setup.defaults
+ $(_DOINS) -- $(LICENSES_FILE) $(DATADIR)/$(_PN)/licenses
endif
- install -m 0644 -t $(DATADIR)/roverlay/hooks files/hooks/*.sh
- install -m 0644 -t $(DATADIR)/roverlay/shlib files/shlib/*.sh
- chmod 0775 $(DATADIR)/roverlay/hooks/mux.sh
-
- install -m 0644 -t $(DATADIR)/roverlay/eclass files/eclass/*.eclass
-
- install -m 0644 -t $(DATADIR)/roverlay/mako_templates \
- files/mako_templates/*.*
+ $(_DOINS) -t $(DATADIR)/$(_PN)/hooks -- $(wildcard files/hooks/*.sh)
+ chmod $(EXEMODE) -- $(DATADIR)/$(_PN)/hooks/mux.sh
+ $(_DOINS) -t $(DATADIR)/$(_PN)/shlib -- $(wildcard files/shlib/*.sh)
+ $(_DOINS) -t $(DATADIR)/$(_PN)/eclass -- $(wildcard files/eclass/*.eclass)
+ $(_DOINS) -t $(DATADIR)/$(_PN)/mako_templates -- \
+ $(wildcard files/mako_templates/*.*)
+
+PHONY += install-bashcomp
+install-bashcomp:
+ $(_DODIR) $(BASHCOMPDIR)
+ $(foreach f,$(wildcard $(S)/files/misc/*.bashcomp),\
+ $(_DOINS) -- $(f) $(BASHCOMPDIR)/$(notdir $(basename $(f))))
PHONY += install
-install: install-pymodules install-roverlay
+install: $(SETUP_PY)
+ $(PYTHON) $< install --root $(DESTDIR) --record $(PYMOD_FILE_LIST)
-PHONY += install-all
-install-all: install
+PHONY += install-nonpy
+install-nonpy: $(addprefix install-,data config bashcomp)
-PHONY += uninstall-roverlay
-uninstall-roverlay:
- rm -vf -- $(BINDIR)/roverlay
+PHONY += install-all
+install-all: install install-nonpy
-PHONY += uninstall-pymodules
-uninstall-pymodules: $(PYMOD_FILE_LIST)
+PHONY += uninstall
+uninstall: $(PYMOD_FILE_LIST)
xargs rm -vrf < $(PYMOD_FILE_LIST)
-PHONY += uninstall
-uinstall:
+PHONY += uninstall-all
+uninstall-all:
@false
-PHONY += uninstall-all
-uninstall-all: uninstall
+PHONY += help
+help:
+ $(eval MY_$@_GENITIVE := $(_PN)'\''s)
+
+ @echo 'Basic Targets:'
+ @echo ' all - do nothing'
+ @echo ' version - print $(MY_$@_GENITIVE) version'
+ @echo ' compress-config - compress config files with X_COMPRESS'
+ @echo ' and write them to BUILDDIR/config'
+ @echo ' (X_COMPRESS: $(X_COMPRESS))'
+ @echo ' (BUILDDIR : $(BUILDDIR:$(CURDIR)/%=%))'
+# @echo ' _compress-deprules - compress dependency rule files with X_COMPRESS'
+ @echo ' test - run tests'
+ @echo ''
+
+ @echo '(Un-)Install Targets:'
+ @echo ' install-all - run all targets marked with [I]'
+ @echo ' uninstall-all - ***not available***'
+ @echo ' install-nonpy - run all targets marked with [I] except'
+ @echo ' "install"'
+ @echo 'I install - install scripts and python modules to DESTDIR'
+ @echo ' (DESTDIR: $(DESTDIR))'
+ @echo ' uninstall - uninstall scripts / python modules'
+ @echo 'I install-config - install config files to CONFDIR/$(_PN)'
+ @echo ' use compressed files from BUILDDIR where'
+ @echo ' applicable if COMPRESSED_CONFIG is "y"'
+ @echo ' "compress-config" must be run manually!'
+ @echo ' (CONFDIR: $(CONFDIR))'
+ @echo ' (COMPRESSED_CONFIG: $(COMPRESSED_CONFIG))'
+ @echo 'I install-data - install data files to DATADIR/$(_PN)'
+ @echo ' (DATADIR: $(DATADIR))'
+ @echo 'I install-bashcomp - install bash completion files to BASHCOMPDIR'
+ @echo ' (BASHCOMPDIR: $(BASHCOMPDIR))'
+ @echo ''
+
+ @echo 'Cleanup Targets:'
+ @echo ' clean - remove temporary dirs'
+ @echo ' distclean - remove temporary dirs, .py[co] and pydoc files'
+ @echo ' clean-log - remove log file directory LOGDIR'
+ @echo ' (LOGDIR: $(LOGDIR:$(CURDIR)/%=%))'
+ @echo ' pyclean - remove .py[co] files'
+ @echo ' pydoc_clean - remove pydoc files'
+ @echo ''
+
+ @echo 'File Generation Targets:'
+ @echo ' generate-files - run all targets marked with [G]'
+ @echo ' pydoc - create pydoc files (in-code documentation)'
+ @echo ' htmldoc - create html documentation (usage guide)'
+ @echo 'G generate-doc - alias to "htmldoc"'
+ @echo 'G generate-manifest - create a MANIFEST file for setup.py'
+ @echo 'G generate-licenses - create a licenses file and write it to'
+ @echo ' LICENSES_FILE, for systems without PORTDIR'
+ @echo ' (default: $(LICENSES_FILE:$(CURDIR)/%=%))'
+ @echo 'G generate-config - create R-overlay.conf config files'
+ @echo ''
+
+ @echo 'Release/Devel Helper Targets:'
+ @echo ' generate-files-commit - run "generate-files" and commit changes'
+ @echo ' version-bump - increase $(MY_$@_GENITIVE) version (patchlevel)'
+ @echo ' and git commit/tag depending on VBUMP_COMMIT'
+ @echo ' (default: $(VBUMP_COMMIT))'
+ @echo ' setver - set $(MY_$@_GENITIVE) version to VER'
+ @echo ' (default: <not set>)'
+ @echo ' dist - create source tarball(s) in PKG_DISTDIR:'
+ @echo ' DISTNAME_<version>.tar.<compression suffix>'
+ @echo ' (implies "distclean" and "generate-files")'
+ @echo ' (PKG_DISTDIR: $(PKG_DISTDIR:$(CURDIR)/%=%))'
+ @echo ' (DISTNAME: $(DISTNAME))'
+ @echo ''
+ @echo ''
+ @echo 'Variables:'
+ @echo '* ROVERLAY_TARGET_TYPE - controls which files get installed and should'
+ @echo ' be either "gentoo" or "foreign" [$(ROVERLAY_TARGET_TYPE)]'
+ @echo ' Pick "foreign" for systems'
+ @echo ' without portage and/or PORTDIR.'
+ @echo '* COMPRESSED_CONFIG - whether to install compressed config files (y)'
+ @echo ' or not (n) [$(COMPRESSED_CONFIG)]'
+ @echo '* DESTDIR - installation root directory'
+ @echo ' [$(DESTDIR)]'
+ @echo '* DESTTREE - installation directory with prefix'
+ @echo ' (DESTDIR/usr/) [$(DESTTREE)]'
+ @echo '* DATADIR - directory for data files (DESTTREE/share)'
+ @echo ' [$(DATADIR)]'
+ @echo '* BINDIR - directory for executables (DESTTREE/bin)'
+ @echo ' [$(BINDIR)]'
+ @echo '* CONFDIR - system config directory (DESTDIR/etc)'
+ @echo ' [$(CONFDIR)]'
+ @echo '* BASHCOMPDIR - bashcomp dir (DATADIR/bash-completion)'
+ @echo ' [$(BASHCOMPDIR)]'
+ @echo '* DIRMODE - mode for installing directories [$(DIRMODE)]'
+ @echo '* INSMODE - mode for installing files [$(INSMODE)]'
+ @echo '* EXEMODE - mode for installing scripts [$(EXEMODE)]'
+ @echo '* PYMOD_FILE_LIST - file for recording files installed by setup.py'
+ @echo ' [$(PYMOD_FILE_LIST:$(CURDIR)/%=%)]'
+ @echo '* BUILDDIR - directory for temporary build files, e.g.'
+ @echo ' compressed config'
+ @echo ' [$(BUILDDIR:$(CURDIR)/%=%)]'
+ @echo ''
+ @echo -n '* PYVER - version of the python interpreter '
+ifeq ($(PYVER),)
+ @echo '[<unset>]'
+else
+ @echo '[$(PYVER)]'
+endif
+ @echo '* PYTHON - name of/path to python (pythonPYVER) [$(PYTHON)]'
+ @echo '* X_COMPRESS - default compression program (X_BZIP2) [$(X_COMPRESS)]'
+ @echo ' (used in compress-* targets)'
+ @echo '* X_COMPRESS_SUFFIX - file extension for compressed deprule files'
+ @echo ' (default: depends on X_COMPRESS) [$(X_COMPRESS_SUFFIX)]'
+ @echo '* X_BZIP2 - name of/path to bzip2 [$(X_BZIP2)]'
+ @echo '* X_GZIP - name of/path to gzip [$(X_GZIP)]'
+ @echo '* X_XZ - name of/path to xz [$(X_XZ)]'
+ @echo '* X_GIT - name of/path to git [$(X_GIT)]'
+ @echo '* X_RST2HTML - name of/path to rst2html [$(X_RST2HTML)]'
+ @echo ''
+ @echo '* VBUMP_COMMIT - whether to commit/tag when running'
+ @echo ' "version-bump" (y) or not (n) [$(VBUMP_COMMIT)]'
+ @echo '* RELEASE_NOT_DIRTY - whether to check if the dist tarball actually'
+ @echo ' matches its version (n) or not (y) [$(RELEASE_NOT_DIRTY)]'
+ @echo '* RELEASE_DIRTY_SUFFIX - suffix for "dirty" dist tarballs [$(RELEASE_DIRTY_SUFFIX)]'
+ @echo '* DISTNAME - base name for source tarballs [$(DISTNAME)]'
+ @echo '* PKG_DISTDIR - directory for storing source tarballs'
+ @echo ' [$(PKG_DISTDIR:$(CURDIR)/%=%)]'
+
PHONY += FORCE
FORCE:
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-06-05 22:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-06-05 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 356e6985f87066652d625e20d0834f371aed253b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Apr 2 19:55:36 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Apr 2 20:12:47 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=356e6985
Makefile: add 'setver', 'version-bump' targets
---
Makefile | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f308e44..505f0cf 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ BUILDDIR := ./tmp
ROVERLAY_TARGET_TYPE := gentoo
RELEASE_NOT_DIRTY := n
RELEASE_DIRTY_SUFFIX := -dirty
+VBUMP_COMMIT := y
PYMOD_FILE_LIST := ./roverlay_files.list
@@ -23,9 +24,11 @@ MANIFEST := $(CURDIR)/MANIFEST
LICENSES_FILE := $(CURDIR)/files/licenses
VERSION_FILE := $(CURDIR)/VERSION
+X_GIT := git
+
MANIFEST_GEN := ./bin/build/create_manifest.sh
LICENSES_GEN := ./bin/build/make-licenses.sh
-
+X_SETVER := ./bin/build/setver.sh
RV_SETUP := ./bin/roverlay-setup
SETUP_PY := ./setup.py
@@ -57,6 +60,23 @@ PHONY += version
version:
@cat $(VERSION_FILE)
+PHONY += setver
+setver: $(X_SETVER)
+ifeq ($(VER),)
+ $(error $$VER is not set.)
+else
+ $< $(VER)
+endif
+
+PHONY += version-bump
+version-bump: $(X_SETVER)
+ { ! $(X_GIT) status --porcelain -- $(notdir $(VERSION_FILE)) | grep .; }
+ifeq ($(VBUMP_COMMIT),$(filter $(VBUMP_COMMIT),y Y 1 yes YES true TRUE))
+ X_GIT="$(X_GIT)" $< --reset --git-add --git-commit --git-tag +
+else
+ X_GIT="$(X_GIT)" $< --reset --git-add +
+endif
+
PHONY += test
test: ./bin/run_tests
./bin/run_tests
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-04-01 16:38 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-04-01 16:38 UTC (permalink / raw
To: gentoo-commits
commit: fd098efcebdad3a92d40bcd00278d7011bd31404
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Mar 31 17:31:49 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Apr 1 16:36:36 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fd098efc
Makefile: parallel generate-config
---
Makefile | 81 ++++++++++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 58 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index 5f5ac2c..9a41011 100644
--- a/Makefile
+++ b/Makefile
@@ -37,43 +37,36 @@ SRC_DOCDIR := ./doc
SELFDOC := $(SRC_DOCDIR)/pydoc
-.PHONY: default \
- clean clean-log _pyclean _pydoc_clean distclean \
- docs pydoc htmldoc \
- check test \
- generate-files \
- generate-config generate-doc generate-manifest \
- release dist \
- compress-config \
- install-all install \
- install-roverlay install-pymodules \
- install-data install-config-common \
- install-config-compressed install-config \
- uninstall-all uninstall \
- uninstall-roverlay uninstall-pymodules
-
+PHONY += default
default:
@false
+PHONY += check
check:
@true
+PHONY += test
test: ./bin/run_tests
./bin/run_tests
+PHONY += clean
clean:
rm -rf ./build/ $(BUILDDIR)/
+PHONY += clean-log
clean-log:
rm -rf -- $(LOGDIR)
+PHONY += _pyclean
_pyclean:
find . \( -name "*.pyc" -or -name "*.pyo" \) -delete -print
+PHONY += _pydoc_clean
_pydoc_clean:
rm -f -- $(SELFDOC)/*.html
! test -d $(SELFDOC) || rmdir --ignore-fail-on-non-empty -- $(SELFDOC)/
+PHONY += distclean
distclean: clean _pyclean _pydoc_clean
$(BUILDDIR):
@@ -86,60 +79,89 @@ $(SELFDOC):
$(PYDOC_SH) $(SELFDOC)
# alias to $(SELFDOC)
+PHONY += pydoc
pydoc: $(SELFDOC)
+PHONY += htmldoc
htmldoc: $(SRC_DOCDIR)/rst/usage.rst
@install -d $(SRC_DOCDIR)/html
$(RST_HTML) $(SRC_DOCDIR)/rst/usage.rst $(SRC_DOCDIR)/html/usage.html
+PHONY += generate-doc
generate-doc: htmldoc
+PHONY += generate-manifest
generate-manifest: $(MANIFEST_GEN)
$(MANIFEST_GEN) > $(MANIFEST_TMP)
mv -- $(MANIFEST_TMP) $(MANIFEST)
-generate-config: $(RV_SETUP)
- ROVERLAY_INSTALLED=1 $(RV_SETUP) \
- -O config/R-overlay.conf.install \
+
+$(CURDIR)/config/R-overlay.conf.install: $(RV_SETUP) FORCE | $(CURDIR)/config
+ ROVERLAY_INSTALLED=1 $< --target-type gentoo \
+ -O $@ \
-D $(DATADIR)/roverlay \
--conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \
-A $(CONFDIR)/roverlay/files \
mkconfig
- ROVERLAY_INSTALLED=0 $(RV_SETUP) \
- -O R-overlay.conf --prjroot-relpath \
+$(CURDIR)/config/R-overlay.conf.install.others: $(RV_SETUP) FORCE | $(CURDIR)/config
+ ROVERLAY_INSTALLED=1 $< --target-type foreign \
+ -O $@ \
+ -D $(DATADIR)/roverlay \
+ --conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \
+ -A $(CONFDIR)/roverlay/files \
+ mkconfig
+
+$(CURDIR)/R-overlay.conf: $(RV_SETUP) FORCE
+ ROVERLAY_INSTALLED=0 $< --target-type gentoo \
+ -O $@ --prjroot-relpath \
-D files --conf-root config --my-conf-root config -A files -W workdir \
mkconfig
- ROVERLAY_INSTALLED=0 $(RV_SETUP) \
- -O R-overlay.conf.others --prjroot-relpath --target-type foreign \
+$(CURDIR)/R-overlay.conf.others: $(RV_SETUP) FORCE
+ ROVERLAY_INSTALLED=0 $< --target-type foreign \
+ -O $@ --prjroot-relpath \
-D files --conf-root config --my-conf-root config -A files -W workdir \
mkconfig
+PHONY += generate-config
+generate-config: \
+ $(CURDIR)/config/R-overlay.conf.install \
+ $(CURDIR)/config/R-overlay.conf.install.others \
+ $(CURDIR)/R-overlay.conf \
+ $(CURDIR)/R-overlay.conf.others
+
+PHONY += generate-files
generate-files: generate-config generate-doc generate-manifest
# creates a src tarball (.tar.bz2)
# !!! does not include config files
+PHONY += release
release: generate-files
@echo "Note: the release tarball does not include any config files!"
@install -d $(PKG_DISTDIR)
./$(SETUP_PY) sdist --dist-dir=$(PKG_DISTDIR) --formats=bztar
+PHONY += dist
dist: distclean release
+PHONY += compress-config
compress-config: $(BUILDDIR)
@install -d $(BUILDDIR)/config
cp -vLr -p --no-preserve=ownership config/simple-deprules.d $(BUILDDIR)/config/
find $(BUILDDIR)/config/simple-deprules.d/ -type f -print0 | xargs -0 -n 5 --verbose $(X_COMPRESS)
$(X_COMPRESS) -c config/license.map > $(BUILDDIR)/config/license.map
+PHONY += install-roverlay
install-roverlay: ./roverlay.py
install -T -D -- ./roverlay.py $(BINDIR)/roverlay
+PHONY += install-pymodules
install-pymodules: ./setup.py
$(PYTHON) ./setup.py install --record $(PYMOD_FILE_LIST)
+PHONY += install-config-common
install-config-common:
install -m 0755 -d $(CONFDIR)/roverlay
install -m 0644 -t $(CONFDIR)/roverlay \
@@ -148,11 +170,13 @@ install-config-common:
install -m 0644 -T \
config/R-overlay.conf.install $(CONFDIR)/roverlay/R-overlay.conf
+PHONY += install-config-compressed
install-config-compressed: install-config-common
cp -vLr -p --no-preserve=ownership \
$(BUILDDIR)/config/simple-deprules.d $(BUILDDIR)/config/license.map \
$(CONFDIR)/roverlay/
+PHONY += install-config
install-config: install-config-common
cp -vLr -p --no-preserve=ownership \
config/simple-deprules.d config/license.map \
@@ -160,7 +184,7 @@ install-config: install-config-common
# license.map deprules
-
+PHONY += install-data
install-data:
install -m 0755 -d \
$(DATADIR)/roverlay/shlib $(DATADIR)/roverlay/hooks \
@@ -175,17 +199,28 @@ install-data:
install -m 0644 -t $(DATADIR)/roverlay/mako_templates \
files/mako_templates/*.*
+PHONY += install
install: install-pymodules install-roverlay
+PHONY += install-all
install-all: install
+PHONY += uninstall-roverlay
uninstall-roverlay:
rm -vf -- $(BINDIR)/roverlay
+PHONY += uninstall-pymodules
uninstall-pymodules: $(PYMOD_FILE_LIST)
xargs rm -vrf < $(PYMOD_FILE_LIST)
+PHONY += uninstall
uinstall:
@false
+PHONY += uninstall-all
uninstall-all: uninstall
+
+PHONY += FORCE
+FORCE:
+
+.PHONY: $(PHONY)
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-04-01 16:38 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-04-01 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 01679b2c15a7e7e62a8a9cb2f57fe1815d70b9c4
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Mar 31 16:06:00 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Mar 31 16:06:00 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=01679b2c
Makefile, generate-config: + R-overlay.conf.others
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 495f6c8..5f5ac2c 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ generate-config: $(RV_SETUP)
mkconfig
ROVERLAY_INSTALLED=0 $(RV_SETUP) \
- -O R-overlay.conf.local.new \
+ -O R-overlay.conf.others --prjroot-relpath --target-type foreign \
-D files --conf-root config --my-conf-root config -A files -W workdir \
mkconfig
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-02-22 14:56 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-02-22 14:56 UTC (permalink / raw
To: gentoo-commits
commit: af8169aca4833ac4b75c9cb109adddd24c910c78
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Feb 22 14:49:44 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Feb 22 14:49:44 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=af8169ac
Merge branch 'feature/websync-pbar'
roverlay/remote/websync.py | 39 ++++++--
roverlay/util/progressbar.py | 210 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 242 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-02-22 14:56 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-02-22 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 451b9c4a86e0ebcb13e6333900178c59e40393d6
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Feb 22 14:35:45 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Feb 22 14:43:36 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=451b9c4a
roverlay-9999.ebuild: compression USE flags
* bzip2 renamed to compress-config
* the (new) xz flag can be selected to have guaranteed runtime support for xz
---
roverlay-9999.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index db24ce6..abe6b6a 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -22,18 +22,18 @@ SRC_URI=""
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS=""
-IUSE="bzip2 +prebuilt-documentation"
-
+IUSE="compress-config xz +prebuilt-documentation"
DEPEND="
dev-python/setuptools
- !prebuilt-documentation? ( >=dev-python/docutils-0.9 )"
+ !prebuilt-documentation? ( >=dev-python/docutils-0.9 )
+ compress-config? ( app-arch/bzip2 )"
RDEPEND="
sys-apps/portage
virtual/python-argparse
dev-python/mako[${PYTHON_USEDEP}]
- virtual/python-futures"
-
+ xz? ( $(python_gen_cond_dep dev-python/backports-lzma[${PYTHON_USEDEP}] python{2_7,3_2}) )
+ virtual/python-futures[${PYTHON_USEDEP}]"
pkg_setup() {
enewgroup roverlay
@@ -41,9 +41,9 @@ pkg_setup() {
python_prepare_all() {
distutils-r1_python_prepare_all
- if use bzip2; then
- einfo "USE=bzip2: Compressing dependency rules and license map"
- emake BUILDDIR="${S}/compressed" compress-config
+ if use compress-config; then
+ einfo "Compressing dependency rules and license map"
+ emake X_COMPRESS=bzip2 BUILDDIR="${S}/compressed" compress-config
fi
}
@@ -55,7 +55,7 @@ python_install_all() {
distutils-r1_python_install_all
emake BUILDDIR="${S}/compressed" DESTDIR="${D}" \
- install-data $(usex bzip2 install-config{-compressed,})
+ install-data $(usex compress-config install-config{-compressed,})
# could be done in the Makefile as well
dobin "${S}/bin/install/${PN}-setup-interactive"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-02-21 18:15 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-02-21 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 46a5021e5a13ef73c1d6c2775fd16b1d40a7cb13
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Feb 21 18:13:44 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Feb 21 18:13:44 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=46a5021e
roverlay-9999.ebuild: reenable python2_7
add python2_7 to PYTHON_COMPAT, local test run succeeded.
---
roverlay-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 31a3d1d..db24ce6 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python{3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
PYTHON_REQ_USE="ssl,threads(+),readline(+)"
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-02-16 3:44 Benda XU
0 siblings, 0 replies; 146+ messages in thread
From: Benda XU @ 2014-02-16 3:44 UTC (permalink / raw
To: gentoo-commits
commit: d95efe157ea2a9e02eac805ae41fd340ac5e117c
Author: Benda Xu <heroxbd <AT> gmail <DOT> com>
AuthorDate: Sun Feb 16 03:43:52 2014 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 03:43:52 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d95efe15
roverlay-9999.ebuild: rovelay is no longer compatible with python2.7
Traceback (most recent call last):
File "/usr/lib/python-exec/python2.7/roverlay", line 7, in <module>
roverlay.defaultscript.main_installed()
File "/usr/lib64/python2.7/site-packages/roverlay/defaultscript.py", line 35, in main_installed
return main ( True, *args, **kw )
File "/usr/lib64/python2.7/site-packages/roverlay/defaultscript.py", line 73, in main
retcode = run_overlay_create ( main_env )
File "/usr/lib64/python2.7/site-packages/roverlay/defaultscript.py", line 201, in run_overlay_create
run_sync ( env )
File "/usr/lib64/python2.7/site-packages/roverlay/defaultscript.py", line 177, in run_sync
repo_list.load()
File "/usr/lib64/python2.7/site-packages/roverlay/remote/repolist.py", line 128, in load
self.load_file ( f )
File "/usr/lib64/python2.7/site-packages/roverlay/remote/repolist.py", line 119, in load_file
self.repos.extend ( new_repos )
File "/usr/lib64/python2.7/site-packages/roverlay/remote/repoloader.py", line 82, in read_repofile
**common_kwargs
File "/usr/lib64/python2.7/site-packages/roverlay/remote/rsync.py", line 85, in __init__
src_uri=src_uri, remote_uri=rsync_uri
File "/usr/lib64/python2.7/site-packages/roverlay/remote/basicrepo.py", line 75, in __init__
self._identifier = next ( self.__class__.ID_GENERATOR )
TypeError: IDGenerator object is not an iterator
---
roverlay-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index db24ce6..31a3d1d 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
PYTHON_REQ_USE="ssl,threads(+),readline(+)"
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2014-01-25 18:14 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2014-01-25 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 764706f05b3f2b45b5747dc0d4ce082e004c234d
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Jan 25 17:57:47 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Jan 25 17:57:47 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=764706f0
roverlay-9999.ebuild: fix/update deps
---
roverlay-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 0a53267..db24ce6 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -27,12 +27,12 @@ IUSE="bzip2 +prebuilt-documentation"
DEPEND="
dev-python/setuptools
- prebuilt-documentation? ( >=dev-python/docutils-0.9 )"
+ !prebuilt-documentation? ( >=dev-python/docutils-0.9 )"
RDEPEND="
sys-apps/portage
virtual/python-argparse
dev-python/mako[${PYTHON_USEDEP}]
- $(python_gen_cond_dep dev-python/futures[$(python_gen_usedep python2_7)] python2_7)"
+ virtual/python-futures"
pkg_setup() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-12-11 18:40 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-12-11 18:40 UTC (permalink / raw
To: gentoo-commits
commit: dce558d1a5bac085e60febdda694281a2f42cb79
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Dec 11 18:38:21 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Dec 11 18:38:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=dce558d1
roverlay-9999.ebuild: add python3_3 to PYTHON_COMPAT
---
roverlay-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 2bb5930..0a53267 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -4,8 +4,7 @@
EAPI=5
-# dev-python/mako doesn't support python3.3, currently
-PYTHON_COMPAT=( python{2_7,3_2} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
PYTHON_REQ_USE="ssl,threads(+),readline(+)"
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-23 15:30 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-23 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 1333bf72ec3de0c82027fa2d2e56d44d0f23d9eb
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Sep 23 14:24:04 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Sep 23 14:24:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=1333bf72
gitignore: add /R-overlay.conf.tests
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 646235d..c065ba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@
/local
*.local
*.local.*
+/R-overlay.conf.tests
# files/dirs to ignore
.keep
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-23 15:30 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-23 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 921e3ef8ac3cb1dcbb58bc3b6cd00306c5fc5e18
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Sep 23 14:36:37 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Sep 23 14:36:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=921e3ef8
minor README change
---
README | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/README b/README
index 9062f23..f5d33b1 100644
--- a/README
+++ b/README
@@ -12,6 +12,7 @@ overlay creation.
bin/ -- scripts/programs
bin/install/ -- variants of the scripts in bin/
for installed versions of roverlay
+
roverlay/ -- roverlay python modules
config/ -- config files
@@ -28,12 +29,13 @@ doc/ -- documentation root directory
doc/pydoc -- code self-documentation in html,
can be created with 'make pydoc'
-tests/ -- python modules for testing roverlay
-examples/ -- code examples
+tests/ -- python modules for testing roverlay
+examples/ -- code examples
+
= Usage instructions =
-./roverlay.py [option(s)] [command(s)]
+./roverlay.py [option...] [command...]
Please see ./roverlay.py --help for all options and doc/rst or doc/html for
the full usage documentation, including software/hardware requirements.
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-23 15:30 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-23 15:30 UTC (permalink / raw
To: gentoo-commits
commit: fa1b73b863088519c25d3010c5c15603e82c7df6
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Sep 23 14:17:28 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Sep 23 14:17:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fa1b73b8
gitignore: add .keep
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index 7fb324d..646235d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@
/local
*.local
*.local.*
+
+# files/dirs to ignore
+.keep
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-23 15:30 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-23 15:30 UTC (permalink / raw
To: gentoo-commits
commit: fd61397f81aa1e23814746de87e2d59e9cff0cc0
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Sep 23 14:14:15 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Sep 23 14:14:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fd61397f
update README
---
README | 39 +++++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/README b/README
index 75cf00e..9062f23 100644
--- a/README
+++ b/README
@@ -9,25 +9,40 @@ overlay creation.
= Directory overview =
-roverlay/ -- roverlay python modules
-config/ -- config files
-eclass/ -- eclass file(s)
-misc/ -- miscellaneous files, e.g. a sed expression that makes roverlay.py
- 'installed'
-doc/ -- documentation root directory
-doc/rst -- roverlay documentation (in reStructuredText)
-doc/html -- html version of the latest 'stable' rst documentation
-doc/pydoc -- code self-documentation in html, can be created with 'make pydoc'
-
+bin/ -- scripts/programs
+ bin/install/ -- variants of the scripts in bin/
+ for installed versions of roverlay
+roverlay/ -- roverlay python modules
+
+config/ -- config files
+ files/ -- additional files
+ files/eclass/ -- eclass file(s)
+ files/hooks/ -- hook scripts
+ files/mako_templates/ -- templates for status reports
+ files/misc/ -- bash completion file
+ files/shlib/ -- shell function file(s)
+
+doc/ -- documentation root directory
+ doc/rst -- roverlay documentation (in reStructuredText)
+ doc/html -- html version of /doc (generated files)
+ doc/pydoc -- code self-documentation in html,
+ can be created with 'make pydoc'
+
+tests/ -- python modules for testing roverlay
+examples/ -- code examples
= Usage instructions =
./roverlay.py [option(s)] [command(s)]
-Please see ./roverlay.py --help for all options and/or doc/rst, doc/html for
+Please see ./roverlay.py --help for all options and doc/rst or doc/html for
the full usage documentation, including software/hardware requirements.
+Note that roverlay.py is a symlink to bin/roverlay, which is a bash script.
+The python interpreter can be set with the PYTHON environment variable.
+
= Installation =
-See doc/rst and/or doc/html for installation instructions.
+See doc/rst or doc/html for installation instructions. Configuration can be
+automated by using roverlay-setup or roverlay-setup-interactive.
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-18 14:00 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-18 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 7eb9c2a37ff93cfec565d034481c79dc21323a79
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 18 13:59:05 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 18 13:59:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7eb9c2a3
Makefile: fix generate-config
---
Makefile | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 1c18f2a..4f2c60e 100644
--- a/Makefile
+++ b/Makefile
@@ -98,19 +98,22 @@ generate-manifest: $(MANIFEST_GEN)
mv -- $(MANIFEST_TMP) $(MANIFEST)
generate-config: $(RV_SETUP)
- ROVERLAY_INSTALLED=1 $(RV_SETUP) mkconfig \
+ ROVERLAY_INSTALLED=1 $(RV_SETUP) \
-O config/R-overlay.conf.install \
-D $(DATADIR)/roverlay \
--conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \
- -A $(CONFDIR)/roverlay/files
+ -A $(CONFDIR)/roverlay/files \
+ mkconfig
- ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \
+ ROVERLAY_INSTALLED=0 $(RV_SETUP) \
-O R-overlay.conf --prjroot-relpath \
- -D files --conf-root config --my-conf-root config -A files -W workdir
+ -D files --conf-root config --my-conf-root config -A files -W workdir \
+ mkconfig
- ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \
- -O R-overlay.conf.local \
- -D files --conf-root config --my-conf-root config -A files -W workdir
+ ROVERLAY_INSTALLED=0 $(RV_SETUP) \
+ -O R-overlay.conf.local.new \
+ -D files --conf-root config --my-conf-root config -A files -W workdir \
+ mkconfig
generate-files: generate-config generate-doc generate-manifest
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-18 14:00 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-18 14:00 UTC (permalink / raw
To: gentoo-commits
commit: afd79849bcbe83f911480bb9cb608af7bb1a937b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 18 13:59:34 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 18 13:59:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=afd79849
gitignore: add '*.local.*'
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 0f7de68..7fb324d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
# local files
/local
*.local
+*.local.*
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-16 8:56 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-16 8:56 UTC (permalink / raw
To: gentoo-commits
commit: ae48ffdd5c7265ae22af46c8d4b0c6d4bfc9c943
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Sep 16 08:54:24 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Sep 16 08:54:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ae48ffdd
roverlay-9999.ebuild: fix (R)DEPEND
typo: swap RDEPEND<->DEPEND
Remove setuptools from RDEPEND as "eggsecutables" are no longer used.
---
roverlay-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 0723355..a804877 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -26,10 +26,10 @@ KEYWORDS=""
IUSE="bzip2 +prebuilt-documentation"
-_CDEPEND="dev-python/setuptools"
-RDEPEND="${_CDEPEND?}
+DEPEND="
+ dev-python/setuptools
prebuilt-documentation? ( >=dev-python/docutils-0.9 )"
-DEPEND="${_CDEPEND?}
+RDEPEND="
sys-apps/portage
virtual/python-argparse
dev-python/mako[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-13 15:10 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-13 15:10 UTC (permalink / raw
To: gentoo-commits
commit: e91418db7c6b3b4f312f696437d1d440c6f083b4
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Sep 13 15:06:45 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Sep 13 15:06:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e91418db
Makefile: 'generate-config' target
This creates config/R-overlay.conf, R-overlay.conf and R-overlay.conf.local. The
*.local file is the same as the non-local one, but uses absolute filesystem
paths.
---
Makefile | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e420346..1c18f2a 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ MANIFEST_TMP := $(MANIFEST).tmp
MANIFEST_GEN := ./bin/build/create_manifest.sh
+RV_SETUP := ./bin/roverlay-setup
+
SETUP_PY := ./setup.py
PKG_DISTDIR := ./release
@@ -39,7 +41,7 @@ SELFDOC := $(SRC_DOCDIR)/pydoc
docs pydoc htmldoc \
check test \
generate-files \
- generate-doc generate-manifest \
+ generate-config generate-doc generate-manifest \
release dist \
compress-config \
install-all install \
@@ -95,8 +97,23 @@ generate-manifest: $(MANIFEST_GEN)
$(MANIFEST_GEN) > $(MANIFEST_TMP)
mv -- $(MANIFEST_TMP) $(MANIFEST)
-generate-files: generate-doc generate-manifest
+generate-config: $(RV_SETUP)
+ ROVERLAY_INSTALLED=1 $(RV_SETUP) mkconfig \
+ -O config/R-overlay.conf.install \
+ -D $(DATADIR)/roverlay \
+ --conf-root $(CONFDIR)/roverlay --my-conf-root $(CONFDIR)/roverlay \
+ -A $(CONFDIR)/roverlay/files
+
+ ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \
+ -O R-overlay.conf --prjroot-relpath \
+ -D files --conf-root config --my-conf-root config -A files -W workdir
+
+ ROVERLAY_INSTALLED=0 $(RV_SETUP) mkconfig \
+ -O R-overlay.conf.local \
+ -D files --conf-root config --my-conf-root config -A files -W workdir
+
+generate-files: generate-config generate-doc generate-manifest
# creates a src tarball (.tar.bz2)
# !!! does not include config files
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-12 16:36 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-12 16:36 UTC (permalink / raw
To: gentoo-commits
commit: ac88b7aaee90d8f754ebd2d6a413194e6c4518b8
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Sep 12 08:32:43 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Sep 12 08:32:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ac88b7aa
roverlay-9999.ebuild: install examples/
---
roverlay-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 853853c..0723355 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -12,6 +12,7 @@ EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
DOCS=()
HTML_DOCS=( doc/html/. )
+EXAMPLES=( examples/. )
inherit user distutils-r1 git-r3 bash-completion-r1
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-12 8:27 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-12 8:27 UTC (permalink / raw
To: gentoo-commits
commit: 317650697c3d0bc4cba1ee6deb804e3978513660
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Sep 12 08:25:24 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Sep 12 08:25:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=31765069
fix installation of bash completion file(s)
---
roverlay-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index dd6b088..853853c 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
DOCS=()
HTML_DOCS=( doc/html/. )
-inherit user distutils-r1 git-r3
+inherit user distutils-r1 git-r3 bash-completion-r1
DESCRIPTION="Automatically generated overlay of R packages"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
@@ -57,7 +57,7 @@ python_install_all() {
emake BUILDDIR="${S}/compressed" DESTDIR="${D}" \
install-data $(usex bzip2 install-config{-compressed,})
- newbashcomp "${S}/files7misc/${PN}.bashcomp" "${PN}"
+ newbashcomp "${S}/files/misc/${PN}.bashcomp" "${PN}"
}
## TODO (when roverlay-setup is done)
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-12 8:27 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-12 8:27 UTC (permalink / raw
To: gentoo-commits
commit: e2b5b5d9587a15dcdcd7b9e1c48c505847d6e324
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Sep 12 08:25:08 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Sep 12 08:25:08 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e2b5b5d9
remove main.py symlink
---
main.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/main.py b/main.py
deleted file mode 120000
index 34b2545..0000000
--- a/main.py
+++ /dev/null
@@ -1 +0,0 @@
-roverlay.py
\ No newline at end of file
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-11 14:59 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-11 14:59 UTC (permalink / raw
To: gentoo-commits
commit: fd50a559a1f04d6d8bbb27bee6f3fe6c23622624
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 11 14:59:35 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 11 14:59:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fd50a559
setup.py: use scripts from bin/install/
---
setup.py | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
index 184360a..9c9772e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,13 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
+import os.path
+import glob
+
from setuptools import setup, find_packages
+SCRIPT_DIR = os.path.join ( "bin", "install" )
+
setup (
name = 'R_Overlay',
version = '0.2.5',
@@ -11,14 +16,7 @@ setup (
author_email = 'dywi@mailerd.de',
license = 'GPLv2+',
url = 'http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary',
- entry_points = {
- 'console_scripts': [
- 'roverlay = roverlay.defaultscript:main_installed',
- 'roverlay-sh = roverlay.defaultscript:run_shell_main_installed',
- #'roverlay-exec = roverlay.defaultscript:run_script_main_installed',
- 'roverlay-status = roverlay.status:main_installed',
- ]
- },
+ scripts = glob.glob ( SCRIPT_DIR + os.path.sep + "?*" ),
packages = find_packages ( exclude=[ 'tests', 'tests.*' ] ),
classifiers = [
#'Development Status :: 3 - Alpha',
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-11 14:59 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-11 14:59 UTC (permalink / raw
To: gentoo-commits
commit: ee3c65903dd063866a71c9a4a52f61e1d76825f0
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 11 14:53:04 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 11 14:53:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ee3c6590
Makefile: fix hookrc file location
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 8093c93..e420346 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ install-config-common:
install -m 0755 -d $(CONFDIR)/roverlay
install -m 0644 -t $(CONFDIR)/roverlay \
config/description_fields.conf config/repo.list \
- config/package_rules hookrc
+ config/package_rules config/hookrc
install -m 0644 -T \
config/R-overlay.conf.install $(CONFDIR)/roverlay/R-overlay.conf
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-11 10:27 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-11 10:27 UTC (permalink / raw
To: gentoo-commits
commit: a2f439d960bffe0d8b92e1bbd694a7a519b0f9ec
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 11 10:22:56 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 11 10:24:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a2f439d9
Makefile: install config/{package_rules,hookrc}
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 8615032..11311b4 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,8 @@ install-pymodules: ./setup.py
install-config-common:
install -m 0755 -d $(CONFDIR)/roverlay
install -m 0644 -t $(CONFDIR)/roverlay \
- config/description_fields.conf config/repo.list
+ config/description_fields.conf config/repo.list \
+ config/package_rules hookrc
install -m 0644 -T \
config/R-overlay.conf.install $(CONFDIR)/roverlay/R-overlay.conf
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-11 10:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-11 10:19 UTC (permalink / raw
To: gentoo-commits
commit: c965acd69042387a64a6564ee76ad960f555d3da
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 11 10:17:16 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 11 10:17:16 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c965acd6
update roverlay-9999.ebuild
* uses git-r3, distutils-r1
* should have proper dependencies now
* pkg_config() will be restored once roverlay-setup is done
---
roverlay-9999.ebuild | 283 +++++++--------------------------------------------
1 file changed, 36 insertions(+), 247 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 2d5daee..dd6b088 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -2,276 +2,65 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-# python < 2.7 is not supported
-PYTHON_COMPAT="python2_7 python3_2"
-PYTHON_USE="ssl"
-
-inherit base python-distutils-ng git-2 user bash-completion-r1
+# dev-python/mako doesn't support python3.3, currently
+PYTHON_COMPAT=( python{2_7,3_2} )
+PYTHON_REQ_USE="ssl,threads(+),readline(+)"
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
-[[ "${PV}" != "99999"* ]] || EGIT_BRANCH=gsoc13/next
-DESCRIPTION="Automatically generated overlay of R packages (SoC2012)"
+DOCS=()
+HTML_DOCS=( doc/html/. )
+
+inherit user distutils-r1 git-r3
+
+DESCRIPTION="Automatically generated overlay of R packages"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
SRC_URI=""
LICENSE="GPL-2+"
SLOT="0"
-IUSE="bash-completion bzip2 +prebuilt-documentation"
-
KEYWORDS=""
+IUSE="bzip2 +prebuilt-documentation"
-_CDEPEND="
- dev-python/setuptools
- python_targets_python2_7? ( dev-python/futures[python_targets_python2_7] )
-"
-DEPEND="${_CDEPEND}
- !prebuilt-documentation? ( >=dev-python/docutils-0.9 )
-"
-RDEPEND="${_CDEPEND}
+
+_CDEPEND="dev-python/setuptools"
+RDEPEND="${_CDEPEND?}
+ prebuilt-documentation? ( >=dev-python/docutils-0.9 )"
+DEPEND="${_CDEPEND?}
sys-apps/portage
virtual/python-argparse
- net-analyzer/rrdtool
- dev-python/mako
-"
+ dev-python/mako[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep dev-python/futures[$(python_gen_usedep python2_7)] python2_7)"
+
+
+pkg_setup() {
+ enewgroup roverlay
+}
python_prepare_all() {
- base_src_prepare
+ distutils-r1_python_prepare_all
if use bzip2; then
- einfo "USE=bzip2: Compressing dependency rule files"
- emake BUILDDIR="${S}/tmp" compress-config
+ einfo "USE=bzip2: Compressing dependency rules and license map"
+ emake BUILDDIR="${S}/compressed" compress-config
fi
}
-src_compile() {
- python-distutils-ng_src_compile
-
- if ! use prebuilt-documentation; then
- emake htmldoc
- fi
+python_compile_all() {
+ use prebuilt-documentation || emake htmldoc
}
python_install_all() {
- # hooks etc. into /usr/share (architecture-independent data)
- emake BUILDDIR="${S}/tmp" DESTDIR="${D}" \
- install-data $(usex bzip2 install-config{-compressed,})
-
- dohtml doc/html/*
+ distutils-r1_python_install_all
- if use bash-completion; then
- newbashcomp "${S}/files/misc/${PN}.bashcomp" "${PN}"
- fi
+ emake BUILDDIR="${S}/compressed" DESTDIR="${D}" \
+ install-data $(usex bzip2 install-config{-compressed,})
- # roverlay expects these directories to exist
- # (due to the default config file)
- keepdir /etc/${PN}/{files,package-rules.d}
+ newbashcomp "${S}/files7misc/${PN}.bashcomp" "${PN}"
}
-pkg_setup() {
- enewgroup roverlay
-}
-
-pkg_config() {
- ## func
- get_user_dir() {
- if [[ -d "${1}" ]]; then
- return 0
- else
- mkdir -m 0750 "${1}" && \
- chown -h "${roverlay_user}:${roverlay_group}" "${1}" || \
- die "failed to create '${1}'."
- fi
- }
- # enable_hook ( hook_script_name, hook_name, **hook_destdir, **data_root )
- enable_hook() {
- local hook_src="${data_root?}/hooks/${1%.sh}.sh"
- local hook_dest="${hook_destdir?}/${2%.sh}.sh"
-
- if [[ ! -f "${hook_src}" ]]; then
- die "hook script '${hook_src}' does not exist."
- elif [[ -L "${hook_dest}" ]]; then
- if [[ "$(readlink -f ${hook_dest})" == "${hook_src}" ]]; then
- einfo "skipping ${2%.sh} - already set up"
- else
- ewarn "skipping ${2%.sh} - link to another script"
- fi
- elif [[ -e "${hook_dest}" ]]; then
- ewarn "skipping hook ${2%.sh} - exists, but not a link"
- else
- ebegin "Adding hook ${1%.sh} as ${2%.sh}"
- ln -sT "${hook_src}" "${hook_dest}" && \
- chown -Ph "${roverlay_user}:${roverlay_group}" "${hook_dest}"
- eend $? || die "failed to add hook ${2%.sh}"
- fi
- }
-
- ## vars
- local DEFAULT_CONF_ROOT="${ROOT}etc/${PN}"
-
- local roverlay_user="roverlay"
- local roverlay_group="roverlay"
- #local user_is_root
- local want_conf_import
-
- local data_root="${ROOT}usr/share/${PN}"
- local conf_root
- local work_root
-
- local want_default_hooks=y
-
- local input
-
- ## get user input
- einfo "Enter user/uid that will run ${PN} (user has to exist!) ['${roverlay_user}']:"
- # input= not strictly needed
- input=; read input
- [[ -z "${input}" ]] || roverlay_user="${input}"
-
- egetent passwd "${roverlay_user}" 1>/dev/null || \
- die "no such user/uid: ${roverlay_user}"
-
- case "${roverlay_user}" in
- '0'|'root')
- #user_is_root=y
-
- work_root="${ROOT}var/${PN}"
- conf_root="${DEFAULT_CONF_ROOT}"
- config_file="${conf_root}/R-overlay.conf"
-
- einfo "config root is ${conf_root}"
- want_conf_import=n
- ;;
- *)
- #user_is_root=n
-
- # get user config location
- input="$(egethome ${roverlay_user})"
- [[ -d "${input}" ]] || die "user has no home directory: ${input}"
-
- work_root="${input}/${PN}"
- conf_root="${work_root}/config"
- config_file="${work_root}/R-overlay.conf"
-
- if [[ ! -e "${conf_root}" ]]; then
- einfo "config root is ${conf_root} (will be created)"
- want_conf_import=y
- else
- einfo "config root is ${conf_root} (already exists)"
- want_conf_import=n
- fi
-
- einfo "Import default config (${DEFAULT_CONF_ROOT})? (y/n) ['${want_conf_import}']"
- input=; read input
- case "${input}" in
- '') true ;;
- 'y'|'n') want_conf_import="${input}" ;;
- *) die "answer '${input}' not understood." ;;
- esac
- ;;
- esac
-
- if [[ -e "${config_file}" ]]; then
- einfo "This will overwrite ${config_file}!"
- echo
- fi
-
- einfo "Enable default overlay creation hooks (git history and metadata cache)? (y/n) ['${want_default_hooks}']"
- input=; read input
- case "${input}" in
- '') true ;;
- 'y'|'n') want_default_hooks="${input}" ;;
- *) die "answer '${input}' not understood." ;;
- esac
-
- einfo "Enter the directory for 'work' data (overlay, distfiles, mirror) ['${work_root}']:"
-
- input=; read input
- [[ -z "${input}" ]] || work_root="${input}"
-
- # setting ADDITIONS_DIR here "breaks" hook activation
- einfo "Enter additional config options (VAR=VALUE; use with care) [optional]:"
- input=; read input
-
- ## print what would be done
- local noconf="(not configurable)"
- echo
- einfo "Configuration:"
- einfo "- user/uid : ${roverlay_user}"
- einfo "- group/gid : ${roverlay_group} ${noconf}"
- einfo "- work root : ${work_root}"
- einfo "- data root : ${data_root} ${noconf}"
- einfo "- config root : ${conf_root}"
- einfo "- import config : ${want_conf_import}"
- einfo "- enable default hooks : ${want_default_hooks}"
- einfo "- additional options : ${input:-<none>}"
- einfo
- einfo "Press Enter to continue..."
- read
-
- ## do it
-
- # temporary config file - will be moved to its final location when done
- ebegin "Creating temporary config file"
- /usr/bin/roverlay-mkconfig -O "${T}/${PF}.config" \
- -W "${work_root}" -D "${data_root}" -C "${conf_root}" -- ${input-}
- eend $? || die
-
- # import config
- if [[ "${want_conf_import}" == "y" ]]; then
- [[ -d "${conf_root}" ]] || mkdir -p "${conf_root}" || \
- die "cannot create ${conf_root}"
-
- ebegin "Importing default config (${DEFAULT_CONF_ROOT})"
- cp -dRu --preserve=mode,timestamps \
- "${DEFAULT_CONF_ROOT}"/* "${conf_root}"/ && \
- chown -Rh --from="root:root" \
- "${roverlay_user}:${roverlay_group}" "${conf_root}"
- eend $? || die
- fi
-
- # run "roverlay setupdirs"
- ebegin "Creating directories"
- /usr/bin/roverlay --config "${T}/${PF}.config" \
- --target-uid ${roverlay_user} --target-gid ${roverlay_group} setupdirs
- eend $? || die
-
- # move config file
- ebegin "Copying new config file to ${config_file}"
- cp --preserve=mode,timestamps "${T}/${PF}.config" "${config_file}" && \
- chown "${roverlay_user}:${roverlay_group}" "${config_file}"
- eend $? || die
-
- # adjust permissions for $work_root
- if [[ ! -L "${work_root}" ]]; then
- # ^ chmod doesn't work nicely for symlinks
-
- ebegin "Adjusting permissions for ${work_root}"
- chmod 0750 "${work_root}" && \
- chown -h --from="root:root" \
- "${roverlay_user}:${roverlay_group}" "${work_root}"
- eend $? || die
- fi
-
- # enable hooks
- if [[ "${want_default_hooks}" ]]; then
- einfo "Activating default hooks"
- if [[ ! -d "${conf_root}/files" ]]; then
- ewarn "Skipping hook activation: ADDITIONS_DIR not in config root."
- else
- local hook_destdir="${conf_root}/files/hooks/overlay_success"
-
- # non-recursive
- get_user_dir "${hook_destdir%/*}"
- get_user_dir "${hook_destdir}"
-
- enable_hook {,50-}create-metadata-cache
- enable_hook {,80-}git-commit-overlay
- fi
- fi
-
- echo
- einfo "Configuration for user '${roverlay_user}' is complete."
- einfo "You can run '${PN} --print-config' (as user) to verify it."
-}
+## TODO (when roverlay-setup is done)
+##pkg_config() {
+## :
+##}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-11 10:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-11 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 57b050c3957f63be263a084b5cfa2e578c0c946b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 11 10:16:19 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 11 10:16:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=57b050c3
Makefile: recursively compress dep rule files
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4aa6bcc..8615032 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ dist: distclean release
compress-config: $(BUILDDIR)
@install -d $(BUILDDIR)/config
cp -vLr -p --no-preserve=ownership config/simple-deprules.d $(BUILDDIR)/config/
- bzip2 $(BUILDDIR)/config/simple-deprules.d/*
+ find $(BUILDDIR)/config/simple-deprules.d/ -type f -print0 | xargs -0 -n 5 --verbose bzip2
bzip2 -k -c config/license.map > $(BUILDDIR)/config/license.map
install-roverlay: ./roverlay.py
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-09-04 15:36 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-09-04 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 26c0c7a2a482463b4b03b327566e830f5cf50eac
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Sep 4 15:35:47 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Sep 4 15:35:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=26c0c7a2
Makefile: fix _pyclean target
delete both .pyc and .pyo files
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c77b5c8..4aa6bcc 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ clean-log:
rm -rf -- $(LOGDIR)
_pyclean:
- find . -name "*.pyc" -or -name "*.pyo" -delete
+ find . \( -name "*.pyc" -or -name "*.pyo" \) -delete -print
_pydoc_clean:
rm -f -- $(SELFDOC)/*.html
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-29 15:22 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-29 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 2ef4a05f4935f6e38cf83d4dd312d4285ef8a840
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Aug 29 15:17:03 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Aug 29 15:17:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2ef4a05f
add pylintrc file
default pylintrc file (pylint --generate-rcfile) with a few adjustments:
* notes+=COULDFIX
* use of three spaces for indentation, not 4
* setup functions added to defining-attr-methods
---
pylintrc | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 267 insertions(+)
diff --git a/pylintrc b/pylintrc
new file mode 100644
index 0000000..155b0e8
--- /dev/null
+++ b/pylintrc
@@ -0,0 +1,267 @@
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Profiled execution.
+profile=no
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=.git,local
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html. You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Include message's id in output
+include-ids=yes
+
+# Include symbolic ids of messages in output
+symbols=no
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (RP0004).
+comment=no
+
+
+[MESSAGES CONTROL]
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time. See also the "--disable" option for examples.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+#
+# W0141: use of builtin functions like filter/map
+# W0142: Used * or ** magic
+disable=W0141,W0142
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO,COULDFIX
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string=' '
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=_|dummy|DONT_CARE
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed. Python regular
+# expressions are accepted.
+generated-members=REQUEST,acl_users,aq_parent
+
+
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter,apply,input
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{2,30}$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Regular expression which should only match functions or classes name which do
+# not require a docstring
+no-docstring-rgx=__.*__
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branchs=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=12
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp,setup,_setup,do_setup,_do_setup,reset
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-16 10:58 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-16 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 181c4d3cf957ef70e8a3936848f1e943270d6206
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 16 10:58:04 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 16 10:58:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=181c4d3c
Makefile: fix typo (make->mako)
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 743df6c..c77b5c8 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ install-config: install-config-common
install-data:
install -m 0755 -d \
$(DATADIR)/roverlay/shlib $(DATADIR)/roverlay/hooks \
- $(DATADIR)/roverlay/eclass $(DATADIR)/roverlay/make_templates
+ $(DATADIR)/roverlay/eclass $(DATADIR)/roverlay/mako_templates
install -m 0644 -t $(DATADIR)/roverlay/hooks files/hooks/*.sh
install -m 0644 -t $(DATADIR)/roverlay/shlib files/shlib/*.sh
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-16 10:57 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-16 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 0ba537f7fed61e155e9809f3d7e6fb7e533c0933
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 16 10:56:36 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 16 10:56:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=0ba537f7
Makefile: install mako templates
---
Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4ecab25..743df6c 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ install-config: install-config-common
install-data:
install -m 0755 -d \
$(DATADIR)/roverlay/shlib $(DATADIR)/roverlay/hooks \
- $(DATADIR)/roverlay/eclass
+ $(DATADIR)/roverlay/eclass $(DATADIR)/roverlay/make_templates
install -m 0644 -t $(DATADIR)/roverlay/hooks files/hooks/*.sh
install -m 0644 -t $(DATADIR)/roverlay/shlib files/shlib/*.sh
@@ -150,6 +150,9 @@ install-data:
install -m 0644 -t $(DATADIR)/roverlay/eclass files/eclass/*.eclass
+ install -m 0644 -t $(DATADIR)/roverlay/mako_templates \
+ files/mako_templates/*.*
+
install: install-pymodules install-roverlay
install-all: install
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-16 10:53 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-16 10:53 UTC (permalink / raw
To: gentoo-commits
commit: c549912c7479954f504f6e614b6c5fb1468c50cf
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 16 10:53:10 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 16 10:53:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c549912c
fix 'roverlay-status' entry in setup.py
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 6fd56c4..90f52ff 100755
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ setup (
'roverlay-sh = roverlay.defaultscript:run_shell_main_installed',
#'roverlay-exec = roverlay.defaultscript:run_script_main_installed',
'roverlay-mkconfig = roverlay.config.mkconfig:make_config',
- 'roverlay-status = roverlay.status.main_installed',
+ 'roverlay-status = roverlay.status:main_installed',
]
},
packages = find_packages ( exclude=[ 'tests', 'tests.*' ] ),
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-16 10:43 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-16 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 842899516e4e896b7a5cf239f44934706f45eb03
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 16 10:42:11 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 16 10:42:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=84289951
roverlay-9999.ebuild: add dev-python/mako to RDEPEND
---
roverlay-9999.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index ffa003a..2d5daee 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -32,8 +32,9 @@ DEPEND="${_CDEPEND}
"
RDEPEND="${_CDEPEND}
sys-apps/portage
- net-analyzer/rrdtool
virtual/python-argparse
+ net-analyzer/rrdtool
+ dev-python/mako
"
python_prepare_all() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-16 10:43 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-16 10:43 UTC (permalink / raw
To: gentoo-commits
commit: dca7846a4e6cf14a6efac01b46338f5fab5489a1
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 16 10:31:02 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 16 10:31:02 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=dca7846a
setup.py: add roverlay-status script
---
setup.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup.py b/setup.py
index 8efc3cd..6fd56c4 100755
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@ setup (
'roverlay-sh = roverlay.defaultscript:run_shell_main_installed',
#'roverlay-exec = roverlay.defaultscript:run_script_main_installed',
'roverlay-mkconfig = roverlay.config.mkconfig:make_config',
+ 'roverlay-status = roverlay.status.main_installed',
]
},
packages = find_packages ( exclude=[ 'tests', 'tests.*' ] ),
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-14 14:56 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-14 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 7ad21aef14fa7c54a4adac2e50181b92a9b9ec74
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug 14 14:55:36 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug 14 14:55:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7ad21aef
roverlay-status.py: run roverlay.status.main()
---
roverlay-status.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/roverlay-status.py b/roverlay-status.py
new file mode 100755
index 0000000..f49df1d
--- /dev/null
+++ b/roverlay-status.py
@@ -0,0 +1,6 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+import roverlay.status
+
+if __name__ == '__main__':
+ roverlay.status.main ( False )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-14 14:56 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-14 14:56 UTC (permalink / raw
To: gentoo-commits
commit: b22152e0cdd1d4dfdcdedb38f07c3d6df159b974
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug 13 12:10:43 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug 13 12:10:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b22152e0
R-overlay.conf: add STATS_DB, TEMPLATE_ROOT
---
R-overlay.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/R-overlay.conf b/R-overlay.conf
index d6bdc3d..da8da1f 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -12,6 +12,9 @@ DISTFILES = distfiles-root
OVERLAY_DIR = workdir/overlay
#TMPDIR = workdir/tmp
+STATS_DB = workdir/cache/stats.rrd
+TEMPLATE_ROOT = files/mako_templates
+
LICENSE_MAP = config/license.map
DISTDIR = workdir/distroot
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-12 8:18 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-12 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 3c83d7e4bc8f600c6d3547d227be7529ccb7625f
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Aug 12 08:17:26 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Aug 12 08:17:26 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=3c83d7e4
roverlay-9999.ebuild: add net-analyzer/rrdtool
rrdtool is required for persistent stats collection (-> RDEPEND)
---
roverlay-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index ae573e9..ffa003a 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="${_CDEPEND}
"
RDEPEND="${_CDEPEND}
sys-apps/portage
+ net-analyzer/rrdtool
virtual/python-argparse
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-09 10:18 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-09 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 96473aff9e88b49eb6f705d93b0dcf17ead317b5
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 9 10:15:30 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 9 10:15:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=96473aff
update roverlay-9999.ebuild
* dropped python3_1 target (masked in the main tree)
* added dev-python/futures dependency (concurrent.futures for python < 3.2)
* install bash completion file(s)
---
roverlay-9999.ebuild | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index e354d86..ae573e9 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -5,10 +5,10 @@
EAPI=4
# python < 2.7 is not supported
-PYTHON_COMPAT="python2_7 python3_1 python3_2"
+PYTHON_COMPAT="python2_7 python3_2"
PYTHON_USE="ssl"
-inherit base python-distutils-ng git-2 user
+inherit base python-distutils-ng git-2 user bash-completion-r1
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
[[ "${PV}" != "99999"* ]] || EGIT_BRANCH=gsoc13/next
@@ -19,11 +19,14 @@ SRC_URI=""
LICENSE="GPL-2+"
SLOT="0"
-IUSE="-bzip2 +prebuilt-documentation"
+IUSE="bash-completion bzip2 +prebuilt-documentation"
KEYWORDS=""
-_CDEPEND="dev-python/setuptools"
+_CDEPEND="
+ dev-python/setuptools
+ python_targets_python2_7? ( dev-python/futures[python_targets_python2_7] )
+"
DEPEND="${_CDEPEND}
!prebuilt-documentation? ( >=dev-python/docutils-0.9 )
"
@@ -55,6 +58,10 @@ python_install_all() {
dohtml doc/html/*
+ if use bash-completion; then
+ newbashcomp "${S}/files/misc/${PN}.bashcomp" "${PN}"
+ fi
+
# roverlay expects these directories to exist
# (due to the default config file)
keepdir /etc/${PN}/{files,package-rules.d}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-05 11:44 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-05 11:44 UTC (permalink / raw
To: gentoo-commits
commit: c086bfa37be81f77c9bb168f41106147e8cdb5f2
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Aug 5 08:22:15 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Aug 5 08:22:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c086bfa3
Makefile: fix pydoc target
---
Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 0713e30..4ecab25 100644
--- a/Makefile
+++ b/Makefile
@@ -78,10 +78,8 @@ $(BUILDDIR):
# generates selfdocs (using pydoc) in $(SELFDOC)/
$(SELFDOC):
- # pydoc target is broken currently..
- @false
- @install -d $(SELFDOC)/roverlay
- @ln -s ../../roverlay $(SELFDOC)/roverlay
+ -mkdir $(SELFDOC)
+ ln -snfT -- ../../roverlay $(SELFDOC)/roverlay
$(PYDOC_SH) $(SELFDOC)
# alias to $(SELFDOC)
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-08-01 12:44 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-08-01 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 80f4255bf1429919426357f544a2006991a63f90
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Aug 1 12:32:34 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Aug 1 12:32:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=80f4255b
update TODO
---
TODO | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/TODO b/TODO
index 5db038f..8776458 100644
--- a/TODO
+++ b/TODO
@@ -10,4 +10,4 @@ TODO list, most priority at the top.
- ?
[x] Better way to deal with R suggestions
[x] Handle slots in fuzzy dependency resolver
-[ ] readline in depres_console
+[x] readline in depres_console
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-07-25 13:25 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-25 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 9277fbf7d68d1f80230e0de466824f905a03c73d
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 25 13:23:00 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 25 13:23:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9277fbf7
remove old description_fields.conf symlink
---
description_fields.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/description_fields.conf b/description_fields.conf
deleted file mode 120000
index 514f8d7..0000000
--- a/description_fields.conf
+++ /dev/null
@@ -1 +0,0 @@
-config/description_fields.conf
\ No newline at end of file
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: /
@ 2013-07-23 18:34 André Erdmann
2013-07-23 18:34 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
0 siblings, 1 reply; 146+ messages in thread
From: André Erdmann @ 2013-07-23 18:34 UTC (permalink / raw
To: gentoo-commits
commit: e4e354cf31075c84ad76cda9a8899df3413b8db7
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 23 18:32:41 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 23 18:33:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e4e354cf
update R-overlay.conf
added entry for LICENSE_MAP (+SHELL, HOOK_RESTRICT).
---
R-overlay.conf | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index ce82822..d6bdc3d 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -1,7 +1,10 @@
# R overlay -- config file for testing/running without installation
+SHELL = /bin/sh
+
ADDITIONS_DIR = files
HOOK = files/hooks/mux.sh
+HOOK_RESTRICT = "* -user"
ECLASS = files/eclass/R-packages.eclass
CACHEDIR = workdir/cache
@@ -9,11 +12,13 @@ DISTFILES = distfiles-root
OVERLAY_DIR = workdir/overlay
#TMPDIR = workdir/tmp
+LICENSE_MAP = config/license.map
+
DISTDIR = workdir/distroot
# try hard links first, then fall back to symbolic ones
DISTDIR_STRATEGY = "hardlink symlink"
-# distdir verfication is normally not needed
+# distdir verification is normally not needed
DISTDIR_VERIFY = no
# write description data from R packages to a directory
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
2013-07-23 18:34 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
@ 2013-07-23 18:34 ` André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-23 18:34 UTC (permalink / raw
To: gentoo-commits
commit: e4e354cf31075c84ad76cda9a8899df3413b8db7
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 23 18:32:41 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 23 18:33:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e4e354cf
update R-overlay.conf
added entry for LICENSE_MAP (+SHELL, HOOK_RESTRICT).
---
R-overlay.conf | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index ce82822..d6bdc3d 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -1,7 +1,10 @@
# R overlay -- config file for testing/running without installation
+SHELL = /bin/sh
+
ADDITIONS_DIR = files
HOOK = files/hooks/mux.sh
+HOOK_RESTRICT = "* -user"
ECLASS = files/eclass/R-packages.eclass
CACHEDIR = workdir/cache
@@ -9,11 +12,13 @@ DISTFILES = distfiles-root
OVERLAY_DIR = workdir/overlay
#TMPDIR = workdir/tmp
+LICENSE_MAP = config/license.map
+
DISTDIR = workdir/distroot
# try hard links first, then fall back to symbolic ones
DISTDIR_STRATEGY = "hardlink symlink"
-# distdir verfication is normally not needed
+# distdir verification is normally not needed
DISTDIR_VERIFY = no
# write description data from R packages to a directory
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: /
@ 2013-07-23 14:57 André Erdmann
2013-07-23 14:57 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
0 siblings, 1 reply; 146+ messages in thread
From: André Erdmann @ 2013-07-23 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 4f05f99377615d7ac0bb31019ab865b7f298c6f1
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 23 14:06:38 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 23 14:06:38 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=4f05f993
roverlay-9999.ebuild: set EGIT_BRANCH
set EGIT_BRANCH to gsoc13/next if PV starts with 99999
---
roverlay-9999.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index bc4a80f..e354d86 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -11,7 +11,7 @@ PYTHON_USE="ssl"
inherit base python-distutils-ng git-2 user
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
-#EGIT_BRANCH='gsoc13/next'
+[[ "${PV}" != "99999"* ]] || EGIT_BRANCH=gsoc13/next
DESCRIPTION="Automatically generated overlay of R packages (SoC2012)"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
@@ -49,8 +49,6 @@ src_compile() {
}
python_install_all() {
- #newbin roverlay.py roverlay
-
# hooks etc. into /usr/share (architecture-independent data)
emake BUILDDIR="${S}/tmp" DESTDIR="${D}" \
install-data $(usex bzip2 install-config{-compressed,})
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: /
@ 2013-07-12 17:11 André Erdmann
2013-07-12 17:11 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
0 siblings, 1 reply; 146+ messages in thread
From: André Erdmann @ 2013-07-12 17:11 UTC (permalink / raw
To: gentoo-commits
commit: d742b562c460c6453784f9309f8f454dcbc22caf
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 12 17:10:32 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 12 17:10:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d742b562
ebuild: enable default hooks, chown $work_root
---
roverlay-9999.ebuild | 94 ++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 83 insertions(+), 11 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 0e21409..bc4a80f 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -67,6 +67,39 @@ pkg_setup() {
}
pkg_config() {
+ ## func
+ get_user_dir() {
+ if [[ -d "${1}" ]]; then
+ return 0
+ else
+ mkdir -m 0750 "${1}" && \
+ chown -h "${roverlay_user}:${roverlay_group}" "${1}" || \
+ die "failed to create '${1}'."
+ fi
+ }
+ # enable_hook ( hook_script_name, hook_name, **hook_destdir, **data_root )
+ enable_hook() {
+ local hook_src="${data_root?}/hooks/${1%.sh}.sh"
+ local hook_dest="${hook_destdir?}/${2%.sh}.sh"
+
+ if [[ ! -f "${hook_src}" ]]; then
+ die "hook script '${hook_src}' does not exist."
+ elif [[ -L "${hook_dest}" ]]; then
+ if [[ "$(readlink -f ${hook_dest})" == "${hook_src}" ]]; then
+ einfo "skipping ${2%.sh} - already set up"
+ else
+ ewarn "skipping ${2%.sh} - link to another script"
+ fi
+ elif [[ -e "${hook_dest}" ]]; then
+ ewarn "skipping hook ${2%.sh} - exists, but not a link"
+ else
+ ebegin "Adding hook ${1%.sh} as ${2%.sh}"
+ ln -sT "${hook_src}" "${hook_dest}" && \
+ chown -Ph "${roverlay_user}:${roverlay_group}" "${hook_dest}"
+ eend $? || die "failed to add hook ${2%.sh}"
+ fi
+ }
+
## vars
local DEFAULT_CONF_ROOT="${ROOT}etc/${PN}"
@@ -79,6 +112,8 @@ pkg_config() {
local conf_root
local work_root
+ local want_default_hooks=y
+
local input
## get user input
@@ -123,15 +158,9 @@ pkg_config() {
einfo "Import default config (${DEFAULT_CONF_ROOT})? (y/n) ['${want_conf_import}']"
input=; read input
case "${input}" in
- '')
- true
- ;;
- 'y'|'n')
- want_conf_import="${input}"
- ;;
- *)
- die "answer '${input}' not understood."
- ;;
+ '') true ;;
+ 'y'|'n') want_conf_import="${input}" ;;
+ *) die "answer '${input}' not understood." ;;
esac
;;
esac
@@ -141,12 +170,21 @@ pkg_config() {
echo
fi
+ einfo "Enable default overlay creation hooks (git history and metadata cache)? (y/n) ['${want_default_hooks}']"
+ input=; read input
+ case "${input}" in
+ '') true ;;
+ 'y'|'n') want_default_hooks="${input}" ;;
+ *) die "answer '${input}' not understood." ;;
+ esac
+
einfo "Enter the directory for 'work' data (overlay, distfiles, mirror) ['${work_root}']:"
input=; read input
[[ -z "${input}" ]] || work_root="${input}"
- einfo "Enter additional variables (VAR=VALUE) [optional]:"
+ # setting ADDITIONS_DIR here "breaks" hook activation
+ einfo "Enter additional config options (VAR=VALUE; use with care) [optional]:"
input=; read input
## print what would be done
@@ -159,17 +197,21 @@ pkg_config() {
einfo "- data root : ${data_root} ${noconf}"
einfo "- config root : ${conf_root}"
einfo "- import config : ${want_conf_import}"
- einfo "- additional variables : ${input:-<none>}"
+ einfo "- enable default hooks : ${want_default_hooks}"
+ einfo "- additional options : ${input:-<none>}"
einfo
einfo "Press Enter to continue..."
read
## do it
+
+ # temporary config file - will be moved to its final location when done
ebegin "Creating temporary config file"
/usr/bin/roverlay-mkconfig -O "${T}/${PF}.config" \
-W "${work_root}" -D "${data_root}" -C "${conf_root}" -- ${input-}
eend $? || die
+ # import config
if [[ "${want_conf_import}" == "y" ]]; then
[[ -d "${conf_root}" ]] || mkdir -p "${conf_root}" || \
die "cannot create ${conf_root}"
@@ -182,16 +224,46 @@ pkg_config() {
eend $? || die
fi
+ # run "roverlay setupdirs"
ebegin "Creating directories"
/usr/bin/roverlay --config "${T}/${PF}.config" \
--target-uid ${roverlay_user} --target-gid ${roverlay_group} setupdirs
eend $? || die
+ # move config file
ebegin "Copying new config file to ${config_file}"
cp --preserve=mode,timestamps "${T}/${PF}.config" "${config_file}" && \
chown "${roverlay_user}:${roverlay_group}" "${config_file}"
eend $? || die
+ # adjust permissions for $work_root
+ if [[ ! -L "${work_root}" ]]; then
+ # ^ chmod doesn't work nicely for symlinks
+
+ ebegin "Adjusting permissions for ${work_root}"
+ chmod 0750 "${work_root}" && \
+ chown -h --from="root:root" \
+ "${roverlay_user}:${roverlay_group}" "${work_root}"
+ eend $? || die
+ fi
+
+ # enable hooks
+ if [[ "${want_default_hooks}" ]]; then
+ einfo "Activating default hooks"
+ if [[ ! -d "${conf_root}/files" ]]; then
+ ewarn "Skipping hook activation: ADDITIONS_DIR not in config root."
+ else
+ local hook_destdir="${conf_root}/files/hooks/overlay_success"
+
+ # non-recursive
+ get_user_dir "${hook_destdir%/*}"
+ get_user_dir "${hook_destdir}"
+
+ enable_hook {,50-}create-metadata-cache
+ enable_hook {,80-}git-commit-overlay
+ fi
+ fi
+
echo
einfo "Configuration for user '${roverlay_user}' is complete."
einfo "You can run '${PN} --print-config' (as user) to verify it."
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
2013-07-12 17:11 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
@ 2013-07-12 17:11 ` André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-12 17:11 UTC (permalink / raw
To: gentoo-commits
commit: d742b562c460c6453784f9309f8f454dcbc22caf
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 12 17:10:32 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 12 17:10:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d742b562
ebuild: enable default hooks, chown $work_root
---
roverlay-9999.ebuild | 94 ++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 83 insertions(+), 11 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 0e21409..bc4a80f 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -67,6 +67,39 @@ pkg_setup() {
}
pkg_config() {
+ ## func
+ get_user_dir() {
+ if [[ -d "${1}" ]]; then
+ return 0
+ else
+ mkdir -m 0750 "${1}" && \
+ chown -h "${roverlay_user}:${roverlay_group}" "${1}" || \
+ die "failed to create '${1}'."
+ fi
+ }
+ # enable_hook ( hook_script_name, hook_name, **hook_destdir, **data_root )
+ enable_hook() {
+ local hook_src="${data_root?}/hooks/${1%.sh}.sh"
+ local hook_dest="${hook_destdir?}/${2%.sh}.sh"
+
+ if [[ ! -f "${hook_src}" ]]; then
+ die "hook script '${hook_src}' does not exist."
+ elif [[ -L "${hook_dest}" ]]; then
+ if [[ "$(readlink -f ${hook_dest})" == "${hook_src}" ]]; then
+ einfo "skipping ${2%.sh} - already set up"
+ else
+ ewarn "skipping ${2%.sh} - link to another script"
+ fi
+ elif [[ -e "${hook_dest}" ]]; then
+ ewarn "skipping hook ${2%.sh} - exists, but not a link"
+ else
+ ebegin "Adding hook ${1%.sh} as ${2%.sh}"
+ ln -sT "${hook_src}" "${hook_dest}" && \
+ chown -Ph "${roverlay_user}:${roverlay_group}" "${hook_dest}"
+ eend $? || die "failed to add hook ${2%.sh}"
+ fi
+ }
+
## vars
local DEFAULT_CONF_ROOT="${ROOT}etc/${PN}"
@@ -79,6 +112,8 @@ pkg_config() {
local conf_root
local work_root
+ local want_default_hooks=y
+
local input
## get user input
@@ -123,15 +158,9 @@ pkg_config() {
einfo "Import default config (${DEFAULT_CONF_ROOT})? (y/n) ['${want_conf_import}']"
input=; read input
case "${input}" in
- '')
- true
- ;;
- 'y'|'n')
- want_conf_import="${input}"
- ;;
- *)
- die "answer '${input}' not understood."
- ;;
+ '') true ;;
+ 'y'|'n') want_conf_import="${input}" ;;
+ *) die "answer '${input}' not understood." ;;
esac
;;
esac
@@ -141,12 +170,21 @@ pkg_config() {
echo
fi
+ einfo "Enable default overlay creation hooks (git history and metadata cache)? (y/n) ['${want_default_hooks}']"
+ input=; read input
+ case "${input}" in
+ '') true ;;
+ 'y'|'n') want_default_hooks="${input}" ;;
+ *) die "answer '${input}' not understood." ;;
+ esac
+
einfo "Enter the directory for 'work' data (overlay, distfiles, mirror) ['${work_root}']:"
input=; read input
[[ -z "${input}" ]] || work_root="${input}"
- einfo "Enter additional variables (VAR=VALUE) [optional]:"
+ # setting ADDITIONS_DIR here "breaks" hook activation
+ einfo "Enter additional config options (VAR=VALUE; use with care) [optional]:"
input=; read input
## print what would be done
@@ -159,17 +197,21 @@ pkg_config() {
einfo "- data root : ${data_root} ${noconf}"
einfo "- config root : ${conf_root}"
einfo "- import config : ${want_conf_import}"
- einfo "- additional variables : ${input:-<none>}"
+ einfo "- enable default hooks : ${want_default_hooks}"
+ einfo "- additional options : ${input:-<none>}"
einfo
einfo "Press Enter to continue..."
read
## do it
+
+ # temporary config file - will be moved to its final location when done
ebegin "Creating temporary config file"
/usr/bin/roverlay-mkconfig -O "${T}/${PF}.config" \
-W "${work_root}" -D "${data_root}" -C "${conf_root}" -- ${input-}
eend $? || die
+ # import config
if [[ "${want_conf_import}" == "y" ]]; then
[[ -d "${conf_root}" ]] || mkdir -p "${conf_root}" || \
die "cannot create ${conf_root}"
@@ -182,16 +224,46 @@ pkg_config() {
eend $? || die
fi
+ # run "roverlay setupdirs"
ebegin "Creating directories"
/usr/bin/roverlay --config "${T}/${PF}.config" \
--target-uid ${roverlay_user} --target-gid ${roverlay_group} setupdirs
eend $? || die
+ # move config file
ebegin "Copying new config file to ${config_file}"
cp --preserve=mode,timestamps "${T}/${PF}.config" "${config_file}" && \
chown "${roverlay_user}:${roverlay_group}" "${config_file}"
eend $? || die
+ # adjust permissions for $work_root
+ if [[ ! -L "${work_root}" ]]; then
+ # ^ chmod doesn't work nicely for symlinks
+
+ ebegin "Adjusting permissions for ${work_root}"
+ chmod 0750 "${work_root}" && \
+ chown -h --from="root:root" \
+ "${roverlay_user}:${roverlay_group}" "${work_root}"
+ eend $? || die
+ fi
+
+ # enable hooks
+ if [[ "${want_default_hooks}" ]]; then
+ einfo "Activating default hooks"
+ if [[ ! -d "${conf_root}/files" ]]; then
+ ewarn "Skipping hook activation: ADDITIONS_DIR not in config root."
+ else
+ local hook_destdir="${conf_root}/files/hooks/overlay_success"
+
+ # non-recursive
+ get_user_dir "${hook_destdir%/*}"
+ get_user_dir "${hook_destdir}"
+
+ enable_hook {,50-}create-metadata-cache
+ enable_hook {,80-}git-commit-overlay
+ fi
+ fi
+
echo
einfo "Configuration for user '${roverlay_user}' is complete."
einfo "You can run '${PN} --print-config' (as user) to verify it."
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-07-12 14:03 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-12 14:03 UTC (permalink / raw
To: gentoo-commits
commit: ad9c06ed19a4af7ef245c54feb3bd4f0a15cccf3
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 12 14:01:34 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 12 14:01:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ad9c06ed
ebuild: set up roverlay via pkg_config()
---
roverlay-9999.ebuild | 146 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 141 insertions(+), 5 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index bcc4cec..0e21409 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -8,9 +8,10 @@ EAPI=4
PYTHON_COMPAT="python2_7 python3_1 python3_2"
PYTHON_USE="ssl"
-inherit base python-distutils-ng git-2
+inherit base python-distutils-ng git-2 user
EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
+#EGIT_BRANCH='gsoc13/next'
DESCRIPTION="Automatically generated overlay of R packages (SoC2012)"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
@@ -18,15 +19,15 @@ SRC_URI=""
LICENSE="GPL-2+"
SLOT="0"
-IUSE="bzip2 +prebuilt-documentation"
+IUSE="-bzip2 +prebuilt-documentation"
KEYWORDS=""
-DEPEND="
- dev-python/setuptools
+_CDEPEND="dev-python/setuptools"
+DEPEND="${_CDEPEND}
!prebuilt-documentation? ( >=dev-python/docutils-0.9 )
"
-RDEPEND="
+RDEPEND="${_CDEPEND}
sys-apps/portage
virtual/python-argparse
"
@@ -60,3 +61,138 @@ python_install_all() {
# (due to the default config file)
keepdir /etc/${PN}/{files,package-rules.d}
}
+
+pkg_setup() {
+ enewgroup roverlay
+}
+
+pkg_config() {
+ ## vars
+ local DEFAULT_CONF_ROOT="${ROOT}etc/${PN}"
+
+ local roverlay_user="roverlay"
+ local roverlay_group="roverlay"
+ #local user_is_root
+ local want_conf_import
+
+ local data_root="${ROOT}usr/share/${PN}"
+ local conf_root
+ local work_root
+
+ local input
+
+ ## get user input
+ einfo "Enter user/uid that will run ${PN} (user has to exist!) ['${roverlay_user}']:"
+ # input= not strictly needed
+ input=; read input
+ [[ -z "${input}" ]] || roverlay_user="${input}"
+
+ egetent passwd "${roverlay_user}" 1>/dev/null || \
+ die "no such user/uid: ${roverlay_user}"
+
+ case "${roverlay_user}" in
+ '0'|'root')
+ #user_is_root=y
+
+ work_root="${ROOT}var/${PN}"
+ conf_root="${DEFAULT_CONF_ROOT}"
+ config_file="${conf_root}/R-overlay.conf"
+
+ einfo "config root is ${conf_root}"
+ want_conf_import=n
+ ;;
+ *)
+ #user_is_root=n
+
+ # get user config location
+ input="$(egethome ${roverlay_user})"
+ [[ -d "${input}" ]] || die "user has no home directory: ${input}"
+
+ work_root="${input}/${PN}"
+ conf_root="${work_root}/config"
+ config_file="${work_root}/R-overlay.conf"
+
+ if [[ ! -e "${conf_root}" ]]; then
+ einfo "config root is ${conf_root} (will be created)"
+ want_conf_import=y
+ else
+ einfo "config root is ${conf_root} (already exists)"
+ want_conf_import=n
+ fi
+
+ einfo "Import default config (${DEFAULT_CONF_ROOT})? (y/n) ['${want_conf_import}']"
+ input=; read input
+ case "${input}" in
+ '')
+ true
+ ;;
+ 'y'|'n')
+ want_conf_import="${input}"
+ ;;
+ *)
+ die "answer '${input}' not understood."
+ ;;
+ esac
+ ;;
+ esac
+
+ if [[ -e "${config_file}" ]]; then
+ einfo "This will overwrite ${config_file}!"
+ echo
+ fi
+
+ einfo "Enter the directory for 'work' data (overlay, distfiles, mirror) ['${work_root}']:"
+
+ input=; read input
+ [[ -z "${input}" ]] || work_root="${input}"
+
+ einfo "Enter additional variables (VAR=VALUE) [optional]:"
+ input=; read input
+
+ ## print what would be done
+ local noconf="(not configurable)"
+ echo
+ einfo "Configuration:"
+ einfo "- user/uid : ${roverlay_user}"
+ einfo "- group/gid : ${roverlay_group} ${noconf}"
+ einfo "- work root : ${work_root}"
+ einfo "- data root : ${data_root} ${noconf}"
+ einfo "- config root : ${conf_root}"
+ einfo "- import config : ${want_conf_import}"
+ einfo "- additional variables : ${input:-<none>}"
+ einfo
+ einfo "Press Enter to continue..."
+ read
+
+ ## do it
+ ebegin "Creating temporary config file"
+ /usr/bin/roverlay-mkconfig -O "${T}/${PF}.config" \
+ -W "${work_root}" -D "${data_root}" -C "${conf_root}" -- ${input-}
+ eend $? || die
+
+ if [[ "${want_conf_import}" == "y" ]]; then
+ [[ -d "${conf_root}" ]] || mkdir -p "${conf_root}" || \
+ die "cannot create ${conf_root}"
+
+ ebegin "Importing default config (${DEFAULT_CONF_ROOT})"
+ cp -dRu --preserve=mode,timestamps \
+ "${DEFAULT_CONF_ROOT}"/* "${conf_root}"/ && \
+ chown -Rh --from="root:root" \
+ "${roverlay_user}:${roverlay_group}" "${conf_root}"
+ eend $? || die
+ fi
+
+ ebegin "Creating directories"
+ /usr/bin/roverlay --config "${T}/${PF}.config" \
+ --target-uid ${roverlay_user} --target-gid ${roverlay_group} setupdirs
+ eend $? || die
+
+ ebegin "Copying new config file to ${config_file}"
+ cp --preserve=mode,timestamps "${T}/${PF}.config" "${config_file}" && \
+ chown "${roverlay_user}:${roverlay_group}" "${config_file}"
+ eend $? || die
+
+ echo
+ einfo "Configuration for user '${roverlay_user}' is complete."
+ einfo "You can run '${PN} --print-config' (as user) to verify it."
+}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: /
@ 2013-07-11 16:44 André Erdmann
2013-07-11 16:29 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
0 siblings, 1 reply; 146+ messages in thread
From: André Erdmann @ 2013-07-11 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 8031d346aa4673c417a1be329392315105dbb99e
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 11 16:28:43 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 11 16:28:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8031d346
setup.py: install roverlay-mkconfig
---
setup.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup.py b/setup.py
index d15419c..d42b159 100755
--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,7 @@ setup (
entry_points = {
'console_scripts': [
'roverlay = roverlay.main:main_installed',
+ 'roverlay-mkconfig = roverlay.config.mkconfig:make_config',
]
},
packages = find_packages ( exclude=[ 'tests', 'tests.*' ] ),
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-07-11 10:36 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-11 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 0548f8ab06d87e83b4cc19230604b39ec9acfd95
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 11 10:36:00 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 11 10:36:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=0548f8ab
install fixup (#2)
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 60a2b09..d15419c 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup (
'roverlay = roverlay.main:main_installed',
]
},
- packages = find_packages(),
+ packages = find_packages ( exclude=[ 'tests', 'tests.*' ] ),
classifiers = [
#'Development Status :: 3 - Alpha',
'Development Status :: 4 - Beta',
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-07-10 16:16 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-10 16:16 UTC (permalink / raw
To: gentoo-commits
commit: ef8f6d5a60a07577569feb62b3baeef11ee2b547
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 15:09:09 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 15:09:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ef8f6d5a
Makefile: remove pydoc target temporarily
---
Makefile | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 0ad337e..0c3be05 100644
--- a/Makefile
+++ b/Makefile
@@ -79,8 +79,10 @@ $(BUILDDIR):
# generates selfdocs (using pydoc) in $(SELFDOC)/
$(SELFDOC):
+ # pydoc target is broken currently..
+ @false
@install -d $(SELFDOC)/roverlay
- @ln -sfT ../../roverlay $(SELFDOC)/roverlay
+ @ln -s ../../roverlay $(SELFDOC)/roverlay
$(PYDOC_SH) $(SELFDOC)
# alias to $(SELFDOC)
@@ -90,7 +92,7 @@ htmldoc: $(SRC_DOCDIR)/rst/usage.rst
@install -d $(SRC_DOCDIR)/html
$(RST_HTML) $(SRC_DOCDIR)/rst/usage.rst $(SRC_DOCDIR)/html/usage.html
-generate-doc: pydoc htmldoc
+generate-doc: htmldoc
generate-setuppy: $(GEN_SETUP_PY)
$(GEN_SETUP_PY)
@@ -99,7 +101,7 @@ generate-manifest: $(MANIFEST_GEN)
$(MANIFEST_GEN) > $(MANIFEST_TMP)
mv -- $(MANIFEST_TMP) $(MANIFEST)
-generate-files: generate-setuppy htmldoc pydoc generate-manifest
+generate-files: generate-setuppy generate-doc generate-manifest
# creates a src tarball (.tar.bz2)
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-07-10 16:16 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-10 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 5f90ed490bc36a814c85ff690710abafdd325643
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 13:44:35 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 13:44:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5f90ed49
change format of TODO file
---
TODO | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/TODO b/TODO
index ca8ee6b..5db038f 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,13 @@
TODO list, most priority at the top.
- * Problem of tarballs which disappear when package is updated
- * Solve issue of depending on a newer version of a base package than what is
- available in the currently installed version of R
- * Do-not-process feature to list packages we shouldn't even look at
- * Allow per-package keywords for:
+[x] Problem of tarballs which disappear when package is updated
+[ ] Solve issue of depending on a newer version of a base package than what is
+ available in the currently installed version of R
+[x] Do-not-process feature to list packages we shouldn't even look at
+[x] Allow per-package keywords for:
- packages which require e.g. 64 bit only
- packages present in multiple repositories
- ?
- * Better way to deal with R suggestions
- * Handle slots in fuzzy dependency resolver
- * readline in depres_console
+[x] Better way to deal with R suggestions
+[x] Handle slots in fuzzy dependency resolver
+[ ] readline in depres_console
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: /
@ 2013-07-10 15:10 André Erdmann
2013-07-10 16:16 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
0 siblings, 1 reply; 146+ messages in thread
From: André Erdmann @ 2013-07-10 15:10 UTC (permalink / raw
To: gentoo-commits
commit: afd77696349d7d68ad26680564e00e62943f05cf
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 13:39:46 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 13:39:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=afd77696
update ebuild, Makefile
---
Makefile | 143 ++++++++++++++++++++++++++++++++-------------------
roverlay-9999.ebuild | 37 +++++++------
2 files changed, 112 insertions(+), 68 deletions(-)
diff --git a/Makefile b/Makefile
index 3981a92..0ad337e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,15 @@
# Some make targets for testing / distribution
-# DESTDIR :=
-BINDIR := $(DESTDIR)/usr/local/bin
+DESTDIR := /
+DESTTREE := $(DESTDIR)usr/
+
+DATADIR := $(DESTTREE)share
+BINDIR := $(DESTTREE)bin
+CONFDIR := $(DESTDIR)etc
+
+BUILDDIR := ./tmp
+
+
PYMOD_FILE_LIST := ./roverlay_files.list
MANIFEST := MANIFEST
@@ -9,6 +17,7 @@ MANIFEST_TMP := $(MANIFEST).tmp
MANIFEST_GEN := ./scripts/create_manifest.sh
+GEN_SETUP_PY := ./scripts/gen_setuppy.sh
SETUP_PY := ./setup.py
PKG_DISTDIR := ./release
@@ -22,32 +31,39 @@ PYDOC_SH = ./scripts/do_pydoc.sh
RST_HTML = ./scripts/roverlay_rst2html.sh
-DOCDIR := ./doc
+SRC_DOCDIR := ./doc
-SELFDOC := $(DOCDIR)/pydoc
+SELFDOC := $(SRC_DOCDIR)/pydoc
-.PHONY: $(MANIFEST_TMP) $(MANIFEST) \
- default \
- clean-log clean distclean _pyclean _pydoc_clean \
- run-test run-sync test \
- pydoc $(SELFDOC) docs htmldoc html \
- pyver \
- install install-all \
+.PHONY: default \
+ clean clean-log _pyclean _pydoc_clean distclean \
+ docs pydoc htmldoc \
+ check test \
+ generate-files \
+ generate-doc generate-setuppy generate-manifest \
+ release dist \
+ compress-config \
+ install-all install \
install-roverlay install-pymodules \
- uninstall uninstall-all \
+ install-data install-config-common \
+ install-config-compressed install-config \
+ uninstall-all uninstall \
uninstall-roverlay uninstall-pymodules
default:
@false
-pyver:
- @$(PYTHON) --version
+check:
+ @true
-clean-log:
- rm -rf -- $(LOGDIR)
+test: ./run_tests.sh
+ ./run_tests.sh
clean:
- rm -rf build/
+ rm -rf ./build/ $(BUILDDIR)/
+
+clean-log:
+ rm -rf -- $(LOGDIR)
_pyclean:
find . -name "*.pyc" -or -name "*.pyo" -delete
@@ -58,56 +74,48 @@ _pydoc_clean:
distclean: clean _pyclean _pydoc_clean
-# generates docs in $(DOCDIR)/
-$(DOCDIR):
- @mkdir $(DOCDIR)
-
-$(DOCDIR)/html: $(DOCDIR)
- @mkdir $(DOCDIR)/html
-
-docs: $(SELFDOC) htmldoc
-
-$(SELFDOC)/roverlay:
- test -d $(SELFDOC) || mkdir -p $(SELFDOC)
- @ln -s ../../roverlay $(SELFDOC)/roverlay
+$(BUILDDIR):
+ @install -d $(BUILDDIR)
# generates selfdocs (using pydoc) in $(SELFDOC)/
-$(SELFDOC): $(SELFDOC)/roverlay
+$(SELFDOC):
+ @install -d $(SELFDOC)/roverlay
+ @ln -sfT ../../roverlay $(SELFDOC)/roverlay
$(PYDOC_SH) $(SELFDOC)
# alias to $(SELFDOC)
pydoc: $(SELFDOC)
-html: $(DOCDIR)/html $(DOCDIR)/rst/usage.rst
- $(RST_HTML) $(DOCDIR)/rst/usage.rst $(DOCDIR)/html/usage.html
+htmldoc: $(SRC_DOCDIR)/rst/usage.rst
+ @install -d $(SRC_DOCDIR)/html
+ $(RST_HTML) $(SRC_DOCDIR)/rst/usage.rst $(SRC_DOCDIR)/html/usage.html
-htmldoc: html
+generate-doc: pydoc htmldoc
-# sync all repos
-run-sync: $(ROVERLAY_MAIN)
- $(PYTHON) $(ROVERLAY_MAIN) sync
+generate-setuppy: $(GEN_SETUP_PY)
+ $(GEN_SETUP_PY)
-# this is the 'default' test run command
-run-test: $(ROVERLAY_MAIN)
- $(PYTHON) $(ROVERLAY_MAIN) --nosync --stats -O /tmp/overlay
-
-# sync and do a test run afterwards
-test: run-sync run-test
-
-$(MANIFEST_TMP): $(MANIFEST_GEN)
+generate-manifest: $(MANIFEST_GEN)
$(MANIFEST_GEN) > $(MANIFEST_TMP)
-
-# creates a MANIFEST file for setup.py
-$(MANIFEST): $(MANIFEST_TMP)
mv -- $(MANIFEST_TMP) $(MANIFEST)
+generate-files: generate-setuppy htmldoc pydoc generate-manifest
+
+
# creates a src tarball (.tar.bz2)
# !!! does not include config files
-release: $(MANIFEST) $(SETUP_PY)
+release: generate-files
@echo "Note: the release tarball does not include any config files!"
- @test -d $(PKG_DISTDIR) || @mkdir -- $(PKG_DISTDIR)
+ @install -d $(PKG_DISTDIR)
./$(SETUP_PY) sdist --dist-dir=$(PKG_DISTDIR) --formats=bztar
+dist: distclean release
+
+compress-config: $(BUILDDIR)
+ @install -d $(BUILDDIR)/config
+ cp -vLr -p --no-preserve=ownership config/simple-deprules.d $(BUILDDIR)/config/
+ bzip2 $(BUILDDIR)/config/simple-deprules.d/*
+ bzip2 -k -c config/license.map > $(BUILDDIR)/config/license.map
install-roverlay: ./roverlay.py
install -T -D -- ./roverlay.py $(BINDIR)/roverlay
@@ -115,17 +123,48 @@ install-roverlay: ./roverlay.py
install-pymodules: ./setup.py
$(PYTHON) ./setup.py install --record $(PYMOD_FILE_LIST)
-install-all: install
+install-config-common:
+ install -m 0755 -d $(CONFDIR)/roverlay
+ install -m 0644 -t $(CONFDIR)/roverlay \
+ config/description_fields.conf config/repo.list
+ install -m 0644 -T \
+ config/R-overlay.conf.install $(CONFDIR)/roverlay/R-overlay.conf
+
+install-config-compressed: install-config-common
+ cp -vLr -p --no-preserve=ownership \
+ $(BUILDDIR)/config/simple-deprules.d $(BUILDDIR)/config/license.map \
+ $(CONFDIR)/roverlay/
+
+install-config: install-config-common
+ cp -vLr -p --no-preserve=ownership \
+ config/simple-deprules.d config/license.map \
+ $(CONFDIR)/roverlay/
+
+
+# license.map deprules
+
+install-data:
+ install -m 0755 -d \
+ $(DATADIR)/roverlay/shlib $(DATADIR)/roverlay/hooks \
+ $(DATADIR)/roverlay/eclass
+
+ install -m 0644 -t $(DATADIR)/roverlay/hooks files/hooks/*.sh
+ install -m 0644 -t $(DATADIR)/roverlay/shlib files/shlib/*.sh
+ chmod 0775 $(DATADIR)/roverlay/hooks/mux.sh
+
+ install -m 0644 -t $(DATADIR)/roverlay/eclass files/eclass/*.eclass
install: install-pymodules install-roverlay
+install-all: install
+
uninstall-roverlay:
rm -vf -- $(BINDIR)/roverlay
uninstall-pymodules: $(PYMOD_FILE_LIST)
xargs rm -vrf < $(PYMOD_FILE_LIST)
-uninstall-all: uninstall
-
uinstall:
@false
+
+uninstall-all: uninstall
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 68c23fe..40266c8 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=4
+
# python < 2.7 is not supported
PYTHON_COMPAT="python2_7 python3_1 python3_2"
+PYTHON_USE="ssl"
inherit base python-distutils-ng git-2
@@ -14,39 +16,42 @@ DESCRIPTION="Automatically generated overlay of R packages (SoC2012)"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
SRC_URI=""
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
-IUSE="bzip2"
+IUSE="bzip2 +prebuilt-documentation"
KEYWORDS=""
-DEPEND=""
-RDEPEND="${DEPEND:-}
+DEPEND="!prebuilt-documentation? ( >=dev-python/docutils-0.9 )"
+RDEPEND="
sys-apps/portage
virtual/python-argparse
"
-_CONFDIR=/etc/${PN}
-
python_prepare_all() {
if use bzip2; then
einfo "USE=bzip2: Compressing dependency rule files"
- bzip2 config/simple-deprules.d/* || die "Cannot compress dependency rules!"
+ emake BUILDDIR="${S}/tmp" compress-config
fi
sed -f misc/sed_expression_roverlay_installed roverlay.py -i || \
die "sed expression, roverlay.py"
base_src_prepare
}
+src_compile() {
+ python-distutils-ng_src_compile
+
+ if ! use prebuilt-documentation; then
+ emake htmldoc
+ fi
+}
+
python_install_all() {
- newbin roverlay.py roverlay
+ #newbin roverlay.py roverlay
- insinto "${_CONFDIR}"
- doins config/description_fields.conf config/repo.list
- doins -r config/simple-deprules.d/
- doins -r files/eclass/
- newins config/R-overlay.conf.install R-overlay.conf
+ # hooks etc. into /usr/share (architecture-independent data)
+ emake BUILDDIR="${S}/tmp" DESTDIR="${D}" \
+ install-data $(usex bzip2 install-config{-compressed,})
- doman doc/man/roverlay.1
dohtml doc/html/*
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
2013-07-10 15:10 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
@ 2013-07-10 16:16 ` André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-10 16:16 UTC (permalink / raw
To: gentoo-commits
commit: afd77696349d7d68ad26680564e00e62943f05cf
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 13:39:46 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 13:39:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=afd77696
update ebuild, Makefile
---
Makefile | 143 ++++++++++++++++++++++++++++++++-------------------
roverlay-9999.ebuild | 37 +++++++------
2 files changed, 112 insertions(+), 68 deletions(-)
diff --git a/Makefile b/Makefile
index 3981a92..0ad337e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,15 @@
# Some make targets for testing / distribution
-# DESTDIR :=
-BINDIR := $(DESTDIR)/usr/local/bin
+DESTDIR := /
+DESTTREE := $(DESTDIR)usr/
+
+DATADIR := $(DESTTREE)share
+BINDIR := $(DESTTREE)bin
+CONFDIR := $(DESTDIR)etc
+
+BUILDDIR := ./tmp
+
+
PYMOD_FILE_LIST := ./roverlay_files.list
MANIFEST := MANIFEST
@@ -9,6 +17,7 @@ MANIFEST_TMP := $(MANIFEST).tmp
MANIFEST_GEN := ./scripts/create_manifest.sh
+GEN_SETUP_PY := ./scripts/gen_setuppy.sh
SETUP_PY := ./setup.py
PKG_DISTDIR := ./release
@@ -22,32 +31,39 @@ PYDOC_SH = ./scripts/do_pydoc.sh
RST_HTML = ./scripts/roverlay_rst2html.sh
-DOCDIR := ./doc
+SRC_DOCDIR := ./doc
-SELFDOC := $(DOCDIR)/pydoc
+SELFDOC := $(SRC_DOCDIR)/pydoc
-.PHONY: $(MANIFEST_TMP) $(MANIFEST) \
- default \
- clean-log clean distclean _pyclean _pydoc_clean \
- run-test run-sync test \
- pydoc $(SELFDOC) docs htmldoc html \
- pyver \
- install install-all \
+.PHONY: default \
+ clean clean-log _pyclean _pydoc_clean distclean \
+ docs pydoc htmldoc \
+ check test \
+ generate-files \
+ generate-doc generate-setuppy generate-manifest \
+ release dist \
+ compress-config \
+ install-all install \
install-roverlay install-pymodules \
- uninstall uninstall-all \
+ install-data install-config-common \
+ install-config-compressed install-config \
+ uninstall-all uninstall \
uninstall-roverlay uninstall-pymodules
default:
@false
-pyver:
- @$(PYTHON) --version
+check:
+ @true
-clean-log:
- rm -rf -- $(LOGDIR)
+test: ./run_tests.sh
+ ./run_tests.sh
clean:
- rm -rf build/
+ rm -rf ./build/ $(BUILDDIR)/
+
+clean-log:
+ rm -rf -- $(LOGDIR)
_pyclean:
find . -name "*.pyc" -or -name "*.pyo" -delete
@@ -58,56 +74,48 @@ _pydoc_clean:
distclean: clean _pyclean _pydoc_clean
-# generates docs in $(DOCDIR)/
-$(DOCDIR):
- @mkdir $(DOCDIR)
-
-$(DOCDIR)/html: $(DOCDIR)
- @mkdir $(DOCDIR)/html
-
-docs: $(SELFDOC) htmldoc
-
-$(SELFDOC)/roverlay:
- test -d $(SELFDOC) || mkdir -p $(SELFDOC)
- @ln -s ../../roverlay $(SELFDOC)/roverlay
+$(BUILDDIR):
+ @install -d $(BUILDDIR)
# generates selfdocs (using pydoc) in $(SELFDOC)/
-$(SELFDOC): $(SELFDOC)/roverlay
+$(SELFDOC):
+ @install -d $(SELFDOC)/roverlay
+ @ln -sfT ../../roverlay $(SELFDOC)/roverlay
$(PYDOC_SH) $(SELFDOC)
# alias to $(SELFDOC)
pydoc: $(SELFDOC)
-html: $(DOCDIR)/html $(DOCDIR)/rst/usage.rst
- $(RST_HTML) $(DOCDIR)/rst/usage.rst $(DOCDIR)/html/usage.html
+htmldoc: $(SRC_DOCDIR)/rst/usage.rst
+ @install -d $(SRC_DOCDIR)/html
+ $(RST_HTML) $(SRC_DOCDIR)/rst/usage.rst $(SRC_DOCDIR)/html/usage.html
-htmldoc: html
+generate-doc: pydoc htmldoc
-# sync all repos
-run-sync: $(ROVERLAY_MAIN)
- $(PYTHON) $(ROVERLAY_MAIN) sync
+generate-setuppy: $(GEN_SETUP_PY)
+ $(GEN_SETUP_PY)
-# this is the 'default' test run command
-run-test: $(ROVERLAY_MAIN)
- $(PYTHON) $(ROVERLAY_MAIN) --nosync --stats -O /tmp/overlay
-
-# sync and do a test run afterwards
-test: run-sync run-test
-
-$(MANIFEST_TMP): $(MANIFEST_GEN)
+generate-manifest: $(MANIFEST_GEN)
$(MANIFEST_GEN) > $(MANIFEST_TMP)
-
-# creates a MANIFEST file for setup.py
-$(MANIFEST): $(MANIFEST_TMP)
mv -- $(MANIFEST_TMP) $(MANIFEST)
+generate-files: generate-setuppy htmldoc pydoc generate-manifest
+
+
# creates a src tarball (.tar.bz2)
# !!! does not include config files
-release: $(MANIFEST) $(SETUP_PY)
+release: generate-files
@echo "Note: the release tarball does not include any config files!"
- @test -d $(PKG_DISTDIR) || @mkdir -- $(PKG_DISTDIR)
+ @install -d $(PKG_DISTDIR)
./$(SETUP_PY) sdist --dist-dir=$(PKG_DISTDIR) --formats=bztar
+dist: distclean release
+
+compress-config: $(BUILDDIR)
+ @install -d $(BUILDDIR)/config
+ cp -vLr -p --no-preserve=ownership config/simple-deprules.d $(BUILDDIR)/config/
+ bzip2 $(BUILDDIR)/config/simple-deprules.d/*
+ bzip2 -k -c config/license.map > $(BUILDDIR)/config/license.map
install-roverlay: ./roverlay.py
install -T -D -- ./roverlay.py $(BINDIR)/roverlay
@@ -115,17 +123,48 @@ install-roverlay: ./roverlay.py
install-pymodules: ./setup.py
$(PYTHON) ./setup.py install --record $(PYMOD_FILE_LIST)
-install-all: install
+install-config-common:
+ install -m 0755 -d $(CONFDIR)/roverlay
+ install -m 0644 -t $(CONFDIR)/roverlay \
+ config/description_fields.conf config/repo.list
+ install -m 0644 -T \
+ config/R-overlay.conf.install $(CONFDIR)/roverlay/R-overlay.conf
+
+install-config-compressed: install-config-common
+ cp -vLr -p --no-preserve=ownership \
+ $(BUILDDIR)/config/simple-deprules.d $(BUILDDIR)/config/license.map \
+ $(CONFDIR)/roverlay/
+
+install-config: install-config-common
+ cp -vLr -p --no-preserve=ownership \
+ config/simple-deprules.d config/license.map \
+ $(CONFDIR)/roverlay/
+
+
+# license.map deprules
+
+install-data:
+ install -m 0755 -d \
+ $(DATADIR)/roverlay/shlib $(DATADIR)/roverlay/hooks \
+ $(DATADIR)/roverlay/eclass
+
+ install -m 0644 -t $(DATADIR)/roverlay/hooks files/hooks/*.sh
+ install -m 0644 -t $(DATADIR)/roverlay/shlib files/shlib/*.sh
+ chmod 0775 $(DATADIR)/roverlay/hooks/mux.sh
+
+ install -m 0644 -t $(DATADIR)/roverlay/eclass files/eclass/*.eclass
install: install-pymodules install-roverlay
+install-all: install
+
uninstall-roverlay:
rm -vf -- $(BINDIR)/roverlay
uninstall-pymodules: $(PYMOD_FILE_LIST)
xargs rm -vrf < $(PYMOD_FILE_LIST)
-uninstall-all: uninstall
-
uinstall:
@false
+
+uninstall-all: uninstall
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 68c23fe..40266c8 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=4
+
# python < 2.7 is not supported
PYTHON_COMPAT="python2_7 python3_1 python3_2"
+PYTHON_USE="ssl"
inherit base python-distutils-ng git-2
@@ -14,39 +16,42 @@ DESCRIPTION="Automatically generated overlay of R packages (SoC2012)"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
SRC_URI=""
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
-IUSE="bzip2"
+IUSE="bzip2 +prebuilt-documentation"
KEYWORDS=""
-DEPEND=""
-RDEPEND="${DEPEND:-}
+DEPEND="!prebuilt-documentation? ( >=dev-python/docutils-0.9 )"
+RDEPEND="
sys-apps/portage
virtual/python-argparse
"
-_CONFDIR=/etc/${PN}
-
python_prepare_all() {
if use bzip2; then
einfo "USE=bzip2: Compressing dependency rule files"
- bzip2 config/simple-deprules.d/* || die "Cannot compress dependency rules!"
+ emake BUILDDIR="${S}/tmp" compress-config
fi
sed -f misc/sed_expression_roverlay_installed roverlay.py -i || \
die "sed expression, roverlay.py"
base_src_prepare
}
+src_compile() {
+ python-distutils-ng_src_compile
+
+ if ! use prebuilt-documentation; then
+ emake htmldoc
+ fi
+}
+
python_install_all() {
- newbin roverlay.py roverlay
+ #newbin roverlay.py roverlay
- insinto "${_CONFDIR}"
- doins config/description_fields.conf config/repo.list
- doins -r config/simple-deprules.d/
- doins -r files/eclass/
- newins config/R-overlay.conf.install R-overlay.conf
+ # hooks etc. into /usr/share (architecture-independent data)
+ emake BUILDDIR="${S}/tmp" DESTDIR="${D}" \
+ install-data $(usex bzip2 install-config{-compressed,})
- doman doc/man/roverlay.1
dohtml doc/html/*
}
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-07-03 10:05 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-07-03 10:05 UTC (permalink / raw
To: gentoo-commits
commit: eeb1f8f01069f88a8619c47c6794697677b8b421
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 2 21:07:58 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 2 21:07:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=eeb1f8f0
run_tests.sh/run_tests.py
run_tests.py runs some tests from roverlay/tests.
run_tests.sh runs run_tests.py with both python2 and python3 as interpreter.
---
run_tests.py | 10 ++++++++++
run_tests.sh | 21 +++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/run_tests.py b/run_tests.py
new file mode 100755
index 0000000..b3156f1
--- /dev/null
+++ b/run_tests.py
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+import unittest
+
+import tests.depres
+
+
+if __name__ == '__main__':
+ tests = tests.depres.suite()
+ unittest.TextTestRunner ( verbosity=2 ).run ( tests )
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100755
index 0000000..48ed757
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+cd "${0%/*}" || exit
+
+TESTPY="${PWD}/run_tests.py"
+first=Y
+
+conf="${PWD}/R-overlay.conf"
+tconf="${conf}.tests"
+
+[ -e "${tconf}" ] || { ln -vs -- "${conf}" "${tconf}" && first=; } || exit
+
+for PYTHON in python2 python3; do
+ if which ${PYTHON} 1>/dev/null 2>/dev/null; then
+ [ -n "${first}" ] && first= || echo
+ echo "*** Running ${TESTPY##*/} with PYTHON=${PYTHON} ***"
+ echo
+ PYTHONPATH="${PWD}" ${PYTHON} "${TESTPY}"
+ else
+ echo "PYTHON=${PYTHON} not found." 1>&2
+ fi
+done
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-06-22 15:24 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-06-22 15:24 UTC (permalink / raw
To: gentoo-commits
commit: 8a77ed87aa46126b1673290ebedb944ba1bcf3a0
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Jun 22 15:21:34 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Jun 22 15:21:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8a77ed87
fix setup.py
This commit adds missing dirs to the package list in setup.py.
It also reflects the eclass/ -> files/eclass/ move in the ebuild, but that
doesn't mean that "this" version of roverlay can be installed without issues.
---
roverlay-9999.ebuild | 2 +-
setup.py | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index d4da260..68c23fe 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -44,7 +44,7 @@ python_install_all() {
insinto "${_CONFDIR}"
doins config/description_fields.conf config/repo.list
doins -r config/simple-deprules.d/
- doins -r eclass/
+ doins -r files/eclass/
newins config/R-overlay.conf.install R-overlay.conf
doman doc/man/roverlay.1
diff --git a/setup.py b/setup.py
index a9aaf6d..3631094 100755
--- a/setup.py
+++ b/setup.py
@@ -16,14 +16,15 @@ core.setup (
packages = (
'roverlay',
'roverlay/config',
+ 'roverlay/db',
'roverlay/depres',
'roverlay/depres/simpledeprule',
'roverlay/ebuild',
'roverlay/overlay',
'roverlay/overlay/pkgdir',
- 'roverlay/overlay/pkgdir/manifest',
- 'roverlay/overlay/pkgdir/metadata',
'roverlay/overlay/pkgdir/distroot',
+ #'roverlay/overlay/pkgdir/manifest',
+ 'roverlay/overlay/pkgdir/metadata',
'roverlay/packagerules',
'roverlay/packagerules/abstract',
'roverlay/packagerules/acceptors',
@@ -33,5 +34,7 @@ core.setup (
'roverlay/recipe',
'roverlay/remote',
'roverlay/rpackage',
+ 'roverlay/tools',
+ 'roverlay/util',
),
)
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-06-22 15:24 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-06-22 15:24 UTC (permalink / raw
To: gentoo-commits
commit: ccd321d412b389ec5f66c6a8ca796310e319c153
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Jun 22 15:11:24 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Jun 22 15:11:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ccd321d4
add workdir/ to gitignore
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 64690b0..0f7de68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
/overlay-root
/created_overlay
/desc-files
+/workdir
# documentation files locally maintained (i.e. generated)
/doc/pydoc
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-02-09 21:23 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-02-09 21:23 UTC (permalink / raw
To: gentoo-commits
commit: a91e0085d68df5e401c606e00b5d700e9454fdad
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Feb 9 21:23:21 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Feb 9 21:23:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a91e0085
fix setup.py
---
setup.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/setup.py b/setup.py
index eae7393..e4c2d0e 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ core.setup (
'roverlay/overlay/pkgdir',
'roverlay/overlay/pkgdir/manifest',
'roverlay/overlay/pkgdir/metadata',
- 'roverlay/overlay/pkgdir/symlink',
+ 'roverlay/overlay/pkgdir/distroot',
'roverlay/packagerules',
'roverlay/packagerules/abstract',
'roverlay/packagerules/acceptors',
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-02-09 20:45 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-02-09 20:45 UTC (permalink / raw
To: gentoo-commits
commit: 1802eb35c72c33ce9914ed898c19bb44e5543b6b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Feb 9 19:59:35 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Feb 9 20:08:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=1802eb35
gitignore: ignore *.local
---
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0387ad4..64690b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
# local files
/local
+*.local
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-02-03 19:32 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-02-03 19:32 UTC (permalink / raw
To: gentoo-commits
commit: fde653c00f5241e66f0e1d7595736917165fcc4f
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sun Feb 3 19:31:59 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sun Feb 3 19:31:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fde653c0
setup.py: fix package list
---
setup.py | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index 0e55746..d8c3e6d 100755
--- a/setup.py
+++ b/setup.py
@@ -20,8 +20,16 @@ core.setup (
'roverlay/depres/simpledeprule',
'roverlay/ebuild',
'roverlay/overlay',
- 'roverlay/overlay/manifest',
- 'roverlay/overlay/metadata',
+ 'roverlay/overlay/pkgdir',
+ 'roverlay/overlay/pkgdir/manifest',
+ 'roverlay/overlay/pkgdir/metadata',
+ 'roverlay/overlay/pkgdir/symlink',
+ 'roverlay/packagerules',
+ 'roverlay/packagerules/abstract',
+# 'roverlay/packagerules/acceptors',
+ 'roverlay/packagerules/actions',
+# 'roverlay/packagerules/parser',
+# 'roverlay/packagerules/parser/context',
'roverlay/recipe',
'roverlay/remote',
'roverlay/rpackage',
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-01-28 23:56 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-01-28 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 80b3150f93cfe095f196c678a170ec1aa7e906fb
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jan 28 23:55:34 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jan 28 23:55:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=80b3150f
ebuild: add sys-apps/portage to RDEPEND
virtual/package-manager from @system is not sufficient
---
roverlay-9999.ebuild | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 83c16ec..d4da260 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -22,6 +22,7 @@ KEYWORDS=""
DEPEND=""
RDEPEND="${DEPEND:-}
+ sys-apps/portage
virtual/python-argparse
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-01-27 16:51 Denis Dupeyron
0 siblings, 0 replies; 146+ messages in thread
From: Denis Dupeyron @ 2013-01-27 16:51 UTC (permalink / raw
To: gentoo-commits
commit: 1942019809be72e647a8757e072ae62a7cf26bd2
Author: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 16:50:40 2013 +0000
Commit: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 16:50:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=19420198
Update TODO
---
TODO | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/TODO b/TODO
index fe475c5..ca8ee6b 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,11 @@ TODO list, most priority at the top.
* Problem of tarballs which disappear when package is updated
* Solve issue of depending on a newer version of a base package than what is
available in the currently installed version of R
+ * Do-not-process feature to list packages we shouldn't even look at
+ * Allow per-package keywords for:
+ - packages which require e.g. 64 bit only
+ - packages present in multiple repositories
+ - ?
* Better way to deal with R suggestions
* Handle slots in fuzzy dependency resolver
* readline in depres_console
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-01-25 23:27 Denis Dupeyron
0 siblings, 0 replies; 146+ messages in thread
From: Denis Dupeyron @ 2013-01-25 23:27 UTC (permalink / raw
To: gentoo-commits
commit: d0e374d213aeedeccc4bb62cbc5cfe9570711d4e
Author: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 23:26:34 2013 +0000
Commit: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 23:26:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d0e374d2
Add to TODO:
* Fix building of packages with a "." in the name
* Problem of tarballs which disappear when package is updated
---
TODO | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/TODO b/TODO
index 4f330d2..3f3df31 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
TODO list, most priority at the top.
+ * Fix building of packages with a "." in the name
* Ignore dependencies on R built-in packages
+ * Problem of tarballs which disappear when package is updated
* Better way to deal with R suggestions
* Handle slots in fuzzy dependency resolver
* readline in depres_console
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-01-25 17:44 Denis Dupeyron
0 siblings, 0 replies; 146+ messages in thread
From: Denis Dupeyron @ 2013-01-25 17:44 UTC (permalink / raw
To: gentoo-commits
commit: a0373d4d2b78ac77b4f6d0b2c7b96f426c6d6af1
Author: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 17:43:57 2013 +0000
Commit: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 17:43:57 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a0373d4d
Add a TODO list
---
TODO | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..4f330d2
--- /dev/null
+++ b/TODO
@@ -0,0 +1,6 @@
+TODO list, most priority at the top.
+
+ * Ignore dependencies on R built-in packages
+ * Better way to deal with R suggestions
+ * Handle slots in fuzzy dependency resolver
+ * readline in depres_console
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2013-01-09 19:15 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2013-01-09 19:15 UTC (permalink / raw
To: gentoo-commits
commit: a7820f1b9a5a422c5c6f9fe2ebf0d15928421ee7
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Nov 29 22:20:15 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Nov 29 22:20:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a7820f1b
ebuild: depend on virtual/python-argparse
---
roverlay-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 4c94647..c55bc48 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -22,7 +22,7 @@ KEYWORDS=""
DEPEND=""
RDEPEND="${DEPEND:-}
- dev-python/argparse
+ virtual/python-argparse
"
_CONFDIR=/etc/${PN}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-20 10:39 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-20 10:39 UTC (permalink / raw
To: gentoo-commits
commit: 313eef67d176878ee47b966f03efae38529d2307
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Aug 20 09:42:09 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Aug 20 09:42:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=313eef67
gitignore
---
.gitignore | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index ecef8dc..0387ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,29 @@
-*.pyc
-*.pyo
+!.gitignore
+# python bytecode files
+*.py[cdo]
+
+# auto backup files
*~
~*
-*.swp
-
-/roverlay/debug.py
+*.sw[a-z]
+*.bak*
+# setup.py related files
/MANIFEST
+/release
+/build
+/dist
-/*log/
-/sh/
-/release/
-
-/TODO
-/desc-files
+# roverlay output files / directories, e.g. the created overlay
+/log
/distfiles-root
+/overlay-root
/created_overlay
+/desc-files
+
+# documentation files locally maintained (i.e. generated)
+/doc/pydoc
+# local files
+/local
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-20 10:39 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-20 10:39 UTC (permalink / raw
To: gentoo-commits
commit: 91d72b88b6607584fb3bd1d9ca74059db3f3c733
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Aug 20 09:52:52 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Aug 20 09:52:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=91d72b88
README
---
README | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/README b/README
index 40c2201..4ccb403 100644
--- a/README
+++ b/README
@@ -1,36 +1,34 @@
-R overlay -- README
+Automatically generated overlay of R packages (roverlay) -- README
-== How to use ==
+= What is roverlay? =
+
+roverlay is a program that generates a portage overlay for R packages.
+It runs without any user interaction and uses config files to control the
+overlay creation.
-./roverlay.py [option(s)] [command(s)]
-See man/roverlay.1 or ./roverlay.py --help for all options.
+= Directory overview =
-=== Running tests ===
+roverlay/ -- roverlay python modules
+config/ -- config files
+eclass/ -- eclass file(s)
+misc/ -- miscellaneous files, e.g. a sed expression that makes roverlay.py
+ 'installed'
+doc/ -- documentation root directory
+doc/rst -- roverlay documentation (in reStructuredText)
+doc/html -- html version of the latest 'stable' rst documentation
+doc/man -- roverlay man pages
+doc/pydoc -- code self-documentation in html, can be created with 'make pydoc'
-Just run the main script, the '--repo-config' option can be used to use
-other repo config files (instead of the default one that downloads ~50GB of packages).
-The '--no-manifest' switch can be used to disable Manifest creation, which saves a
-considerable amount of time at the expense of an unusable overlay
-(but useful to analyze created metadata, ebuild and depres results).
-Test run example:
-<<
-#!/bin/sh
-./roverlay.py sync
-time ./main.py --nosync --stats -O /tmp/created_overlay --no-manifest
->>
+= Usage instructions =
-== Configuration ==
+./roverlay.py [option(s)] [command(s)]
-* main configuration
-see config/R-overlay.conf
+Please see ./roverlay.py --help for all options and/or doc/rst, doc/html for
+the full usage documentation, including software/hardware requirements.
-* repo configuration (CRAN,...)
-see man/roverlay-repo.5
-* description field configuration
-see config/description_fields.conf
+= Installation =
-* dependency rules configuration
-see man/roverlay-deprules.5
+See doc/rst and/or doc/html for installation instructions.
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-17 17:26 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-17 17:26 UTC (permalink / raw
To: gentoo-commits
commit: 277f7630a96acb3a3b7c137dfc8ae9f2351172a6
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 17 17:25:18 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 17 17:25:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=277f7630
do_pydoc.sh: create index.html symlink with -f
---
do_pydoc.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/do_pydoc.sh b/do_pydoc.sh
index 1adfb33..6814bcf 100755
--- a/do_pydoc.sh
+++ b/do_pydoc.sh
@@ -8,6 +8,6 @@ cd "$into"
find roverlay/ -name "*.py" | \
sed -e 's,\/,.,g' -e 's,[.]__init__[.]py$,,' -e 's,[.]py$,,' | \
xargs pydoc -w && \
- ln -s roverlay.html index.html && \
+ ln -fs roverlay.html index.html && \
rm -f -- roverlay
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-10 15:16 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-10 15:16 UTC (permalink / raw
To: gentoo-commits
commit: acb6be3fc50c10a4fca6634e8076d31e39ab496d
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 10 15:15:50 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 10 15:15:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=acb6be3f
ebuild: use /etc, add USE=bzip2
---
roverlay-9999.ebuild | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index e142d63..357665b 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -3,8 +3,8 @@
# $Header: $
EAPI="4"
-# python3_1 is probably supported, too (<2.7 is not)
-PYTHON_COMPAT="python2_7 python3_2"
+# python < 2.7 is not supported
+PYTHON_COMPAT="python2_7 python3_1 python3_2"
inherit base python-distutils-ng git-2
@@ -16,7 +16,7 @@ SRC_URI=""
LICENSE="GPL"
SLOT="0"
-IUSE=""
+IUSE="bzip2"
KEYWORDS=""
@@ -25,20 +25,26 @@ RDEPEND="${DEPEND:-}
dev-python/argparse
"
+_CONFDIR=/etc/${PN}
+
python_prepare_all() {
+ if use bzip2; then
+ einfo "USE=bzip2: Compressing dependency rule files"
+ bzip2 simple-deprules.d/* || die "Cannot compress dependency rules!"
+ fi
+ sed -f misc/sed_expression_roverlay_installed roverlay.py -i || \
+ die "sed expression, roverlay.py"
base_src_prepare
}
python_install_all() {
- insinto "/usr/share/${PN}"
- doins config/description_fields.conf config/R-overlay.conf repo.list
- if [[ -e "R-overlay.conf.install" ]]; then
- newins R-overlay.conf.install R-overlay.conf.quickstart
- else
- newins R-overlay.conf R-overlay.conf.quickstart
- fi
+ newbin roverlay.py roverlay
- doman man/?*.?*
+ insinto "${_CONFDIR}"
+ doins config/description_fields.conf repo.list
+ doins -r simple-deprules.d/
+ newins R-overlay.conf.install R-overlay.conf
- newbin roverlay.py roverlay
+ doman doc/man/*.*
+ dohtml doc/html/*
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-10 15:16 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-10 15:16 UTC (permalink / raw
To: gentoo-commits
commit: fe22bec5472fb8230bfc84d9b4ca3acdd05f4ada
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 10 15:12:37 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 10 15:12:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fe22bec5
Makefile: html target
---
Makefile | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index cf7f9c4..4a1452b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ SELFDOC := $(DOCDIR)/pydoc
default \
clean-log clean distclean _pyclean _pydoc_clean \
run-test run-sync test \
- pydoc $(SELFDOC) $(DOCDIR) doc \
+ pydoc $(SELFDOC) docs htmldoc html \
pyver \
install install-all \
install-roverlay install-pymodules \
@@ -57,8 +57,13 @@ _pydoc_clean:
distclean: clean _pyclean _pydoc_clean
# generates docs in $(DOCDIR)/
-$(DOCDIR): $(SELFDOC)
-docs: $(DOCDIR)
+$(DOCDIR):
+ @mkdir $(DOCDIR)
+
+$(DOCDIR)/html: $(DOCDIR)
+ @mkdir $(DOCDIR)/html
+
+docs: $(SELFDOC) htmldoc
$(SELFDOC)/roverlay:
test -d $(SELFDOC) || mkdir -p $(SELFDOC)
@@ -71,6 +76,11 @@ $(SELFDOC): $(SELFDOC)/roverlay
# alias to $(SELFDOC)
pydoc: $(SELFDOC)
+html: $(DOCDIR)/html $(DOCDIR)/rst/usage.rst
+ rst2html.py $(DOCDIR)/rst/usage.rst $(DOCDIR)/html/usage.html
+
+htmldoc: html
+
# sync all repos
run-sync: $(ROVERLAY_MAIN)
$(PYTHON) $(ROVERLAY_MAIN) sync
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-10 15:16 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-10 15:16 UTC (permalink / raw
To: gentoo-commits
commit: 13ff3702fb23b3339a99ac4bea1a274f5c9fdb64
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 10 15:14:12 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 10 15:14:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=13ff3702
main script: search for config file if ROVERLAY_INSTALLED
---
roverlay.py | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/roverlay.py b/roverlay.py
index 7b83230..3a0232a 100755
--- a/roverlay.py
+++ b/roverlay.py
@@ -14,7 +14,9 @@ import sys
# roverlay modules will be imported later
-HIDE_EXCEPTIONS = False
+ROVERLAY_INSTALLED = False
+HIDE_EXCEPTIONS = False
+CONFIG_FILE_NAME = "R-overlay.conf"
class DIE ( object ):
"""Container class for various system exit 'events'."""
@@ -148,10 +150,21 @@ def roverlay_main():
'nop' : 'does nothing',
}
+ DEFAULT_CONFIG_FILE = CONFIG_FILE_NAME
+
+ # search for the config file if roverlay has been installed
+ if ROVERLAY_INSTALLED and not os.path.exists ( DEFAULT_CONFIG_FILE ):
+ c = os.path.expanduser ( '~' ) + os.sep + '.' + CONFIG_FILE_NAME
+ if os.path.isfile ( c ):
+ DEFAULT_CONFIG_FILE = c
+ elif os.path.isfile ( '/etc/roverlay' + CONFIG_FILE_NAME ):
+ # os.sep is '/' if /etc exists, so don't care about that
+ DEFAULT_CONFIG_FILE = '/etc/roverlay' + CONFIG_FILE_NAME
+
commands, config_file, additional_config, extra_opts = \
roverlay.argutil.parse_argv (
command_map=COMMAND_DESCRIPTION,
- default_config_file="R-overlay.conf"
+ default_config_file=DEFAULT_CONFIG_FILE,
)
OPTION = extra_opts.get
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-10 15:16 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-10 15:16 UTC (permalink / raw
To: gentoo-commits
commit: 5a309c3d686ef177e97f4a493dfc030a60abb09a
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 10 15:08:17 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 10 15:08:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5a309c3d
R-overlay.conf.install: log levels, /usr/share -> /etc
---
R-overlay.conf.install | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/R-overlay.conf.install b/R-overlay.conf.install
index 42c88c4..9753847 100644
--- a/R-overlay.conf.install
+++ b/R-overlay.conf.install
@@ -16,7 +16,9 @@
# ---
-#LOG_LEVEL_FILE= WARNING
+#LOG_LEVEL = WARNING
+#LOG_LEVEL_CONSOLE = INFO
+#LOG_LEVEL_FILE = ERROR
# this enables per-run log files
#LOG_FILE_ROTATE = yes
@@ -26,12 +28,12 @@
# using the default field definition file
-FIELD_DEFINITION = /usr/share/roverlay/description_fields.conf
+FIELD_DEFINITION = /etc/roverlay/description_fields.conf
# using the default repo list
-REPO_CONFIG = /usr/share/roverlay/repo.list
+REPO_CONFIG = /etc/roverlay/repo.list
# using the default dependency rule files
-# you can extend this by appending other directories/files
-SIMPLE_RULES_FILE = "/usr/share/roverlay/simple-deprules.d"
-#SIMPLE_RULES_FILE = "/usr/share/roverlay/simple-deprules.d ~/roverlay/config/deprules.d"
+# Can be extended by appending other directories/files
+SIMPLE_RULES_FILE = "/etc/roverlay/simple-deprules.d"
+#SIMPLE_RULES_FILE = "/etc/roverlay/simple-deprules.d ~/roverlay/config/deprules.d"
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-08 23:46 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-08 23:46 UTC (permalink / raw
To: gentoo-commits
commit: 057cb7a59e8ac9571c14a1eb42d608e3c85e4046
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug 8 23:45:40 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug 8 23:45:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=057cb7a5
config file skel for roverlay installations
---
R-overlay.conf.install | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/R-overlay.conf.install b/R-overlay.conf.install
new file mode 100644
index 0000000..42c88c4
--- /dev/null
+++ b/R-overlay.conf.install
@@ -0,0 +1,37 @@
+# R-overlay.conf
+# This is the default config file for roverlay installations
+
+# --- Required Configuration ---
+
+# DISTFILES has to be set
+# this is the directory where per-repo package directories will be created
+#DISTFILES="~/roverlay/distfiles"
+
+# OVERLAY_DIR has to be set
+# this is the directory of the overlay to be created/maintained
+#OVERLAY_DIR="~/roverlay/overlay"
+
+# LOG_FILE should be set
+#LOG_FILE="~/roverlay/log/roverlay.log"
+
+# ---
+
+#LOG_LEVEL_FILE= WARNING
+
+# this enables per-run log files
+#LOG_FILE_ROTATE = yes
+
+# number of backup log files to keep
+#LOG_FILE_ROTATE_COUNT = 5
+
+
+# using the default field definition file
+FIELD_DEFINITION = /usr/share/roverlay/description_fields.conf
+
+# using the default repo list
+REPO_CONFIG = /usr/share/roverlay/repo.list
+
+# using the default dependency rule files
+# you can extend this by appending other directories/files
+SIMPLE_RULES_FILE = "/usr/share/roverlay/simple-deprules.d"
+#SIMPLE_RULES_FILE = "/usr/share/roverlay/simple-deprules.d ~/roverlay/config/deprules.d"
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-08 23:46 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-08 23:46 UTC (permalink / raw
To: gentoo-commits
commit: c8c9a4d515e6c350482139cc0311ab27c0507b9e
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug 8 23:44:44 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug 8 23:44:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c8c9a4d5
Makfile: install/uninstall targets
---
Makefile | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 2af9870..cf7f9c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
# Some make targets for testing / distribution
+# DESTDIR :=
+BINDIR := $(DESTDIR)/usr/local/bin
+PYMOD_FILE_LIST := ./roverlay_files.list
+
MANIFEST := MANIFEST
MANIFEST_TMP := $(MANIFEST).tmp
@@ -12,8 +16,8 @@ LOGDIR := ./log
ROVERLAY_MAIN := ./roverlay.py
-PYVER := 2
-PY = python$(PYVER)
+PYVER :=
+PYTHON := python$(PYVER)
PYDOC_SH = ./do_pydoc.sh
DOCDIR := ./doc
@@ -24,24 +28,33 @@ SELFDOC := $(DOCDIR)/pydoc
default \
clean-log clean distclean _pyclean _pydoc_clean \
run-test run-sync test \
- pydoc $(SELFDOC) $(DOCDIR) doc
+ pydoc $(SELFDOC) $(DOCDIR) doc \
+ pyver \
+ install install-all \
+ install-roverlay install-pymodules \
+ uninstall uninstall-all \
+ uninstall-roverlay uninstall-pymodules
default:
@false
+pyver:
+ @$(PYTHON) --version
+
clean-log:
rm -rf -- $(LOGDIR)
clean:
- @true
+ rm -rf build/
_pyclean:
find . -name "*.pyc" -or -name "*.pyo" -delete
+
_pydoc_clean:
rm -f -- $(SELFDOC)/*.html
! test -d $(SELFDOC) || rmdir --ignore-fail-on-non-empty -- $(SELFDOC)/
-distclean: _pyclean _pydoc_clean
+distclean: clean _pyclean _pydoc_clean
# generates docs in $(DOCDIR)/
$(DOCDIR): $(SELFDOC)
@@ -60,11 +73,11 @@ pydoc: $(SELFDOC)
# sync all repos
run-sync: $(ROVERLAY_MAIN)
- $(PY) $(ROVERLAY_MAIN) sync
+ $(PYTHON) $(ROVERLAY_MAIN) sync
# this is the 'default' test run command
run-test: $(ROVERLAY_MAIN)
- $(PY) $(ROVERLAY_MAIN) --nosync --stats -O /tmp/overlay
+ $(PYTHON) $(ROVERLAY_MAIN) --nosync --stats -O /tmp/overlay
# sync and do a test run afterwards
test: run-sync run-test
@@ -80,3 +93,25 @@ $(MANIFEST): $(MANIFEST_TMP)
release: $(MANIFEST) $(SETUP_PY)
@test -d $(PKG_DISTDIR) || @mkdir -- $(PKG_DISTDIR)
./$(SETUP_PY) sdist --dist-dir=$(PKG_DISTDIR) --formats=bztar
+
+
+install-roverlay: ./roverlay.py
+ install -T -D -- ./roverlay.py $(BINDIR)/roverlay
+
+install-pymodules: ./setup.py
+ $(PYTHON) ./setup.py install --record $(PYMOD_FILE_LIST)
+
+install-all: install
+
+install: install-pymodules install-roverlay
+
+uninstall-roverlay:
+ rm -vf -- $(BINDIR)/roverlay
+
+uninstall-pymodules: $(PYMOD_FILE_LIST)
+ xargs rm -vrf < $(PYMOD_FILE_LIST)
+
+uninstall-all: uninstall
+
+uinstall:
+ @false
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-07 8:50 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-07 8:50 UTC (permalink / raw
To: gentoo-commits
commit: 2bf86afb32657de414b0a31cc8441350e7cec54c
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug 7 08:48:32 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug 7 08:48:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2bf86afb
Makefile mkdir, not @mkdir
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 52f5c4b..2af9870 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ $(DOCDIR): $(SELFDOC)
docs: $(DOCDIR)
$(SELFDOC)/roverlay:
- test -d $(SELFDOC) || @mkdir -p $(SELFDOC)
+ test -d $(SELFDOC) || mkdir -p $(SELFDOC)
@ln -s ../../roverlay $(SELFDOC)/roverlay
# generates selfdocs (using pydoc) in $(SELFDOC)/
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-06 19:01 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-06 19:01 UTC (permalink / raw
To: gentoo-commits
commit: f3b701a6299f6759a8194bf01a05debba1f7c467
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Aug 6 15:11:48 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Aug 6 15:14:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f3b701a6
helper scripts and Makefile
---
Makefile | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++
create_manifest.sh | 24 +++++++++++++++
do_pydoc.sh | 13 ++++++++
3 files changed, 119 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..52f5c4b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,82 @@
+# Some make targets for testing / distribution
+
+MANIFEST := MANIFEST
+MANIFEST_TMP := $(MANIFEST).tmp
+
+MANIFEST_GEN := ./create_manifest.sh
+
+SETUP_PY := ./setup.py
+PKG_DISTDIR := ./release
+
+LOGDIR := ./log
+
+ROVERLAY_MAIN := ./roverlay.py
+
+PYVER := 2
+PY = python$(PYVER)
+PYDOC_SH = ./do_pydoc.sh
+
+DOCDIR := ./doc
+
+SELFDOC := $(DOCDIR)/pydoc
+
+.PHONY: $(MANIFEST_TMP) $(MANIFEST) \
+ default \
+ clean-log clean distclean _pyclean _pydoc_clean \
+ run-test run-sync test \
+ pydoc $(SELFDOC) $(DOCDIR) doc
+
+default:
+ @false
+
+clean-log:
+ rm -rf -- $(LOGDIR)
+
+clean:
+ @true
+
+_pyclean:
+ find . -name "*.pyc" -or -name "*.pyo" -delete
+_pydoc_clean:
+ rm -f -- $(SELFDOC)/*.html
+ ! test -d $(SELFDOC) || rmdir --ignore-fail-on-non-empty -- $(SELFDOC)/
+
+distclean: _pyclean _pydoc_clean
+
+# generates docs in $(DOCDIR)/
+$(DOCDIR): $(SELFDOC)
+docs: $(DOCDIR)
+
+$(SELFDOC)/roverlay:
+ test -d $(SELFDOC) || @mkdir -p $(SELFDOC)
+ @ln -s ../../roverlay $(SELFDOC)/roverlay
+
+# generates selfdocs (using pydoc) in $(SELFDOC)/
+$(SELFDOC): $(SELFDOC)/roverlay
+ $(PYDOC_SH) $(SELFDOC)
+
+# alias to $(SELFDOC)
+pydoc: $(SELFDOC)
+
+# sync all repos
+run-sync: $(ROVERLAY_MAIN)
+ $(PY) $(ROVERLAY_MAIN) sync
+
+# this is the 'default' test run command
+run-test: $(ROVERLAY_MAIN)
+ $(PY) $(ROVERLAY_MAIN) --nosync --stats -O /tmp/overlay
+
+# sync and do a test run afterwards
+test: run-sync run-test
+
+$(MANIFEST_TMP): $(MANIFEST_GEN)
+ $(MANIFEST_GEN) > $(MANIFEST_TMP)
+
+# creates a MANIFEST file for setup.py
+$(MANIFEST): $(MANIFEST_TMP)
+ mv -- $(MANIFEST_TMP) $(MANIFEST)
+
+# creates a src tarball (.tar.bz2)
+release: $(MANIFEST) $(SETUP_PY)
+ @test -d $(PKG_DISTDIR) || @mkdir -- $(PKG_DISTDIR)
+ ./$(SETUP_PY) sdist --dist-dir=$(PKG_DISTDIR) --formats=bztar
diff --git a/create_manifest.sh b/create_manifest.sh
new file mode 100755
index 0000000..f1cbf3c
--- /dev/null
+++ b/create_manifest.sh
@@ -0,0 +1,24 @@
+#!/bin/sh -xe
+SCRIPTS="roverlay.py"
+FILES="README"
+PYDIRS="roverlay"
+
+# config files, docs?
+
+[ -x setup.py ]
+echo setup.py
+
+for x in $SCRIPTS; do
+ [ -x "$x" ]
+ echo "$x"
+done
+
+for x in $FILES; do
+ [ -e "$x" ]
+ echo "$x"
+done
+
+for x in $PYDIRS; do
+ [ -d "$x" ]
+ find "$x" -name '*.py'
+done
diff --git a/do_pydoc.sh b/do_pydoc.sh
new file mode 100755
index 0000000..1adfb33
--- /dev/null
+++ b/do_pydoc.sh
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+into="${1:?}"
+
+cd "$into"
+[ -e ./roverlay ]
+
+find roverlay/ -name "*.py" | \
+ sed -e 's,\/,.,g' -e 's,[.]__init__[.]py$,,' -e 's,[.]py$,,' | \
+ xargs pydoc -w && \
+ ln -s roverlay.html index.html && \
+ rm -f -- roverlay
+
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-03 15:04 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-03 15:04 UTC (permalink / raw
To: gentoo-commits
commit: f6015209c0aad134c96914a205c15236060fa62e
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 3 15:03:00 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 3 15:03:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f6015209
roverlay live ebuild
The ebuild is *highly* experimental (particularly the example config file
destination, /usr/share/roverlay-9999) and should be regarded as first attempt.
---
roverlay-9999.ebuild | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
new file mode 100644
index 0000000..fdcdc00
--- /dev/null
+++ b/roverlay-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+# python3_1 is probably supported, too (<2.7 is not)
+PYTHON_COMPAT="python2_7 python3_2"
+
+inherit base python-distutils-ng git-2
+
+EGIT_REPO_URI='git://git.overlays.gentoo.org/proj/R_overlay.git'
+
+DESCRIPTION="Automatically generated overlay of R packages (SoC2012)"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
+SRC_URI=""
+
+LICENSE="GPL-2" #?
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND:-}
+ dev-python/argparse
+"
+
+python_prepare_all() {
+ base_src_prepare
+}
+
+python_install_all() {
+ insinto "/usr/share/${PN}"
+ doins config/description_fields.conf config/R-overlay.conf repo.list
+ if [[ -e "R-overlay.conf.install" ]]; then
+ newins R-overlay.conf.install R-overlay.conf.quickstart
+ else
+ newins R-overlay.conf R-overlay.conf.quickstart
+ fi
+
+ doman man/?*.?*
+
+ newbin roverlay.py roverlay
+}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-03 15:04 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-03 15:04 UTC (permalink / raw
To: gentoo-commits
commit: 90f2ed47f9ff87a81b8b88f0b4abc57e1e674e3e
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 3 15:01:31 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 3 15:01:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=90f2ed47
exclude roverlay.py from setup.py
---
setup.py | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
index 242ec34..6d5c7f5 100755
--- a/setup.py
+++ b/setup.py
@@ -3,15 +3,27 @@
from distutils import core
+VERSION = '0.1'
+
core.setup (
name = 'R_Overlay',
- version = '0.1',
+ version = VERSION,
description = 'Automatically generated overlay of R packages (SoC2012)',
author = 'André Erdmann',
author_email = 'dywi@mailerd.de',
license = 'GPL-2', #?
url = 'http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary',
-# py_modules = ['roverlay'],
- packages = ( 'roverlay', ),
- scripts = ( 'roverlay.py', ),
+ packages = (
+ 'roverlay',
+ 'roverlay/config',
+ 'roverlay/depres',
+ 'roverlay/depres/simpledeprule',
+ 'roverlay/ebuild',
+ 'roverlay/overlay',
+ 'roverlay/overlay/manifest',
+ 'roverlay/overlay/metadata',
+ 'roverlay/recipe',
+ 'roverlay/remote',
+ 'roverlay/rpackage',
+ ),
)
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-03 15:04 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-03 15:04 UTC (permalink / raw
To: gentoo-commits
commit: c17fd1b5b4ecfd8baf45fa4d296a45476560249a
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 3 14:59:51 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 3 14:59:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c17fd1b5
Revert "fix __name__ check in roverlay.py"
This reverts commit 05a9261e481711e2b8fc932b2f0f5bc901fd978b.
Importing roverlay.<sth> doesn't work if __name__ == 'roverlay'.
---
roverlay.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/roverlay.py b/roverlay.py
index 06cce51..bd250ea 100755
--- a/roverlay.py
+++ b/roverlay.py
@@ -35,7 +35,7 @@ class DIE ( object ):
die = DIE.die
-if __name__ not in ( '__main__', 'roverlay' ):
+if __name__ != '__main__':
die ( "Please don't import this script...", DIE.BAD_USAGE )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-03 15:04 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-03 15:04 UTC (permalink / raw
To: gentoo-commits
commit: 76a984eaa434a769bc44e76e3edbbc51628344e7
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 3 15:01:12 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 3 15:01:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=76a984ea
gitignore: *.pyo
---
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 65700a2..ecef8dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.pyc
+*.pyo
*~
~*
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-03 13:59 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-03 13:59 UTC (permalink / raw
To: gentoo-commits
commit: 05a9261e481711e2b8fc932b2f0f5bc901fd978b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 3 14:00:03 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 3 14:00:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=05a9261e
fix __name__ check in roverlay.py
---
roverlay.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/roverlay.py b/roverlay.py
index bd250ea..06cce51 100755
--- a/roverlay.py
+++ b/roverlay.py
@@ -35,7 +35,7 @@ class DIE ( object ):
die = DIE.die
-if __name__ != '__main__':
+if __name__ not in ( '__main__', 'roverlay' ):
die ( "Please don't import this script...", DIE.BAD_USAGE )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-03 13:38 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-03 13:38 UTC (permalink / raw
To: gentoo-commits
commit: 4854dd5bb36abd4d65eea45e9239ebd1bcd0de85
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 3 13:38:30 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 3 13:38:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=4854dd5b
setup.py script
---
setup.py | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..242ec34
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from distutils import core
+
+core.setup (
+ name = 'R_Overlay',
+ version = '0.1',
+ description = 'Automatically generated overlay of R packages (SoC2012)',
+ author = 'André Erdmann',
+ author_email = 'dywi@mailerd.de',
+ license = 'GPL-2', #?
+ url = 'http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary',
+# py_modules = ['roverlay'],
+ packages = ( 'roverlay', ),
+ scripts = ( 'roverlay.py', ),
+)
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-03 13:38 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-03 13:38 UTC (permalink / raw
To: gentoo-commits
commit: a55be8a75a4b925780961ee9c75732fdb176542d
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 3 13:38:03 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 3 13:38:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a55be8a7
gitignore
---
.gitignore | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 37f28cc..65700a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,19 @@
-/examples/packages/*.tgz
-/examples/packages/*.tar.gz
-/bak/
-/perf-stats/
-/log/
-
-# these are just symlinks to files in roverlay/
-/c.py
-/x.py
-
-
*.pyc
*~
~*
*.swp
-roverlay.log
-/TODO
+/roverlay/debug.py
-/distfiles-root/
-/overlay-root/
-/desc-files/
+/MANIFEST
+
+/*log/
+/sh/
+/release/
+
+/TODO
+/desc-files
+/distfiles-root
+/created_overlay
-/roverlay/debug.py
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-01 21:10 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-01 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 9da0b46dba9d6021f180464ed7697f4121cc73be
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug 1 12:15:53 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug 1 12:15:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9da0b46d
R-Forge
---
repo.list | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/repo.list b/repo.list
index 0351585..0d52013 100644
--- a/repo.list
+++ b/repo.list
@@ -29,6 +29,12 @@ rsync_uri = bioconductor.org::2.10/data/experiment/src/contrib
src_uri = http://bioconductor.org/packages/2.10/data/experiment/src/contrib
extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
+[R-Forge]
+type = rsync
+rsync_uri = download.r-forge.r-project.org::R-Forge/src/contrib
+src_uri = http://download.r-forge.r-project.org/src/contrib
+extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
+
[omegahat]
type = websync_repo
src_uri = http://www.omegahat.org/R/src/contrib
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-08-01 7:38 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-08-01 7:38 UTC (permalink / raw
To: gentoo-commits
commit: d5dff74ce9a2274de7187ed9795a7cf5261590da
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Aug 1 07:38:53 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Aug 1 07:38:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d5dff74c
repo.list: bioc-2.10 annotation/experiment
---
repo.list | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/repo.list b/repo.list
index f36c275..0351585 100644
--- a/repo.list
+++ b/repo.list
@@ -11,8 +11,30 @@ src_uri = http://cran.r-project.org/src/contrib/Archive
extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
recursive = yes
-[BIOC-2.10]
+[BIOC-2.10/bioc]
type = rsync
rsync_uri = bioconductor.org::2.10/bioc/src/contrib
src_uri = http://bioconductor.org/packages/2.10/bioc/src/contrib/
extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
+
+[BIOC-2.10/annotation]
+type = rsync
+rsync_uri = bioconductor.org::2.10/data/annotation/src/contrib
+src_uri = http://bioconductor.org/packages/2.10/data/annotation/src/contrib
+extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
+
+[BIOC-2.10/experiment]
+type = rsync
+rsync_uri = bioconductor.org::2.10/data/experiment/src/contrib
+src_uri = http://bioconductor.org/packages/2.10/data/experiment/src/contrib
+extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
+
+[omegahat]
+type = websync_repo
+src_uri = http://www.omegahat.org/R/src/contrib
+# !! RKML has wrong md5 sum in PACKAGES
+digest = md5
+
+#[http-packages]
+#type = websync_pkglist
+#pkglist = config/pkglist_http
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-30 15:53 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-30 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 63f604ff55c6d38fc4d9298ccaf8fffea03e4bab
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 30 15:50:38 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 30 15:53:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=63f604ff
repo.list: BIOC-2.10
---
repo.list | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/repo.list b/repo.list
index 5d3d12b..f36c275 100644
--- a/repo.list
+++ b/repo.list
@@ -11,8 +11,8 @@ src_uri = http://cran.r-project.org/src/contrib/Archive
extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
recursive = yes
-[BIOC]
+[BIOC-2.10]
type = rsync
-rsync_uri = bioconductor.org::2.11/bioc/src/contrib
-src_uri = http://bioconductor.org/packages/2.11/bioc/src/contrib/
+rsync_uri = bioconductor.org::2.10/bioc/src/contrib
+src_uri = http://bioconductor.org/packages/2.10/bioc/src/contrib/
extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-30 15:53 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-30 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 146b5a9899a85ef3c4a1af3d06887fdef67d7bbe
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 30 15:46:31 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 30 15:53:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=146b5a98
fix typo
---
find_invalid.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/find_invalid.py b/find_invalid.py
index 95a3876..dbd6b87 100755
--- a/find_invalid.py
+++ b/find_invalid.py
@@ -43,7 +43,7 @@ def ebuild_check ( filenames ):
if eb and mtd and man:
return ( True, True, True )
- return ( eb, man, mtd )
+ return ( eb, mtd, man )
for dpath, dnames, fnames in os.walk ( topdir ):
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-16 16:15 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-16 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 5c4501e6e171b211febf308a41eba9bd7180b44b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 16 11:19:40 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 16 11:19:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5c4501e6
fix newline
---
make_repoconf_cran-letters.bash | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/make_repoconf_cran-letters.bash b/make_repoconf_cran-letters.bash
index 2a080d9..6a623e2 100755
--- a/make_repoconf_cran-letters.bash
+++ b/make_repoconf_cran-letters.bash
@@ -28,7 +28,7 @@ for x in $*; do
kw="$low" _in $CHARS && continue
CHARS+=" $low"
- [[ -z "$first" ]] || { first=; echo; }
+ [[ -z "$first" ]] && echo || first=
cat << END_REPO
[CRAN_test/letter_${high}]
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-11 18:43 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-11 18:43 UTC (permalink / raw
To: gentoo-commits
commit: c093c088bd20bbc59bd9ee947788422745a12dca
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 11 18:43:48 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 11 18:43:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c093c088
depres console (main script)
* added depres console to roverlay.py
modified: roverlay.py
---
roverlay.py | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/roverlay.py b/roverlay.py
index ce1189f..ae67d6a 100755
--- a/roverlay.py
+++ b/roverlay.py
@@ -11,6 +11,7 @@ class DIE ( object ):
NOP = os.EX_OK
ERR = 1
BAD_USAGE = os.EX_USAGE
+ USAGE = os.EX_USAGE
ARG = 9
CONFIG = os.EX_CONFIG
OV_CREATE = 20
@@ -54,7 +55,8 @@ COMMAND_DESCRIPTION = {
'sync' : 'sync repos',
'create' : 'create the overlay '
'(implies sync, override with --nosync)',
-# 'depres_console' : 'run an interactive depres console; TODO/REMOVE',
+ 'depres_console' : 'run an interactive depres console (highly experimental)',
+ 'depres' : 'this is an alias to \'depres_console\'',
'nop' : 'does nothing',
}
@@ -131,6 +133,27 @@ if not actions:
# this happens if a command is nop
die ( "Nothing to do!", DIE.NOP )
+if 'depres_console' in actions or 'depres' in actions:
+ if len ( actions ) != 1:
+ die ( "depres_console cannot be run with other commands!", DIE.USAGE )
+
+ try:
+ from roverlay.depres.simpledeprule.console import DepResConsole
+ con = DepResConsole()
+ con.run()
+ sys.exit ( os.EX_OK )
+ except ImportError:
+ if HIDE_EXCEPTIONS:
+ die ( "Cannot import depres console!", DIE.IMPORT )
+ else:
+ raise
+ except:
+ if HIDE_EXCEPTIONS:
+ die ( "Exiting on console error!", DIE.ERR )
+ else:
+ raise
+
+
# -- import roverlay modules
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-11 18:43 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-11 18:43 UTC (permalink / raw
To: gentoo-commits
commit: b600b0ca557e32eb23c934938b93df1db5149aae
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 11 18:41:41 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 11 18:41:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b600b0ca
letter-stats.sh
* collects the number of packages that start with the same char,
e.g. 300 with 'R', 100 with 'A', ..
new file: letter-stats.sh
---
letter-stats.sh | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/letter-stats.sh b/letter-stats.sh
new file mode 100755
index 0000000..27434bb
--- /dev/null
+++ b/letter-stats.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+: ${DIST:=./distfiles-root/CRAN}
+
+c= n=
+for c in {a..z} {0..9}; do
+ n=`2>/dev/null ls -1 "$DIST"/{${c},${c^^}}* | wc -l`
+ [[ -z "$n" ]] || [[ $n -eq 0 ]] || echo -e "${n}\t${c}"
+done | sort -n
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-10 18:03 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-10 18:03 UTC (permalink / raw
To: gentoo-commits
commit: b9e4ff534ebba09fd8b2f22df9de35da4cdc3bd6
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 10 18:03:15 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 10 18:03:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b9e4ff53
mkrepo.sh
This can be used to create repo config files for running tests
new file: make_repoconf_cran-letters.bash
new file: mkrepo.sh
---
make_repoconf_cran-letters.bash | 45 +++++++++++++++++++++++++++++++++++++++
mkrepo.sh | 1 +
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/make_repoconf_cran-letters.bash b/make_repoconf_cran-letters.bash
new file mode 100755
index 0000000..2a080d9
--- /dev/null
+++ b/make_repoconf_cran-letters.bash
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Creates repo entries for packages from CRAN that
+# start with a specific letter.
+# Usage: $0 word [word]...,
+# where the first char of each word is used
+# Automatically detects duplicates.
+set +o history
+
+TRUE=0
+FALSE=1
+
+[[ $# -gt 0 ]] || { 1>&2 echo "Usage: $0 word [word]..."; exit 2; }
+
+_in() {
+ local z
+ for z in $*; do [[ "$kw" != "$z" ]] || return $TRUE; done
+ return $FALSE
+}
+
+CHARS=""
+
+first=y
+for x in $*; do
+ char="${x::1}"
+ low="${char,,}"
+ high="${char^^}"
+
+ kw="$low" _in $CHARS && continue
+ CHARS+=" $low"
+
+ [[ -z "$first" ]] || { first=; echo; }
+
+ cat << END_REPO
+[CRAN_test/letter_${high}]
+# A repo that sync only packages starting with ${low} or ${high}
+
+# repo's distdir is <distroot>/CRAN_test/letter_${high}
+type = rsync
+rsync_uri = cran.r-project.org::CRAN/src/contrib
+src_uri = http://cran.r-project.org/src/contrib
+extra_rsync_opts = --progress --include=${low}* --include=${high}* --exclude=*
+END_REPO
+# @EOF >> cat
+done
+[[ "${CHARS# }" ]]
diff --git a/mkrepo.sh b/mkrepo.sh
new file mode 120000
index 0000000..27c2bb8
--- /dev/null
+++ b/mkrepo.sh
@@ -0,0 +1 @@
+make_repoconf_cran-letters.bash
\ No newline at end of file
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-09 17:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-09 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 54b86d8e7cd7d3920ae12e381ca97c111d9efe34
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 9 16:38:16 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 9 16:38:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=54b86d8e
remove nop.py (unused)
---
nop.py | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/nop.py b/nop.py
deleted file mode 100755
index 8c963b5..0000000
--- a/nop.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2006-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-import roverlay
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-09 17:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-09 17:19 UTC (permalink / raw
To: gentoo-commits
commit: d426c9bcec65c1966726157dfe46ea3ce2cb9d6e
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 9 16:37:15 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 9 16:37:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d426c9bc
add man page to README
---
README | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/README b/README
index e9a9f6f..3be012c 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ There is currently no "R overlay" script, only modules that implement functional
Real tests are scheduled for July 10 - July 30.
-A main script is available. See ./roverlay.py --help for usage.
+A main script is available. See man/roverlay.1 or ./roverlay.py --help for usage.
== Configuration ==
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-09 17:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-09 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 78ca6a4c4a2cad2cbd3281ec9cd5ebfe008b799a
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 9 16:44:24 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 9 16:44:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=78ca6a4c
find_invalid.py: verify overlay creation
new file: find_invalid.py
---
find_invalid.py | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/find_invalid.py b/find_invalid.py
new file mode 100755
index 0000000..95a3876
--- /dev/null
+++ b/find_invalid.py
@@ -0,0 +1,84 @@
+#!/usr/bin/python
+# scans a directory for bad overlay creation results:
+# * empty dirs
+# * missing metadata/Manifest)
+# In contrast to repoman, it does verify that overlay creation succeeded,
+# not that every ebuild is correct.
+
+import os
+import sys
+
+MISSING_METADATA = set()
+MISSING_MANIFEST = set()
+EMPTY = set()
+
+no_metadata = MISSING_METADATA.add
+no_manifest = MISSING_MANIFEST.add
+empty = EMPTY.add
+
+if len ( sys.argv ) != 2:
+ sys.stderr.write ( "usage: {} <dir>\n".format ( sys.argv [0] ) )
+ sys.exit ( os.EX_USAGE )
+
+topdir = os.path.abspath ( sys.argv [1] )
+
+if not os.path.isdir ( topdir ):
+ sys.stderr.write ( "{!r} isn't a directory!\n".format ( topdir ) )
+ sys.exit ( os.EX_USAGE )
+
+def ebuild_check ( filenames ):
+ man = False
+ mtd = False
+ eb = False
+ for f in filenames:
+ if f.endswith ( '.ebuild' ):
+ eb = True
+
+ elif f == 'metadata.xml':
+ mtd = True
+
+ elif f == 'Manifest':
+ man = True
+
+ if eb and mtd and man:
+ return ( True, True, True )
+
+ return ( eb, man, mtd )
+
+
+for dpath, dnames, fnames in os.walk ( topdir ):
+ here = dpath.replace ( topdir, "<overlay root>" )
+
+ e = ebuild_check ( fnames )
+
+ if e[0]:
+
+ if not e[1]:
+ # metadata missing
+ no_metadata ( here )
+
+ if not e[2]:
+ # manifest missing
+ no_manifest ( here )
+
+ elif len ( dnames ) == 0 and len ( fnames ) == 0:
+ empty ( here )
+
+
+ALL_OK = not ( MISSING_METADATA or MISSING_MANIFEST or EMPTY )
+
+if MISSING_METADATA:
+ print ( "*** The following ebuild directories have no metadata file:" )
+ print ( '\n'.join ( sorted ( MISSING_METADATA ) ) )
+
+if MISSING_MANIFEST:
+ print ( "*** The following ebuild directories have no Manifest file:" )
+ print ( '\n'.join ( sorted ( MISSING_MANIFEST ) ) )
+
+if EMPTY:
+ print ( "*** The following dirs are empty:" )
+ print ( '\n'.join ( sorted ( EMPTY ) ) )
+
+
+if ALL_OK:
+ print ( "everything looks ok" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-09 17:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-09 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 2a93dae11e32165040f1e9af3dd2e49d647c0e05
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul 9 16:26:48 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul 9 16:26:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2a93dae1
move main.py -> roverlay.py
modified: README
typechange: main.py
renamed: main.py -> roverlay.py
---
README | 2 +-
main.py | 242 +-----------------------------------------------
main.py => roverlay.py | 0
3 files changed, 2 insertions(+), 242 deletions(-)
diff --git a/README b/README
index 542fa30..e9a9f6f 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ There is currently no "R overlay" script, only modules that implement functional
Real tests are scheduled for July 10 - July 30.
-A main script is available. See ./main.py --help for usage.
+A main script is available. See ./roverlay.py --help for usage.
== Configuration ==
diff --git a/main.py b/main.py
deleted file mode 100755
index ce1189f..0000000
--- a/main.py
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-# roverlay modules will be imported later
-
-HIDE_EXCEPTIONS = False
-
-class DIE ( object ):
- NOP = os.EX_OK
- ERR = 1
- BAD_USAGE = os.EX_USAGE
- ARG = 9
- CONFIG = os.EX_CONFIG
- OV_CREATE = 20
- SYNC = 30
- CMD_LEFTOVER = 90
- IMPORT = 91
- UNKNOWN = 95
- INTERRUPT = 130
-
- @staticmethod
- def die ( msg=None, code=None ):
- code = DIE.ERR if code is None else code
- if msg is not None:
- sys.stderr.write ( msg + "\n" )
-# else:
-# sys.stderr.write ( "died.\n" )
- sys.exit ( code )
- # --- end of die (...) ---
-
-# --- DIE: exit codes ---
-die = DIE.die
-
-
-if __name__ != '__main__':
- die ( "Please don't import this script...", DIE.BAD_USAGE )
-
-
-# get args
-# imports roverlay.argutil (deleted when done)
-
-
-try:
- import roverlay.argutil
-except ImportError:
- if HIDE_EXCEPTIONS:
- die ( "Cannot import roverlay modules!", DIE.IMPORT )
- else:
- raise
-
-COMMAND_DESCRIPTION = {
- 'sync' : 'sync repos',
- 'create' : 'create the overlay '
- '(implies sync, override with --nosync)',
-# 'depres_console' : 'run an interactive depres console; TODO/REMOVE',
- 'nop' : 'does nothing',
-}
-
-commands, config_file, additional_config, extra_opts = \
- roverlay.argutil.parse_argv (
- CMD_DESC=COMMAND_DESCRIPTION,
- DEFAULT_CONFIG="R-overlay.conf"
- )
-
-OPTION = extra_opts.get
-
-del roverlay.argutil
-
-# -- load config
-
-# imports: roverlay, roverlay.config.entryutil (if --help-config)
-
-try:
- import roverlay
-except ImportError:
- if HIDE_EXCEPTIONS:
- die ( "Cannot import roverlay modules!", DIE.IMPORT )
- else:
- raise
-
-try:
- conf = roverlay.load_config_file (
- config_file,
- extraconf=additional_config
- )
- del config_file, additional_config
-except:
- if HIDE_EXCEPTIONS:
- die ( "Cannot load config file {!r}.".format ( config_file ), DIE.CONFIG )
- else:
- raise
-
-if OPTION ( 'list_config' ):
- try:
- from roverlay.config.entryutil import list_entries
- print ( "== main config file ==\n" )
- print ( list_entries() )
- except:
- raise
- die ( "Cannot list config entries!" )
-
- EXIT_AFTER_CONFIG = True
-
-if OPTION ( 'print_config' ):
- try:
- conf.visualize ( into=sys.stdout )
- except:
- die ( "Cannot print config!" )
- EXIT_AFTER_CONFIG = True
-
-
-if 'EXIT_AFTER_CONFIG' in locals() and EXIT_AFTER_CONFIG:
- sys.exit ( os.EX_OK )
-
-
-# -- determine commands to run
-# (TODO) could replace this section when adding more actions
-# imports roverlay.remote, roverlay.overlay.creator
-
-actions = set ( filter ( lambda x : x != 'nop', commands ) )
-
-if 'sync' in actions and OPTION ( 'nosync' ):
- die ( "sync command blocked by --nosync opt.", DIE.ARG )
-
-del commands
-
-
-if not actions:
- # this happens if a command is nop
- die ( "Nothing to do!", DIE.NOP )
-
-
-# -- import roverlay modules
-
-try:
- from roverlay.remote import RepoList
- from roverlay.overlay.creator import OverlayCreator
-except ImportError:
- if HIDE_EXCEPTIONS:
- die ( "Cannot import roverlay modules!", DIE.IMPORT )
- else:
- raise
-
-
-
-# -- run methods (and some vars)
-# imports: nothing
-
-actions_done = set()
-set_action_done = actions_done.add
-
-def optionally ( call, option, *args, **kw ):
- if OPTION ( option ):
- return call ( *args, **kw )
-# --- end of optionally (...) ---
-
-#repo_list = None
-#overlay = None
-def run_sync():
- if "sync" in actions_done: return
- try:
- # set up the repo list
- global repo_list
- repo_list = RepoList (
- sync_enabled = not OPTION ( 'nosync' ),
- force_distroot = OPTION ( 'force_distroot' )
- )
-
- ## extra_opts->distdir ... TODO
- if 'distdirs' in extra_opts:
- repo_list.add_distdirs ( OPTION ( 'distdirs' ) )
- else:
- # default repo list
- repo_list.load()
-
- ## this runs _nosync() or _sync(), depending on extra_opts->nosync
- repo_list.sync()
-
- set_action_done ( "sync" )
-
- except KeyboardInterrupt:
- die ( "Interrupted", DIE.INTERRUPT )
- except:
- if HIDE_EXCEPTIONS:
- die (
- "nosync() failed!" if OPTION ( "nosync" ) \
- else "sync() failed!",
- DIE.SYNC
- )
- else:
- raise
-# --- end of run_sync() ---
-
-def run_overlay_create():
- if "create" in actions_done: return
- #run_sync()
- try:
- global overlay
- overlay = OverlayCreator()
- # explicitly allow overlay writing (FIXME: remove that in OverlayCreator)
- overlay.can_write_overlay = OPTION ( 'write_overlay' )
-
- repo_list.add_packages ( overlay.add_package )
-
- overlay.run ( close_when_done=True )
-
- optionally ( overlay.write_overlay, 'write_overlay' )
- optionally ( overlay.show_overlay, 'show_overlay' )
- if OPTION ( 'print_stats' ): print ( "\n" + overlay.stats_str() )
-
- set_action_done ( "create" )
-
- except KeyboardInterrupt:
- die ( "Interrupted", DIE.INTERRUPT )
- except:
- if HIDE_EXCEPTIONS:
- die ( "Overlay creation failed.", DIE.OV_CREATE )
- else:
- raise
- finally:
- if 'overlay' in locals() and not overlay.closed:
- # This is important 'cause it unblocks remaining ebuild creation
- # jobs/threads, specifically waiting EbuildJobChannels in depres.
- # It also writes the deps_unresolved file
- overlay.close()
-# --- end of run_overlay_create() ---
-
-# -- run
-
-# always run sync 'cause commands = {create,sync} and create implies (no)sync
-run_sync()
-
-if 'create' in actions: run_overlay_create()
-
-if len ( actions ) > len ( actions_done ):
- die (
- "Some actions (out of %r) could not be performed!" % actions,
- DIE.CMD_LEFTOVER
- )
diff --git a/main.py b/main.py
new file mode 120000
index 0000000..34b2545
--- /dev/null
+++ b/main.py
@@ -0,0 +1 @@
+roverlay.py
\ No newline at end of file
diff --git a/main.py b/roverlay.py
similarity index 100%
copy from main.py
copy to roverlay.py
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-06 22:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-06 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 86fc5e04029b02deb9d63511bdc8c3eb218c39f4
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 6 22:15:33 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 6 22:15:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=86fc5e04
increase console log level
---
R-overlay.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index 60b2a9d..7e94dbc 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -4,7 +4,7 @@
LOG_LEVEL = INFO
LOG_CONSOLE = yes
-#LOG_LEVEL_CONSOLE = DEBUG
+LOG_LEVEL_CONSOLE = WARNING
LOG_FILE = log/roverlay.log
LOG_LEVEL_FILE = WARN
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-06 22:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-06 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 164f2489f93354310367628c89171c7a417c647a
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 6 22:17:37 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 6 22:17:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=164f2489
alternate repo config file
sync packages starting with "r" or "R" from CRAN
new file: repo_letter_r.list
---
repo_letter_r.list | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/repo_letter_r.list b/repo_letter_r.list
new file mode 100644
index 0000000..8ff6801
--- /dev/null
+++ b/repo_letter_r.list
@@ -0,0 +1,10 @@
+[CRAN_test/letter_R]
+# A repo that sync only packages starting with r or R (about 300M)
+
+# repo's distdir is <distroot>/test/letter_R
+# directory = <other directory?>
+
+type = rsync
+rsync_uri = cran.r-project.org::CRAN/src/contrib
+src_uri = http://cran.r-project.org/src/contrib
+extra_rsync_opts = --progress --include=r* --include=R* --exclude=*
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-06 8:15 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-06 8:15 UTC (permalink / raw
To: gentoo-commits
commit: eb8b49d5285cff1aed11157c55bec83c2e8be84d
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 6 08:14:06 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 6 08:14:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=eb8b49d5
typo
---
repo.list | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/repo.list b/repo.list
index d4a532c..868256f 100644
--- a/repo.list
+++ b/repo.list
@@ -4,7 +4,7 @@ rsync_uri = cran.r-project.org::CRAN/src/contrib
src_uri = http://cran.r-project.org/src/contrib
# directory = <distfiles root>/<name of this repo>
#extra_rsync_opts = --list-only
-extra_rsyc_opts = --progress
+extra_rsync_opts = --progress
#[BIOC]
#rsync_uri = bioconductor.org::2.10/bioc/src/contrib
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-05 16:01 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-05 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 7ef002f74cd9f39ae41108b64c2421a19d0e0fda
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 5 16:01:50 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 5 16:01:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7ef002f7
remove old (broken) test scripts
---
run_config.py | 15 ---------------
run_depres.py | 32 --------------------------------
run_desc.py | 25 -------------------------
run_sync.py | 40 ----------------------------------------
4 files changed, 0 insertions(+), 112 deletions(-)
diff --git a/run_config.py b/run_config.py
deleted file mode 100755
index b6e1cab..0000000
--- a/run_config.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-ARGV = sys.argv[1:]
-
-from roverlay import config
-
-for c in ARGV:
- print ( "<=== " + c + " ===>" )
- config.loader().load_config ( c )
- print ( ">=== " + c + " ===<" )
-
-conf = config.access()
-vis = conf.visualize ( into=sys.stdout )
diff --git a/run_depres.py b/run_depres.py
deleted file mode 100755
index 015d0e9..0000000
--- a/run_depres.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/python3
-
-import sys
-import os.path
-
-if len ( sys.argv ) < 2:
- print ( "Usage: %s <deps|dep_file>" % sys.argv[0] )
- exit ( 10 )
-
-if os.path.isfile ( sys.argv[1] ):
- print ( "reading a file" )
- with open ( sys.argv[1], 'r' ) as fh:
- deps = tuple ( x.strip() for x in filter ( None, fh.readlines() ) )
-else:
- deps = sys.argv[1:]
-
-
-from roverlay.recipe.easyresolver import setup as getres
-from roverlay.depres.channels import EbuildJobChannel
-
-
-R = getres()
-c = EbuildJobChannel ( name='chantest' )
-R.register_channel ( c )
-c.add_dependencies ( deps )
-
-
-if c.satisfy_request():
- print ( "Success!" )
- print ( str ( c.collect_dependencies() ) )
-else:
- print ( "<fail>" )
diff --git a/run_desc.py b/run_desc.py
deleted file mode 100755
index b69fae8..0000000
--- a/run_desc.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import logging
-import os.path
-
-ARGV = sys.argv[1:]
-
-from roverlay.rpackage import descriptionreader as d
-
-doinfo = d.make_desc_packageinfo
-Reader = d.DescriptionReader
-LOGGER = logging.getLogger()
-
-if not ARGV:
- ARGV = ( '/home/andre/tmp/R_overlay_2012-06-28/desc-files/ENmisc_1.2.4.desc', )
-
-
-for df in ARGV:
- df = os.path.abspath ( df )
- pinfo = doinfo ( df )
-
- r = Reader ( pinfo, LOGGER, read_now=False, write_desc=False )
-
- x = r.get_desc()
diff --git a/run_sync.py b/run_sync.py
deleted file mode 100755
index 8d50d85..0000000
--- a/run_sync.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-from sys import exit
-from sys import argv as ARGV
-
-if True in ( x in ARGV for x in ( '--help', '-h', '?' ) ):
- print ( '\n'.join ( (
- "usage: %s <args>" % ARGV[0],
- "* args ::= [arg]*",
- "* arg ::= --write|--show|--help",
- "** write ^= write overlay (somewhere in /tmp by default)",
- "** show ^= print overlay to stdout",
- ) ) )
- exit ( 0 )
-
-import roverlay
-
-from roverlay.overlay.creator import OverlayCreator
-from roverlay.remote import RepoList
-
-SHOW = False
-WRITE = False
-
-for i, x in enumerate ( ARGV ):
- if i == 0:
- pass
- elif x == '--show':
- SHOW = True
- elif x == '--write':
- WRITE = True
-
-o = OverlayCreator()
-o.can_write_overlay = WRITE
-
-r = RepoList()
-r.load()
-
-r.sync()
-
-if not ( WRITE or SHOW ):
- print ( "Use '--show' or '--write' if you want ebuild/metadata/Manifest output." )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-05 16:00 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-05 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 606967bc15963f809c4fd380caa128bd069dcfcf
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 5 15:59:20 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 5 15:59:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=606967bc
update config file
---
R-overlay.conf | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index e874dbb..60b2a9d 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -1,9 +1,20 @@
#LOG_LEVEL = 5
#LOG_CONSOLE = y
-LOG_FILE = log/roverlay.log
+LOG_LEVEL = INFO
-LOG_FILE_RESOLVED = log/dep_resolved.log
+LOG_CONSOLE = yes
+#LOG_LEVEL_CONSOLE = DEBUG
+
+LOG_FILE = log/roverlay.log
+LOG_LEVEL_FILE = WARN
+
+# this enables per-run log files
+LOG_FILE_ROTATE = yes
+# number of backup log files to keep
+LOG_FILE_ROTATE_COUNT = 5
+
+#LOG_FILE_RESOLVED = log/dep_resolved.log
LOG_FILE_UNRESOLVABLE = log/dep_unresolvable.log
# SIMPLE_RULES_FILE lists the rule files for dependency resolution
@@ -19,11 +30,8 @@ OVERLAY_DIR = overlay-root
OVERLAY_CATEGORY = sci-R
ECLASS = eclass/R-packages.eclass
-# FIXME/TODO setting a bandwidth limit while testing on vulture.
-# TODO: what's a reasonable value?
-# using <~100mbit/s (12000 kilobytes/s) now
-# RSYNC_BWLIMIT = <integer (in kilobytes per second)>
-###RSYNC_BWLIMIT = 12000
+# setting a bandwidth limit for rsync (in kilobytes per second)
+# RSYNC_BWLIMIT = 12000
# the repo config file, this can also be a whitespace-separated list of files
# REPO_CONFIG ::= "<file>[ <file>]"
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-04 18:21 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-04 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 212e45f5938ccb3f0a23d984ee10715abe0d1066
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 4 18:20:54 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 4 18:20:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=212e45f5
description_fields.conf update
---
description_fields.conf | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/description_fields.conf b/description_fields.conf
index 864d95e..0705798 100644
--- a/description_fields.conf
+++ b/description_fields.conf
@@ -47,6 +47,7 @@
# joinValues
# -- declares that the field's value is one string even if it
# spans over multiple lines (the lines will be joined with ' ')
+# The default behavior is to join lines with ''.
# isList
# -- declares that the field's value is a list
# (the default regex for splitting the values is '\s*[,;]{1}\s*')
@@ -80,13 +81,23 @@ joinValues
[Package]
joinValues
+# not used
+ignore
+
[License]
isList
+# not used
+ignore
+
[Version]
-mandatory
joinValues
+# not used
+ignore
+## else
+#mandatory
+
[Suggests]
alias_nocase = Suggests, Suggest, %Suggests, Suggets, Recommends
isList
@@ -110,3 +121,39 @@ isList
[OS_Type]
alias_nocase = OS_TYPE
allowed_values = unix
+
+[Author]
+ignore
+
+[Date]
+ignore
+
+[Date/Publication]
+ignore
+
+[Encoding]
+ignore
+
+[Maintainer]
+ignore
+
+[Packaged]
+ignore
+
+[Repository]
+ignore
+
+[Type]
+ignore
+
+[URL]
+ignore
+
+[Webpage]
+ignore
+
+[ZipData]
+ignore
+
+[LazyLoad]
+ignore
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-04 18:21 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-04 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 123907e76736c82d31a12aa03fcab8c8990fd4af
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 4 18:18:54 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 4 18:18:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=123907e7
removed old files
---
Makefile | 44 ------------------------------------
run_overlaycreation.py | 47 ---------------------------------------
run_sync_and_overlaycreation.py | 45 -------------------------------------
3 files changed, 0 insertions(+), 136 deletions(-)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7e60eb1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# runs tests
-EXAMPLES = ./examples
-PACKAGES = $(EXAMPLES)/packages
-
-# make PYVER=<2|3> <target>
-PYVER = 3
-PY = python$(PYVER)
-
-LOGDIR = ./log
-
-SYNC = ./run_sync.py
-PY_NOP = ./nop.py
-PY_OVL = ./run_overlaycreation.py
-
-.PHONY: default dummy \
- test test-nop nop \
- test-seewave seewave \
- clean-log \
- download
-
-download: test-nop $(SYNC)
- $(PY) $(SYNC)
-
-default: dummy test
-
-seewave: test-seewave
-nop: test-nop
-
-clean-log:
- rm -fv -- $(LOGDIR)/*.log
-
-$(LOGDIR):
- mkdir -v $(LOGDIR)
-
-dummy:
- $(PY) --version
-
-test-seewave: test-nop $(PY_OVL) $(PACKAGES)
- $(PY) $(PY_OVL) --show $(PACKAGES)/seewave_*.tar.gz
-
-test-nop: $(PY_NOP) $(LOGDIR)
- @$(PY) $(PY_NOP)
-
-test: test-nop test-seewave
diff --git a/run_overlaycreation.py b/run_overlaycreation.py
deleted file mode 100755
index 2429dd5..0000000
--- a/run_overlaycreation.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-from sys import exit
-from sys import argv as ARGV
-
-if True in ( x in ARGV for x in ( '--help', '-h', '?' ) ):
- print ( '\n'.join ( (
- "usage: %s <pkgs|args>" % ARGV[0],
- "* pkgs ::= [pkg]*",
- "* pkg ::= <path to package file, relative or absolute",
- "* args ::= [arg]*",
- "* arg ::= --write|--show|--help",
- "** write ^= write overlay (somewhere in /tmp by default)",
- "** show ^= print overlay to stdout",
- ) ) )
- exit ( 0 )
-
-
-from roverlay.overlay.creator import OverlayCreator
-
-default_pkg = ( 'examples/packages/seewave_1.6.3.tar.gz', )
-SHOW = False
-WRITE = False
-
-pkg_list = list()
-for i, x in enumerate ( ARGV ):
- if i == 0:
- pass
- elif x == '--show':
- SHOW = True
- elif x == '--write':
- WRITE = True
- else:
- pkg_list.append ( x )
-
-if len (pkg_list) == 0: pkg_list = default_pkg
-
-
-o = OverlayCreator()
-
-o.add_package_files ( *pkg_list )
-o.can_write_overlay = WRITE
-o.run()
-if SHOW: o.show_overlay()
-o.close ( write=True )
-
-if not ( WRITE or SHOW ):
- print ( "Use '--show' or '--write' if you want ebuild/metadata/Manifest output." )
diff --git a/run_sync_and_overlaycreation.py b/run_sync_and_overlaycreation.py
deleted file mode 100755
index b7e472a..0000000
--- a/run_sync_and_overlaycreation.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-from sys import exit
-from sys import argv as ARGV
-
-if True in ( x in ARGV for x in ( '--help', '-h', '?' ) ):
- print ( '\n'.join ( (
- "usage: %s <args>" % ARGV[0],
- "* args ::= [arg]*",
- "* arg ::= --write|--show|--help",
- "** write ^= write overlay (somewhere in /tmp by default)",
- "** show ^= print overlay to stdout",
- ) ) )
- exit ( 0 )
-
-import roverlay
-
-from roverlay.overlay.creator import OverlayCreator
-from roverlay.remote import RepoList
-
-SHOW = False
-WRITE = False
-
-for i, x in enumerate ( ARGV ):
- if i == 0:
- pass
- elif x == '--show':
- SHOW = True
- elif x == '--write':
- WRITE = True
-
-o = OverlayCreator()
-o.can_write_overlay = WRITE
-
-r = RepoList()
-r.load()
-
-r.sync()
-r.add_packages ( o.add_package )
-o.run()
-
-if SHOW: o.show_overlay()
-o.close ( write=True )
-
-if not ( WRITE or SHOW ):
- print ( "Use '--show' or '--write' if you want ebuild/metadata/Manifest output." )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-04 18:21 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-04 18:21 UTC (permalink / raw
To: gentoo-commits
commit: d598dd5307b8ed3cb076ca3e97f7493f64ef1da6
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 4 18:19:35 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 4 18:19:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d598dd53
main script
* added some options
* unique exit codes
modified: main.py
---
main.py | 174 +++++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 130 insertions(+), 44 deletions(-)
diff --git a/main.py b/main.py
index da56c3a..a4f2227 100755
--- a/main.py
+++ b/main.py
@@ -2,23 +2,49 @@
import sys
-# other roverlay modules will be imported later
-import roverlay
+# roverlay modules will be imported later
HIDE_EXCEPTIONS = False
-def die ( msg=None, code=1 ):
- if msg:
- sys.stderr.write ( msg + "\n" )
- sys.exit ( code )
+class DIE ( object ):
+ NOP = 0
+ ERR = 1
+ BAD_USAGE = 3
+ ARG = 9
+ CONFIG = 10
+ OV_CREATE = 20
+ SYNC = 30
+ CMD_LEFTOVER = 90
+ IMPORT = 91
+ UNKNOWN = 95
+ INTERRUPT = 130
+
+ @staticmethod
+ def die ( msg=None, code=None ):
+ code = DIE.ERR if code is None else code
+ if msg is not None:
+ sys.stderr.write ( msg + "\n" )
+# else:
+# sys.stderr.write ( "died." )
+ sys.exit ( code )
+ # --- end of die (...) ---
+
+# --- DIE: exit codes ---
+die = DIE.die
if __name__ != '__main__':
- die ( "Please don't import this script..." )
+ die ( "Please don't import this script...", DIE.BAD_USAGE )
# get args
-import roverlay.argutil
+try:
+ import roverlay.argutil
+except ImportError:
+ if HIDE_EXCEPTIONS:
+ die ( "Cannot import roverlay modules!", DIE.IMPORT )
+ else:
+ raise
COMMAND_DESCRIPTION = {
'sync' : 'sync repos',
@@ -32,15 +58,27 @@ commands, config_file, additional_config, extra_opts = \
CMD_DESC=COMMAND_DESCRIPTION,
DEFAULT_CONFIG="R-overlay.conf"
)
+
+OPTION = extra_opts.get
+
del roverlay.argutil
# -- load config
+
+try:
+ import roverlay
+except ImportError:
+ if HIDE_EXCEPTIONS:
+ die ( "Cannot import roverlay modules!", DIE.IMPORT )
+ else:
+ raise
+
try:
roverlay.load_config_file ( config_file, extraconf=additional_config )
del config_file, additional_config
except:
if HIDE_EXCEPTIONS:
- die ( "Cannot load config file %r." % config_file )
+ die ( "Cannot load config file %r." % config_file, DIE.CONFIG )
else:
raise
@@ -49,72 +87,120 @@ except:
actions = set ( filter ( lambda x : x != 'nop', commands ) )
-if 'sync' in actions and extra_opts ['nosync']:
- die ( "sync command blocked by --nosync opt." )
+if 'sync' in actions and OPTION ( 'nosync' ):
+ die ( "sync command blocked by --nosync opt.", DIE.ARG )
del commands
if not actions:
# this happens if a command is nop
- die ( "Nothing to do!", 0 )
+ die ( "Nothing to do!", DIE.NOP )
# -- import roverlay modules
-from roverlay.remote import RepoList
-from roverlay.overlay.creator import OverlayCreator
-
+try:
+ from roverlay.remote import RepoList
+ from roverlay.overlay.creator import OverlayCreator
+except ImportError:
+ if HIDE_EXCEPTIONS:
+ die ( "Cannot import roverlay modules!", DIE.IMPORT )
+ else:
+ raise
-# -- run
-actions_done = list()
-### sync / nosync
-# always run 'cause commands = {create,sync} and create implies (no)sync
+# -- run methods (and some vars)
-# set up the repo list
-repo_list = RepoList ( sync_enabled=not extra_opts ['nosync'] )
+actions_done = set()
+set_action_done = actions_done.add
-## extra_opts->distdir ... TODO
-repo_list.load()
+def optionally ( call, option, *args, **kw ):
+ if OPTION ( option ):
+ return call ( *args, **kw )
+# --- end of optionally (...) ---
-## this runs _nosync() or _sync(), depending on extra_opts->nosync
-repo_list.sync()
+#repo_list = None
+#overlay = None
+def run_sync():
+ if "sync" in actions_done: return
+ try:
+ # set up the repo list
+ global repo_list
+ repo_list = RepoList (
+ sync_enabled = not OPTION ( 'nosync' ),
+ force_distroot = OPTION ( 'force_distroot' )
+ )
+
+ ## extra_opts->distdir ... TODO
+ if 'distdirs' in extra_opts:
+ repo_list.add_distdirs ( OPTION ( 'distdirs' ) )
+ else:
+ # default repo list
+ repo_list.load()
-if 'sync' in actions:
- actions_done.append ( 'sync' )
+ ## this runs _nosync() or _sync(), depending on extra_opts->nosync
+ repo_list.sync()
-###
+ set_action_done ( "sync" )
-# run overlay creation
+ except KeyboardInterrupt:
+ die ( "Interrupted", DIE.INTERRUPT )
+ except:
+ if HIDE_EXCEPTIONS:
+ die (
+ "nosync() failed!" if OPTION ( "nosync" ) \
+ else "sync() failed!",
+ DIE.SYNC
+ )
+ else:
+ raise
+# --- end of run_sync() ---
-if 'create' in actions:
+def run_overlay_create():
+ if "create" in actions_done: return
+ #run_sync()
try:
+ global overlay
overlay = OverlayCreator()
- overlay.can_write_overlay = extra_opts ['write']
+ # explicitly allow overlay writing (FIXME: remove that in OverlayCreator)
+ overlay.can_write_overlay = OPTION ( 'write_overlay' )
repo_list.add_packages ( overlay.add_package )
- overlay.run()
-
- if extra_opts ['show']:
- overlay.show_overlay()
+ overlay.run ( close_when_done=True )
- if overlay.can_write_overlay:
- overlay.write_overlay()
+ optionally ( overlay.write_overlay, 'write_overlay' )
+ optionally ( overlay.show_overlay, 'show_overlay' )
+ if OPTION ( 'print_stats' ): print ( "\n" + overlay.stats_str() )
- # write overlay on close
- overlay.close()
-
- actions_done.append ( 'create' )
+ set_action_done ( "create" )
+ except KeyboardInterrupt:
+ die ( "Interrupted", DIE.INTERRUPT )
except:
if HIDE_EXCEPTIONS:
- die ( "Overlay creation failed.", 15 )
+ die ( "Overlay creation failed.", DIE.OV_CREATE )
else:
raise
+ finally:
+ if 'overlay' in locals() and not overlay.closed:
+ # This is important 'cause it unblocks remaining ebuild creation
+ # jobs/threads, specifically waiting EbuildJobChannels in depres.
+ # It also writes the deps_unresolved file
+ overlay.close()
+# --- end of run_overlay_create() ---
+# -- run
-if len ( actions ) != len ( actions_done ):
- die ( "Some actions (out of %r) could not be performed!" % actions, 90 )
+# always run sync 'cause commands = {create,sync} and create implies (no)sync
+run_sync()
+
+if 'create' in actions: run_overlay_create()
+
+if len ( actions ) > len ( actions_done ):
+ die (
+ "Some actions (out of %r) could not be performed!" % actions,
+ DIE.CMD_LEFTOVER
+ )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-03 17:48 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-03 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 4b611733c6832b4d96753213c613c694334f16e8
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 3 17:47:34 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 3 17:47:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=4b611733
add FIELD_DEFINITION to the config file
---
R-overlay.conf | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index 7c06d9f..e874dbb 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -32,3 +32,4 @@ REPO_CONFIG = repo.list
DISTFILES = distfiles-root
DESCRIPTION_DIR = desc-files
+FIELD_DEFINITION = description_fields.conf
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-07-03 17:48 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-07-03 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 6c573895ed141842a1c4bad0816566ecf6e7baa4
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 3 17:47:49 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 3 17:47:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6c573895
roverlay main script
* some parts are to do
new file: main.py
---
main.py | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 120 insertions(+), 0 deletions(-)
diff --git a/main.py b/main.py
new file mode 100755
index 0000000..da56c3a
--- /dev/null
+++ b/main.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python
+
+import sys
+
+# other roverlay modules will be imported later
+import roverlay
+
+HIDE_EXCEPTIONS = False
+
+def die ( msg=None, code=1 ):
+ if msg:
+ sys.stderr.write ( msg + "\n" )
+ sys.exit ( code )
+
+
+if __name__ != '__main__':
+ die ( "Please don't import this script..." )
+
+
+# get args
+import roverlay.argutil
+
+COMMAND_DESCRIPTION = {
+ 'sync' : 'sync repos',
+ 'create' : 'create the overlay',
+# 'depres_console' : 'run an interactive depres console; TODO/REMOVE',
+ 'nop' : 'does nothing',
+}
+
+commands, config_file, additional_config, extra_opts = \
+ roverlay.argutil.parse_argv (
+ CMD_DESC=COMMAND_DESCRIPTION,
+ DEFAULT_CONFIG="R-overlay.conf"
+ )
+del roverlay.argutil
+
+# -- load config
+try:
+ roverlay.load_config_file ( config_file, extraconf=additional_config )
+ del config_file, additional_config
+except:
+ if HIDE_EXCEPTIONS:
+ die ( "Cannot load config file %r." % config_file )
+ else:
+ raise
+
+# -- determine commands to run
+# (TODO) could replace this section when adding more actions
+
+actions = set ( filter ( lambda x : x != 'nop', commands ) )
+
+if 'sync' in actions and extra_opts ['nosync']:
+ die ( "sync command blocked by --nosync opt." )
+
+del commands
+
+
+if not actions:
+ # this happens if a command is nop
+ die ( "Nothing to do!", 0 )
+
+
+# -- import roverlay modules
+
+from roverlay.remote import RepoList
+from roverlay.overlay.creator import OverlayCreator
+
+
+# -- run
+
+actions_done = list()
+
+### sync / nosync
+# always run 'cause commands = {create,sync} and create implies (no)sync
+
+# set up the repo list
+repo_list = RepoList ( sync_enabled=not extra_opts ['nosync'] )
+
+## extra_opts->distdir ... TODO
+repo_list.load()
+
+## this runs _nosync() or _sync(), depending on extra_opts->nosync
+repo_list.sync()
+
+if 'sync' in actions:
+ actions_done.append ( 'sync' )
+
+###
+
+# run overlay creation
+
+if 'create' in actions:
+ try:
+ overlay = OverlayCreator()
+ overlay.can_write_overlay = extra_opts ['write']
+
+ repo_list.add_packages ( overlay.add_package )
+
+ overlay.run()
+
+ if extra_opts ['show']:
+ overlay.show_overlay()
+
+ if overlay.can_write_overlay:
+ overlay.write_overlay()
+
+ # write overlay on close
+ overlay.close()
+
+ actions_done.append ( 'create' )
+
+ except:
+ if HIDE_EXCEPTIONS:
+ die ( "Overlay creation failed.", 15 )
+ else:
+ raise
+
+
+if len ( actions ) != len ( actions_done ):
+ die ( "Some actions (out of %r) could not be performed!" % actions, 90 )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-29 22:48 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-29 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 786ecbec419d4c59cb10f399222378180dcf63da
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 29 22:43:30 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 29 22:43:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=786ecbec
test script: run_desc.py
This runs the DescriptionReader for the given DESCRIPTION files.
Useful in conjunction with the 'DESCRIPTION_DIR' config entry to
trace desc reading misbehavior.
new file: run_desc.py
---
run_desc.py | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/run_desc.py b/run_desc.py
new file mode 100755
index 0000000..b69fae8
--- /dev/null
+++ b/run_desc.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+import sys
+import logging
+import os.path
+
+ARGV = sys.argv[1:]
+
+from roverlay.rpackage import descriptionreader as d
+
+doinfo = d.make_desc_packageinfo
+Reader = d.DescriptionReader
+LOGGER = logging.getLogger()
+
+if not ARGV:
+ ARGV = ( '/home/andre/tmp/R_overlay_2012-06-28/desc-files/ENmisc_1.2.4.desc', )
+
+
+for df in ARGV:
+ df = os.path.abspath ( df )
+ pinfo = doinfo ( df )
+
+ r = Reader ( pinfo, LOGGER, read_now=False, write_desc=False )
+
+ x = r.get_desc()
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-29 22:48 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-29 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 669e6011375710c8aa7091fb54d869228d9ffb61
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 29 22:46:04 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 29 22:46:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=669e6011
test script: run_depres.py
Usage: ./run_depres.py <dependency strings>
or ./run_depres.py <file with dependency strings>
This tries to resolve the dependencies read from argv or a file.
new file: run_depres.py
---
run_depres.py | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/run_depres.py b/run_depres.py
new file mode 100755
index 0000000..015d0e9
--- /dev/null
+++ b/run_depres.py
@@ -0,0 +1,32 @@
+#!/usr/bin/python3
+
+import sys
+import os.path
+
+if len ( sys.argv ) < 2:
+ print ( "Usage: %s <deps|dep_file>" % sys.argv[0] )
+ exit ( 10 )
+
+if os.path.isfile ( sys.argv[1] ):
+ print ( "reading a file" )
+ with open ( sys.argv[1], 'r' ) as fh:
+ deps = tuple ( x.strip() for x in filter ( None, fh.readlines() ) )
+else:
+ deps = sys.argv[1:]
+
+
+from roverlay.recipe.easyresolver import setup as getres
+from roverlay.depres.channels import EbuildJobChannel
+
+
+R = getres()
+c = EbuildJobChannel ( name='chantest' )
+R.register_channel ( c )
+c.add_dependencies ( deps )
+
+
+if c.satisfy_request():
+ print ( "Success!" )
+ print ( str ( c.collect_dependencies() ) )
+else:
+ print ( "<fail>" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-27 14:46 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-27 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 5f442301af09788a66fd35f0e837eb97329e1408
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 27 14:46:56 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 27 14:46:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5f442301
config files
---
R-overlay.conf | 2 +-
repo.list | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index 2f67d32..3a84234 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -11,7 +11,7 @@ LOG_FILE_UNRESOLVABLE = log/dep_unresolvable.log
SIMPLE_RULES_FILE = "simple-deprules.conf"
OVERLAY_NAME = ROverlay
-OVERLAY_DIR = /tmp/ROverlay_1
+OVERLAY_DIR = overlay-root
OVERLAY_CATEGORY = sci-R
ECLASS = eclass/R-packages.eclass
diff --git a/repo.list b/repo.list
index 3b6c8cb..d4a532c 100644
--- a/repo.list
+++ b/repo.list
@@ -4,6 +4,7 @@ rsync_uri = cran.r-project.org::CRAN/src/contrib
src_uri = http://cran.r-project.org/src/contrib
# directory = <distfiles root>/<name of this repo>
#extra_rsync_opts = --list-only
+extra_rsyc_opts = --progress
#[BIOC]
#rsync_uri = bioconductor.org::2.10/bioc/src/contrib
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-27 14:46 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-27 14:46 UTC (permalink / raw
To: gentoo-commits
commit: c40785b318b1a003c9543c4dce9b5a9ce4234137
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 27 14:40:51 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 27 14:40:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c40785b3
gitignore: added distfiles and overlay dirs
modified: .gitignore
---
.gitignore | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index a936424..c412f0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@
roverlay.log
/TODO
+
+/distfiles-root/
+/overlay-root/
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-26 15:42 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-26 15:42 UTC (permalink / raw
To: gentoo-commits
commit: fe770adcf35feaa79977fc7b78de26ab8e3766b0
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jun 26 15:42:43 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jun 26 15:42:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=fe770adc
test scripts
---
Makefile | 7 +++++-
run_sync.py | 40 ++++++++++++++++++++++++++++++++++
run_sync_and_overlaycreation.py | 45 +++++++++++++++++++++++++++++++++++++++
3 files changed, 91 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 07dce33..7e60eb1 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,18 @@ PY = python$(PYVER)
LOGDIR = ./log
+SYNC = ./run_sync.py
PY_NOP = ./nop.py
PY_OVL = ./run_overlaycreation.py
.PHONY: default dummy \
test test-nop nop \
test-seewave seewave \
- clean-log
+ clean-log \
+ download
+
+download: test-nop $(SYNC)
+ $(PY) $(SYNC)
default: dummy test
diff --git a/run_sync.py b/run_sync.py
new file mode 100755
index 0000000..8d50d85
--- /dev/null
+++ b/run_sync.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+from sys import exit
+from sys import argv as ARGV
+
+if True in ( x in ARGV for x in ( '--help', '-h', '?' ) ):
+ print ( '\n'.join ( (
+ "usage: %s <args>" % ARGV[0],
+ "* args ::= [arg]*",
+ "* arg ::= --write|--show|--help",
+ "** write ^= write overlay (somewhere in /tmp by default)",
+ "** show ^= print overlay to stdout",
+ ) ) )
+ exit ( 0 )
+
+import roverlay
+
+from roverlay.overlay.creator import OverlayCreator
+from roverlay.remote import RepoList
+
+SHOW = False
+WRITE = False
+
+for i, x in enumerate ( ARGV ):
+ if i == 0:
+ pass
+ elif x == '--show':
+ SHOW = True
+ elif x == '--write':
+ WRITE = True
+
+o = OverlayCreator()
+o.can_write_overlay = WRITE
+
+r = RepoList()
+r.load()
+
+r.sync()
+
+if not ( WRITE or SHOW ):
+ print ( "Use '--show' or '--write' if you want ebuild/metadata/Manifest output." )
diff --git a/run_sync_and_overlaycreation.py b/run_sync_and_overlaycreation.py
new file mode 100755
index 0000000..b7e472a
--- /dev/null
+++ b/run_sync_and_overlaycreation.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+from sys import exit
+from sys import argv as ARGV
+
+if True in ( x in ARGV for x in ( '--help', '-h', '?' ) ):
+ print ( '\n'.join ( (
+ "usage: %s <args>" % ARGV[0],
+ "* args ::= [arg]*",
+ "* arg ::= --write|--show|--help",
+ "** write ^= write overlay (somewhere in /tmp by default)",
+ "** show ^= print overlay to stdout",
+ ) ) )
+ exit ( 0 )
+
+import roverlay
+
+from roverlay.overlay.creator import OverlayCreator
+from roverlay.remote import RepoList
+
+SHOW = False
+WRITE = False
+
+for i, x in enumerate ( ARGV ):
+ if i == 0:
+ pass
+ elif x == '--show':
+ SHOW = True
+ elif x == '--write':
+ WRITE = True
+
+o = OverlayCreator()
+o.can_write_overlay = WRITE
+
+r = RepoList()
+r.load()
+
+r.sync()
+r.add_packages ( o.add_package )
+o.run()
+
+if SHOW: o.show_overlay()
+o.close ( write=True )
+
+if not ( WRITE or SHOW ):
+ print ( "Use '--show' or '--write' if you want ebuild/metadata/Manifest output." )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-26 15:42 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-26 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 895e95d2bfcf84dd956cc2e745e73d8ad5dca005
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jun 26 15:42:33 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jun 26 15:42:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=895e95d2
config files
---
R-overlay.conf | 14 ++++++++------
repo.list | 24 +++++++++++++++++-------
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index cfada43..2f67d32 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -3,11 +3,11 @@
LOG_FILE = log/roverlay.log
-LOG_FILE_RESOLVED = log/dep_resolved.log
+LOG_FILE_RESOLVED = log/dep_resolved.log
LOG_FILE_UNRESOLVABLE = log/dep_unresolvable.log
# SIMPLE_RULES_FILE lists the rule files for dependency resolution
-# SIMPLE_RULES_FILE ::= "<file>[, <file>]"
+# SIMPLE_RULES_FILE ::= "<file>[ <file>]"
SIMPLE_RULES_FILE = "simple-deprules.conf"
OVERLAY_NAME = ROverlay
@@ -15,12 +15,14 @@ OVERLAY_DIR = /tmp/ROverlay_1
OVERLAY_CATEGORY = sci-R
ECLASS = eclass/R-packages.eclass
-#REPO = "x;/somewhere;rsync://?;http://? a;;rsync://?;ftp://?"
-
# FIXME/TODO setting a bandwidth limit while testing on vulture.
# TODO: what's a reasonable value?
# using <~100mbit/s (12000 kilobytes/s) now
-RSYNC_BWLIMIT = 12000
+# RSYNC_BWLIMIT = <integer (in kilobytes per second)>
+###RSYNC_BWLIMIT = 12000
# the repo config file, this can also be a whitespace-separated list of files
-repo_config = repo.list
+# REPO_CONFIG ::= "<file>[ <file>]"
+REPO_CONFIG = repo.list
+
+DISTFILES = distfiles-root
diff --git a/repo.list b/repo.list
index 59fed5d..3b6c8cb 100644
--- a/repo.list
+++ b/repo.list
@@ -1,12 +1,22 @@
-#[CRAN/contrib]
-#type = rsync
-#rsync_uri = cran.r-project.org::CRAN/src/contrib
-#src_uri = http://cran.r-project.org/src/contrib
+[CRAN]
+type = rsync
+rsync_uri = cran.r-project.org::CRAN/src/contrib
+src_uri = http://cran.r-project.org/src/contrib
+# directory = <distfiles root>/<name of this repo>
+#extra_rsync_opts = --list-only
#[BIOC]
#rsync_uri = bioconductor.org::2.10/bioc/src/contrib
#src_uri = ??
-[testing]
-type = local
-directory = /tmp/rdist
+#[testing]
+#type = local
+#directory = /tmp/rdist
+
+#[testing2]
+#type = rsync
+#directory = /tmp/rdist0
+#rsync_uri = /tmp/rdist
+#recursive = yes
+
+
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-25 18:19 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-25 18:19 UTC (permalink / raw
To: gentoo-commits
commit: bf327f3ffe7ad7759c181115f26a003960555337
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jun 25 18:14:15 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jun 25 18:14:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=bf327f3f
add repo config entries to the config
modified: R-overlay.conf
new file: repo.list
---
R-overlay.conf | 8 ++++++++
repo.list | 12 ++++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index bfbafd5..cfada43 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -16,3 +16,11 @@ OVERLAY_CATEGORY = sci-R
ECLASS = eclass/R-packages.eclass
#REPO = "x;/somewhere;rsync://?;http://? a;;rsync://?;ftp://?"
+
+# FIXME/TODO setting a bandwidth limit while testing on vulture.
+# TODO: what's a reasonable value?
+# using <~100mbit/s (12000 kilobytes/s) now
+RSYNC_BWLIMIT = 12000
+
+# the repo config file, this can also be a whitespace-separated list of files
+repo_config = repo.list
diff --git a/repo.list b/repo.list
new file mode 100644
index 0000000..59fed5d
--- /dev/null
+++ b/repo.list
@@ -0,0 +1,12 @@
+#[CRAN/contrib]
+#type = rsync
+#rsync_uri = cran.r-project.org::CRAN/src/contrib
+#src_uri = http://cran.r-project.org/src/contrib
+
+#[BIOC]
+#rsync_uri = bioconductor.org::2.10/bioc/src/contrib
+#src_uri = ??
+
+[testing]
+type = local
+directory = /tmp/rdist
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-22 18:13 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-22 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 66ed6c82ce3431417bbf9abaac6c5928ed5bbf0b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 22 18:09:24 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 22 18:09:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=66ed6c82
explain SIMPLE_RULES_FILE in R-overlay.conf
---
R-overlay.conf | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index 938fd32..bfbafd5 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -6,6 +6,8 @@ LOG_FILE = log/roverlay.log
LOG_FILE_RESOLVED = log/dep_resolved.log
LOG_FILE_UNRESOLVABLE = log/dep_unresolvable.log
+# SIMPLE_RULES_FILE lists the rule files for dependency resolution
+# SIMPLE_RULES_FILE ::= "<file>[, <file>]"
SIMPLE_RULES_FILE = "simple-deprules.conf"
OVERLAY_NAME = ROverlay
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-22 18:13 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-22 18:13 UTC (permalink / raw
To: gentoo-commits
commit: ccd0f945d30e55a81ca3caf52f2630db9228ceaf
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 22 18:10:09 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 22 18:10:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ccd0f945
update README
---
README | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/README b/README
index 8147b52..64a1f47 100644
--- a/README
+++ b/README
@@ -8,44 +8,52 @@ There is currently no "R overlay" script, only modules that implement functional
Real tests are scheduled for July 10 - July 30.
-In the meantime, there are some test scripts (run_<something>.py,test_<something>.sh)
-and a Makefile that provide basic testing.
+In the meantime, there are some test scripts (run_<something>.py,
+test_<something>.sh) and a Makefile that provide basic testing.
To run them you need to create a directory <root>/examples/packages and
put some R packages into it (expected suffix is .tar.gz),
where <root> is the directory containing this README file.
+Some scripts expect the seewave (seewave_1.6.3.tar.gz) package in there.
You can then run:
- make <some test>
- where <some test> is
- * test-nop -- tries to import roverlay, but does nothing
- * test-ebuild_creation -- tries to create an ebuild for each package in examples/packages
- * test-ebuild_creation -- tries to create 1000 ebuilds for each package in examples/packages
- * test -- runs all of the above tests
- * dummy -- prints python version in use, run
- make PYVER=2 <some test> or make PYVER=3 <some test>
- use a specific one
+ ./run_config.py <config files>
- or:
- ./test_ebuildcreation.sh [-q] [count]
- -- runs count * "number of packages in examples/packages"
- ebuild creations in one script call.
- Use '-q' to suppress the script output (e.g. ebuilds).
+ * reads config files and prints the config
- ./run_ebuildcreation.py <packages>
- -- runs ebuild creations for the given packages
+ ./run_overlaycreation.py [--help|-h|?] [--show] [--write] [<R packages>]
+ * creates an overlay with ebuilds for the given R packages (or seewave if left out)
+ * parameters:
+ ** --help -- prints a short usage info (does not create ebuilds/...)
+ ** --show -- prints the created ebuilds/metadata to console,
+ does not create Manifest files
+
+ ** --write -- writes the created ebuilds/metadata to the overlay, including
+ Manifest files (see R-overlay.conf for the overlay dir)
+
+ make <target>, where target is
+
+ * seewave, test-seewave -- runs './run_overlaycreation --show examples/packages/seewave_*.tar.gz'
+ * clean-log -- removes log files in ./log/
+ * test-nop -- run './nop.py' which does nothing but 'import roverlay'
== Configuration ==
* main configuration
-shell-like syntax (using shlex), TODO
+shell-like syntax (using shlex), TODO - roverlay/config/entrymap could be
+helpful in the meantime
+
+* repo configuration (CRAN,...)
+to be clarified; either part of the main config as tuple
+<name>;<local dir or empty>;<rsync uri>;<src uri> in the main config file
+or in a separate file using ConfigParser syntax.
* description field configuration
ConfigParser syntax, please see 'description_fields.conf' in this directory.
* dependency rules configuration
-<scheduled for July 1>
+simple dependency rules: see simple-deprules.conf
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-22 18:13 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-22 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 60501099176c38a35ecae2879d7b7cdd7579b875
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 22 18:09:59 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 22 18:09:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=60501099
update Makefile
---
Makefile | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index 3f4e63c..07dce33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
# runs tests
EXAMPLES = ./examples
+PACKAGES = $(EXAMPLES)/packages
# make PYVER=<2|3> <target>
PYVER = 3
@@ -8,17 +9,18 @@ PY = python$(PYVER)
LOGDIR = ./log
PY_NOP = ./nop.py
-PY_EBU = ./run_ebuildcreation.py
-PY_EBU2 = ./test_ebuildcreation.sh
+PY_OVL = ./run_overlaycreation.py
-.PHONY: default dummy test test-nop \
- test-ebuild_creation \
- test-ebuild_creation2 \
- test-ebuild_creation3 \
- test-seewave seewave
+.PHONY: default dummy \
+ test test-nop nop \
+ test-seewave seewave \
+ clean-log
default: dummy test
+seewave: test-seewave
+nop: test-nop
+
clean-log:
rm -fv -- $(LOGDIR)/*.log
@@ -28,23 +30,10 @@ $(LOGDIR):
dummy:
$(PY) --version
-seewave: test-seewave
-
-test-seewave: test-nop $(PY_EBU) $(EXAMPLES)/packages
- $(PY) $(PY_EBU) $(EXAMPLES)/packages/seewave_*.tar.gz
+test-seewave: test-nop $(PY_OVL) $(PACKAGES)
+ $(PY) $(PY_OVL) --show $(PACKAGES)/seewave_*.tar.gz
test-nop: $(PY_NOP) $(LOGDIR)
@$(PY) $(PY_NOP)
-# test-desc (file) has been removed in favor of test-desc (tar),
-# which is included in ebuild creation
-test-ebuild_creation: test-nop $(PY_EBU) $(EXAMPLES)/packages
- $(PY) $(PY_EBU) $(EXAMPLES)/packages/*.tar.gz
-
-test-ebuild_creation2: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
- PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 100
-
-test-ebuild_creation3: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
- PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 1000
-
-test: test-nop test-ebuild_creation test-ebuild_creation2 test-seewave
+test: test-nop test-seewave
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-21 16:55 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-21 16:55 UTC (permalink / raw
To: gentoo-commits
commit: ceb4dbb9c99d05dc191acf2182e29ef3d3d55038
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jun 21 16:53:02 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jun 21 16:53:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ceb4dbb9
replaced run_overlaycreation test script
* run_overlaycreation uses OverlayCreator now,
usage is ./run_overlaycreation [--show] [--write] [--help] <R packages>
modified: run_overlaycreation.py
---
run_overlaycreation.py | 127 +++++++++++++++++------------------------------
1 files changed, 46 insertions(+), 81 deletions(-)
diff --git a/run_overlaycreation.py b/run_overlaycreation.py
index da86dc6..2429dd5 100755
--- a/run_overlaycreation.py
+++ b/run_overlaycreation.py
@@ -1,82 +1,47 @@
#!/usr/bin/env python3
-
-import os.path
-import sys
-import logging
-
-import roverlay.static.depres
-
-from roverlay import config
-from roverlay.packageinfo import PackageInfo
-from roverlay.ebuild.creation import EbuildCreation
-from roverlay.overlay import Overlay
-from roverlay.depres import simpledeprule, listeners
-
-# -- prepare
-
-WRITE_OVERLAY = False
-if len ( sys.argv ) > 1:
- if sys.argv [1] == '--write':
- WRITE_OVERLAY = True
-
-
-# the package used for testing
-seewave_f = os.path.abspath ( 'examples/packages/seewave_1.6.3.tar.gz' )
-# the overlay dir
-overlay_d = "/tmp/R-Overlay_0"
-config.access().inject ( "OVERLAY.dir", overlay_d )
-
-# dep resolver setup
-resolver = roverlay.static.depres.resolver()
-# log everything
-resolver.set_logmask ( -1 )
-
-# add simple rules to the resolver
-rulepool = simpledeprule.SimpleDependencyRulePool (
- 'test pool',
- filepath=os.path.abspath ( 'simple-deprules.conf' ),
- priority=25
-)
-
-resolver.add_rulepool ( rulepool )
-
-
-# eclass files
-eclass_list = ( 'R-packages', )
-eclass_files = tuple ( os.path.abspath ( os.path.join ( 'eclass', "%s.eclass" % x ) ) for x in eclass_list )
-
-#for e in eclass_files:
-# if not os.path.isfile ( e ):
-# raise Exception ( "eclass %s is missing!" % e )
-
-
-o = Overlay (
- name="R-packages",
- logger=None,
- directory=None,
- default_category="sci-R",
- eclass_files=eclass_files
-)
-
-p = PackageInfo ( filepath=seewave_f )
-e = EbuildCreation ( p )
-
-# -- run
-
-e.run()
-
-resolver.close()
-
-if p ['ebuild'] is None:
- sys.stderr.write ( "No ebuild created!\n" )
-else:
- try:
- o.add ( p )
- o.show()
- if WRITE_OVERLAY:
- o.write()
- sys.stderr.write ( "Overlay written - directory is '%s'.\n" % overlay_d )
- except Exception as e:
- sys.stderr.write ( "Overlay creation/update failed!\n" )
- raise
-
+from sys import exit
+from sys import argv as ARGV
+
+if True in ( x in ARGV for x in ( '--help', '-h', '?' ) ):
+ print ( '\n'.join ( (
+ "usage: %s <pkgs|args>" % ARGV[0],
+ "* pkgs ::= [pkg]*",
+ "* pkg ::= <path to package file, relative or absolute",
+ "* args ::= [arg]*",
+ "* arg ::= --write|--show|--help",
+ "** write ^= write overlay (somewhere in /tmp by default)",
+ "** show ^= print overlay to stdout",
+ ) ) )
+ exit ( 0 )
+
+
+from roverlay.overlay.creator import OverlayCreator
+
+default_pkg = ( 'examples/packages/seewave_1.6.3.tar.gz', )
+SHOW = False
+WRITE = False
+
+pkg_list = list()
+for i, x in enumerate ( ARGV ):
+ if i == 0:
+ pass
+ elif x == '--show':
+ SHOW = True
+ elif x == '--write':
+ WRITE = True
+ else:
+ pkg_list.append ( x )
+
+if len (pkg_list) == 0: pkg_list = default_pkg
+
+
+o = OverlayCreator()
+
+o.add_package_files ( *pkg_list )
+o.can_write_overlay = WRITE
+o.run()
+if SHOW: o.show_overlay()
+o.close ( write=True )
+
+if not ( WRITE or SHOW ):
+ print ( "Use '--show' or '--write' if you want ebuild/metadata/Manifest output." )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-20 19:03 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-20 19:03 UTC (permalink / raw
To: gentoo-commits
commit: b19701b19f19d62c28583310ffc5b56c6dd20b0f
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 20 19:00:51 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 20 19:00:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b19701b1
removed test scripts
* removed test scripts that do no longer work due to changes in roverlay/
deleted: run_ebuildcreation.py
deleted: run_metadata.py
deleted: test_ebuildcreation.sh
---
run_ebuildcreation.py | 64 ------------------------------------------------
run_metadata.py | 32 ------------------------
test_ebuildcreation.sh | 56 ------------------------------------------
3 files changed, 0 insertions(+), 152 deletions(-)
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
deleted file mode 100755
index dae02c7..0000000
--- a/run_ebuildcreation.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# Copyright 2006-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-import sys
-import logging
-
-def me ( msg ):
- sys.stderr.write ("<=== run_ebuildcreation " + msg + " ===>\n" )
-
-me ( "start" )
-
-try:
- from roverlay import config
- from roverlay.depres import simpledeprule, listeners
- from roverlay.portage.ebuildjob import EbuildJob
- from roverlay.portage.ebuildcreator import EbuildCreator
-
- ec = EbuildCreator ()
-
- # todo: EbuildCreator should offer a method to load simple rules
- testrules = simpledeprule.SimpleDependencyRulePool (
- 'test pool',
- filepath='simple-deprules.conf',
- priority=25
- )
- ec.depresolve_main.add_rulepool ( testrules )
- ec.depresolve_main.set_logmask ( -1 )
-
- # add listeners
- ec.depresolve_main.add_listener ( listeners.ResolvedFileListener ( config.get ( 'LOG.FILE.resolved' ) ) )
- ec.depresolve_main.add_listener ( listeners.UnresolvableFileListener ( config.get ( 'LOG.FILE.unresolvable' ) ) )
-
- for tarball in sys.argv[1:]:
- sys.stderr.write ( "Adding tarball " + tarball + " to the EbuildCreator.\n" )
- if ec.add_package ( tarball ) is None:
- raise Exception ( "ec.add() returns None, fix that." )
-
- ec.start()
-
- for e in ec.collect_ebuilds ():
- sys.stderr.write ( '\n** ebuild, filename=' + e.suggest_name ( '__undef__' ) + '.ebuild\n' )
- sys.stderr.write ( '[### this is an ebuild: ###]\n' )
- e.show ( sys.stderr )
- sys.stderr.write ( '[### this was an ebuild: ###]\n' )
-
- for ebuild_dir, mdata in ec.metadata.items():
- sys.stderr.write ( '\n** metadata, in subdir %s\n' % ebuild_dir )
- sys.stderr.write ( '[### this is a metadata file: ###]\n' )
- mdata.write ( sys.stderr )
- sys.stderr.write ( '[### this was a metadata file: ###]\n' )
-
-
- ec.close()
-
- me ( "end" )
-
-except Exception as err:
- print ( str ( err ) )
- me ( "failed" )
- raise
-
-
diff --git a/run_metadata.py b/run_metadata.py
deleted file mode 100755
index a664d48..0000000
--- a/run_metadata.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-
-import logging
-import sys
-
-from roverlay.portage.metadata.creation import MetadataJob
-from roverlay.portage.metadata.nodes import *
-
-mj = MetadataJob ( None, logging.getLogger ( 'nop' ) )
-m = mj._metadata
-
-dshort = DescriptionNode ( 'short description', False )
-dlong = DescriptionNode ( 'a longer description\nthat tells you every detail about this package', True )
-duse = UseFlagListNode ()
-
-m.add ( dshort )
-m.add ( dlong )
-m.add ( duse )
-
-try:
- duse.add ( NopNode() )
- fail = True
-except Exception as e:
- print ( '!!! %s' % e )
- fail = False
-
-if fail: raise Exception ( "bad node accepted!" )
-
-m.get ( 'use' ).add ( UseFlagNode ( 'byte-compile', 'enable byte compiling' ) )
-duse.add ( UseFlagNode ( 'R_Suggests', 'install suggested packages' ) )
-
-mj.write ( sys.stdout )
diff --git a/test_ebuildcreation.sh b/test_ebuildcreation.sh
deleted file mode 100755
index 71b352d..0000000
--- a/test_ebuildcreation.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-set -u
-set -e
-readonly ARGV="$*"
-readonly _SELF="${0##*/}"
-readonly _SELF_NAME="${_SELF%.*sh}"
-readonly TEST_SECTION="${_SELF_NAME#test_}"
-#
-readonly py=${PYTHON:-python3}
-#
-_ROOT=`pwd`
-if [[ ! -e "${_ROOT}/examples" ]]; then
- _ROOT="${_ROOT%/*}"
-fi
-readonly EXAMPLES="${_ROOT}/examples"
-readonly PKGDIR="${EXAMPLES}/packages"
-
-
-if [[ "${TEST_SECTION}" == "ebuildcreation" ]]; then
- if [[ "${1:-}" == "-q" ]]; then
- q=1
- shift ||:
- else q=0; fi
-
- declare -i multiply=${1:-1}
- [[ $multiply -gt 0 ]] || multiply=1
- pkgline=""
- pkgcount=0
- for x in "${PKGDIR}"/*.tar.gz "${PKGDIR}"/*.tgz; do
- if [[ -r "$x" ]]; then
- pkgline+=" ${x}"
- ((pkgcount++)) ||:
- fi
- done
- pkgline="${pkgline# }"
-
- argline=""
- for i in `seq 1 $multiply`; do
- argline+=" ${pkgline}"
- done
-
- num=$(( $multiply * $pkgcount ))
- echo "Please note: python may return 'Argument list too long'. Double check your result if it's too fantastic to believe. (28500 pkgs could work, but 30000 don't)." 1>&2
- echo "Creating $num packages" 1>&2
- time {
- if [[ $q -eq 1 ]]; then
- &>/dev/null $py "${_ROOT}/run_ebuildcreation.py" $argline || echo fail 1>&2
- else
- $py "${_ROOT}/run_ebuildcreation.py" $argline
- fi;
- }
- echo "Done creating $num packages" 1>&2
-else
- echo "test section not defined: ${TEST_SECTION}"
- exit ${__UNDEF__:-102}
-fi
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-20 19:03 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-20 19:03 UTC (permalink / raw
To: gentoo-commits
commit: 04872464f7548fad648eb77aa5fb2f02790fd220
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 20 19:01:52 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 20 19:01:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=04872464
new test script: run_overlaycreation.py
* this creates an Overlay (and writes it if it is called with '--write')
for the R packages (currently hardcoded for seewave 1.6.3)
new file: run_overlaycreation.py
---
run_overlaycreation.py | 82 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 deletions(-)
diff --git a/run_overlaycreation.py b/run_overlaycreation.py
new file mode 100755
index 0000000..da86dc6
--- /dev/null
+++ b/run_overlaycreation.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+
+import os.path
+import sys
+import logging
+
+import roverlay.static.depres
+
+from roverlay import config
+from roverlay.packageinfo import PackageInfo
+from roverlay.ebuild.creation import EbuildCreation
+from roverlay.overlay import Overlay
+from roverlay.depres import simpledeprule, listeners
+
+# -- prepare
+
+WRITE_OVERLAY = False
+if len ( sys.argv ) > 1:
+ if sys.argv [1] == '--write':
+ WRITE_OVERLAY = True
+
+
+# the package used for testing
+seewave_f = os.path.abspath ( 'examples/packages/seewave_1.6.3.tar.gz' )
+# the overlay dir
+overlay_d = "/tmp/R-Overlay_0"
+config.access().inject ( "OVERLAY.dir", overlay_d )
+
+# dep resolver setup
+resolver = roverlay.static.depres.resolver()
+# log everything
+resolver.set_logmask ( -1 )
+
+# add simple rules to the resolver
+rulepool = simpledeprule.SimpleDependencyRulePool (
+ 'test pool',
+ filepath=os.path.abspath ( 'simple-deprules.conf' ),
+ priority=25
+)
+
+resolver.add_rulepool ( rulepool )
+
+
+# eclass files
+eclass_list = ( 'R-packages', )
+eclass_files = tuple ( os.path.abspath ( os.path.join ( 'eclass', "%s.eclass" % x ) ) for x in eclass_list )
+
+#for e in eclass_files:
+# if not os.path.isfile ( e ):
+# raise Exception ( "eclass %s is missing!" % e )
+
+
+o = Overlay (
+ name="R-packages",
+ logger=None,
+ directory=None,
+ default_category="sci-R",
+ eclass_files=eclass_files
+)
+
+p = PackageInfo ( filepath=seewave_f )
+e = EbuildCreation ( p )
+
+# -- run
+
+e.run()
+
+resolver.close()
+
+if p ['ebuild'] is None:
+ sys.stderr.write ( "No ebuild created!\n" )
+else:
+ try:
+ o.add ( p )
+ o.show()
+ if WRITE_OVERLAY:
+ o.write()
+ sys.stderr.write ( "Overlay written - directory is '%s'.\n" % overlay_d )
+ except Exception as e:
+ sys.stderr.write ( "Overlay creation/update failed!\n" )
+ raise
+
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-15 20:34 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-15 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 691ac6261445d69a47eeebdde5e05d55ed5d2ed1
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 15 20:32:19 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 15 20:32:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=691ac626
a metadata test script
new file: run_metadata.py
---
run_metadata.py | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/run_metadata.py b/run_metadata.py
new file mode 100755
index 0000000..a664d48
--- /dev/null
+++ b/run_metadata.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+import logging
+import sys
+
+from roverlay.portage.metadata.creation import MetadataJob
+from roverlay.portage.metadata.nodes import *
+
+mj = MetadataJob ( None, logging.getLogger ( 'nop' ) )
+m = mj._metadata
+
+dshort = DescriptionNode ( 'short description', False )
+dlong = DescriptionNode ( 'a longer description\nthat tells you every detail about this package', True )
+duse = UseFlagListNode ()
+
+m.add ( dshort )
+m.add ( dlong )
+m.add ( duse )
+
+try:
+ duse.add ( NopNode() )
+ fail = True
+except Exception as e:
+ print ( '!!! %s' % e )
+ fail = False
+
+if fail: raise Exception ( "bad node accepted!" )
+
+m.get ( 'use' ).add ( UseFlagNode ( 'byte-compile', 'enable byte compiling' ) )
+duse.add ( UseFlagNode ( 'R_Suggests', 'install suggested packages' ) )
+
+mj.write ( sys.stdout )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-15 20:34 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-15 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 72e7fbc74e4e2033625e22eb4b10931507dfd322
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 15 20:31:21 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 15 20:31:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=72e7fbc7
run_ebuildcreation.py: prints metadata now
modified: run_ebuildcreation.py
---
run_ebuildcreation.py | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index 6b4faf5..dae02c7 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -45,6 +45,13 @@ try:
e.show ( sys.stderr )
sys.stderr.write ( '[### this was an ebuild: ###]\n' )
+ for ebuild_dir, mdata in ec.metadata.items():
+ sys.stderr.write ( '\n** metadata, in subdir %s\n' % ebuild_dir )
+ sys.stderr.write ( '[### this is a metadata file: ###]\n' )
+ mdata.write ( sys.stderr )
+ sys.stderr.write ( '[### this was a metadata file: ###]\n' )
+
+
ec.close()
me ( "end" )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-15 20:34 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-15 20:34 UTC (permalink / raw
To: gentoo-commits
commit: cb8e4ef8dbeac9e667e5a122365da8e6149013aa
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 15 20:18:42 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 15 20:18:42 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=cb8e4ef8
run_config uses visualize() now
modified: run_config.py
---
run_config.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/run_config.py b/run_config.py
index 98510a2..84f2740 100755
--- a/run_config.py
+++ b/run_config.py
@@ -10,3 +10,6 @@ for c in ARGV:
print ( "<=== " + c + " ===>" )
config.access().load_config ( c )
print ( ">=== " + c + " ===<" )
+
+conf = config.access()
+vis = conf.visualize ( into=sys.stdout )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-15 20:34 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-15 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 419216ffc756e259e6ff58abbcc42b40042d7a00
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jun 14 18:55:18 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jun 14 18:55:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=419216ff
ignore log dir
---
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 776f770..a936424 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/examples/packages/*.tar.gz
/bak/
/perf-stats/
+/log/
# these are just symlinks to files in roverlay/
/c.py
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-13 16:34 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-13 16:34 UTC (permalink / raw
To: gentoo-commits
commit: faa744621a21bcbdbaa2155be4bc218afaf82548
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 13 16:33:17 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 13 16:33:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=faa74462
run_ebuildcreation: reenabled ebuild output
modified: run_ebuildcreation.py
---
run_ebuildcreation.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index a6b9098..6b4faf5 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -39,11 +39,11 @@ try:
ec.start()
-# for e in ec.collect_ebuilds ():
-# sys.stderr.write ( '\n** ebuild, filename=' + e.suggest_name ( '__undef__' ) + '.ebuild\n' )
-# sys.stderr.write ( '[### this is an ebuild: ###]\n' )
-# e.show ( sys.stderr )
-# sys.stderr.write ( '[### this was an ebuild: ###]\n' )
+ for e in ec.collect_ebuilds ():
+ sys.stderr.write ( '\n** ebuild, filename=' + e.suggest_name ( '__undef__' ) + '.ebuild\n' )
+ sys.stderr.write ( '[### this is an ebuild: ###]\n' )
+ e.show ( sys.stderr )
+ sys.stderr.write ( '[### this was an ebuild: ###]\n' )
ec.close()
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-13 16:34 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-13 16:34 UTC (permalink / raw
To: gentoo-commits
commit: bb203b139e8d529ab0b60074b367be7b34cf36d8
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 13 16:32:58 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 13 16:32:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=bb203b13
removed descreader
deleted: run_descreader.py
---
run_descreader.py | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/run_descreader.py b/run_descreader.py
deleted file mode 100755
index 926281e..0000000
--- a/run_descreader.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# Copyright 2006-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-import sys
-print ( "<=== run_descreader start ===>\n" )
-
-try:
- print ( "<=== run_descreader end ===>\n" )
-
-except Exception as err:
- print ( str ( err ) )
- print ( "<=== run_descreader failed ===>\n" )
- raise
-
-
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-12 17:17 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-12 17:17 UTC (permalink / raw
To: gentoo-commits
commit: b18e34a19f25242dcd08de1e4d4c7eef3e6f5825
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jun 12 17:17:22 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jun 12 17:17:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b18e34a1
temporary files for testing
---
Makefile | 3 +++
run_ebuildcreation.py | 14 ++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 443e66b..3f4e63c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,9 @@ PY_EBU2 = ./test_ebuildcreation.sh
default: dummy test
+clean-log:
+ rm -fv -- $(LOGDIR)/*.log
+
$(LOGDIR):
mkdir -v $(LOGDIR)
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index 11e0247..2e03efe 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -4,6 +4,7 @@
# Distributed under the terms of the GNU General Public License v2
import sys
+import logging
def me ( msg ):
sys.stderr.write ("<=== run_ebuildcreation " + msg + " ===>\n" )
@@ -25,6 +26,7 @@ try:
priority=25
)
ec.depresolve_main.add_rulepool ( testrules )
+ ec.depresolve_main.set_logmask ( -1 )
# add listeners
ec.depresolve_main.add_listener ( listeners.ResolvedFileListener ( config.get ( 'LOG.FILE.resolved' ) ) )
@@ -35,13 +37,13 @@ try:
if ec.add_package ( tarball ) is None:
raise Exception ( "ec.add() returns None, fix that." )
- ec.run ()
+ ec.start()
- for e in ec.collect_ebuilds ():
- sys.stderr.write ( '\n** ebuild, filename=' + e.suggest_name ( '__undef__' ) + '.ebuild\n' )
- sys.stderr.write ( '[### this is an ebuild: ###]\n' )
- e.show ( sys.stderr )
- sys.stderr.write ( '[### this was an ebuild: ###]\n' )
+# for e in ec.collect_ebuilds ():
+# sys.stderr.write ( '\n** ebuild, filename=' + e.suggest_name ( '__undef__' ) + '.ebuild\n' )
+# sys.stderr.write ( '[### this is an ebuild: ###]\n' )
+# e.show ( sys.stderr )
+# sys.stderr.write ( '[### this was an ebuild: ###]\n' )
ec.close()
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-11 18:31 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-11 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 46aa6fedc1736fe96e6f46138f76af383ed19193
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jun 11 18:14:16 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jun 11 18:14:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=46aa6fed
use listener modules in run_ebuildcreation.py
---
run_ebuildcreation.py | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index c3d0fc3..11e0247 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -11,16 +11,25 @@ def me ( msg ):
me ( "start" )
try:
- from roverlay.ebuildjob import EbuildJob
+ from roverlay import config
+ from roverlay.depres import simpledeprule, listeners
+ from roverlay.ebuildjob import EbuildJob
from roverlay.ebuildcreator import EbuildCreator
- from roverlay.depres import simpledeprule
ec = EbuildCreator ()
# todo: EbuildCreator should offer a method to load simple rules
- testrules = simpledeprule.SimpleDependencyRulePool ( 'test pool', filepath='simple-deprules.conf', priority=25 )
+ testrules = simpledeprule.SimpleDependencyRulePool (
+ 'test pool',
+ filepath='simple-deprules.conf',
+ priority=25
+ )
ec.depresolve_main.add_rulepool ( testrules )
+ # add listeners
+ ec.depresolve_main.add_listener ( listeners.ResolvedFileListener ( config.get ( 'LOG.FILE.resolved' ) ) )
+ ec.depresolve_main.add_listener ( listeners.UnresolvableFileListener ( config.get ( 'LOG.FILE.unresolvable' ) ) )
+
for tarball in sys.argv[1:]:
sys.stderr.write ( "Adding tarball " + tarball + " to the EbuildCreator.\n" )
if ec.add_package ( tarball ) is None:
@@ -34,6 +43,8 @@ try:
e.show ( sys.stderr )
sys.stderr.write ( '[### this was an ebuild: ###]\n' )
+ ec.close()
+
me ( "end" )
except Exception as err:
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-11 18:31 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-11 18:31 UTC (permalink / raw
To: gentoo-commits
commit: f4f917b8b3f1094a0727b41be799f74f31cff520
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jun 11 18:13:49 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jun 11 18:13:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f4f917b8
R-overlay.conf
---
R-overlay.conf | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
new file mode 100644
index 0000000..3d99153
--- /dev/null
+++ b/R-overlay.conf
@@ -0,0 +1,7 @@
+#LOG_LEVEL = 5
+#LOG_CONSOLE = y
+
+LOG_FILE = log/roverlay.log
+
+LOG_FILE_RESOLVED = log/dep_resolved.log
+LOG_FILE_UNRESOLVABLE = log/dep_unresolvable.log
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-11 18:31 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-11 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 59f85a10249a6382fbcd23bcf90d2669f724ce18
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jun 11 18:13:34 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jun 11 18:13:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=59f85a10
Makefile
---
Makefile | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 16f43e4..443e66b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,23 @@ EXAMPLES = ./examples
PYVER = 3
PY = python$(PYVER)
+LOGDIR = ./log
+
PY_NOP = ./nop.py
PY_EBU = ./run_ebuildcreation.py
PY_EBU2 = ./test_ebuildcreation.sh
-.PHONY: default dummy test test-nop test-ebuild_creation test-ebuild_creation2 test-seewave seewave
+.PHONY: default dummy test test-nop \
+ test-ebuild_creation \
+ test-ebuild_creation2 \
+ test-ebuild_creation3 \
+ test-seewave seewave
default: dummy test
+$(LOGDIR):
+ mkdir -v $(LOGDIR)
+
dummy:
$(PY) --version
@@ -21,7 +30,7 @@ seewave: test-seewave
test-seewave: test-nop $(PY_EBU) $(EXAMPLES)/packages
$(PY) $(PY_EBU) $(EXAMPLES)/packages/seewave_*.tar.gz
-test-nop: $(PY_NOP)
+test-nop: $(PY_NOP) $(LOGDIR)
@$(PY) $(PY_NOP)
# test-desc (file) has been removed in favor of test-desc (tar),
@@ -30,6 +39,9 @@ test-ebuild_creation: test-nop $(PY_EBU) $(EXAMPLES)/packages
$(PY) $(PY_EBU) $(EXAMPLES)/packages/*.tar.gz
test-ebuild_creation2: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
+ PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 100
+
+test-ebuild_creation3: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 1000
test: test-nop test-ebuild_creation test-ebuild_creation2 test-seewave
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-08 17:48 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-08 17:48 UTC (permalink / raw
To: gentoo-commits
commit: c151f290610e4ff267ac8aae80cf5fed2db1ce76
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 8 17:42:00 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 8 17:42:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=c151f290
Added rules to simple-deprules.conf
modified: simple-deprules.conf
---
simple-deprules.conf | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/simple-deprules.conf b/simple-deprules.conf
index 8d4eeb6..d0d7321 100644
--- a/simple-deprules.conf
+++ b/simple-deprules.conf
@@ -1,6 +1,6 @@
# simple dependency rules file
# you can specify single and multiline rules here
-#
+#
# a single line entry looks like
## <portage package> :: <dependency string>
#
@@ -12,11 +12,46 @@
## <dependency string n>
## }
#
+# ignored dependency strings can be written with '!' as portage package, e.g.
+## ! :: dev-lang/R
+#
+# The precedence order of the rules in this file is
+## single line ignore > single line > multi line ignore > multi line
+#
+# Note that you cannot write comments in a multiline rule, writing
+## dev-lang/R {
+## # the following dep should resolve to R
+## R(>= 2.15.0)
+## }
+# means that both strings '# the following dep should resolve to R' and
+# 'R(>= 2.15.0)' resolve to 'dev-lang/R'!
+#
+
+# the entries in this file are used to test ebuild creation of seewave_1.6.3.tar.gz.
+
+# provided by eclass
+! {
+ R(>= 2.15.0)
+}
+# used to test rule priorities
>=dev-lang/R-2.15.0 {
R(>= 2.15.0)
}
+# for R_SUGGESTS
+sci-R/sound :: sound
+
sci-libs/fftw :: FFTW
media-libs/flac :: FLAC
+
+
+! :: rgl
+! :: rpanel
+
+! {
+ tcltk
+ tuneR
+ audio
+}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-06 19:52 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-06 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 958f2f4431d047d06e98ea61711ec780a17bec61
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 6 19:51:47 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 6 19:51:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=958f2f44
simple dependency rules file
new file: simple-deprules.conf
---
simple-deprules.conf | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/simple-deprules.conf b/simple-deprules.conf
new file mode 100644
index 0000000..8d4eeb6
--- /dev/null
+++ b/simple-deprules.conf
@@ -0,0 +1,22 @@
+# simple dependency rules file
+# you can specify single and multiline rules here
+#
+# a single line entry looks like
+## <portage package> :: <dependency string>
+#
+# a multiline entry looks like
+## <portage package> {
+## <dependency string 1>
+## <dependency string 2>
+## ...
+## <dependency string n>
+## }
+#
+
+>=dev-lang/R-2.15.0 {
+ R(>= 2.15.0)
+}
+
+sci-libs/fftw :: FFTW
+
+media-libs/flac :: FLAC
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-06 19:52 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-06 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 9137204c93a066ed2cce07c5753b815edf6783c5
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 6 19:48:40 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 6 19:48:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9137204c
add dependency resolution to run_ebuildcreation.py
modified: run_ebuildcreation.py
---
run_ebuildcreation.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index 239ba82..c3d0fc3 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -13,9 +13,14 @@ me ( "start" )
try:
from roverlay.ebuildjob import EbuildJob
from roverlay.ebuildcreator import EbuildCreator
+ from roverlay.depres import simpledeprule
ec = EbuildCreator ()
+ # todo: EbuildCreator should offer a method to load simple rules
+ testrules = simpledeprule.SimpleDependencyRulePool ( 'test pool', filepath='simple-deprules.conf', priority=25 )
+ ec.depresolve_main.add_rulepool ( testrules )
+
for tarball in sys.argv[1:]:
sys.stderr.write ( "Adding tarball " + tarball + " to the EbuildCreator.\n" )
if ec.add_package ( tarball ) is None:
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-06 19:52 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-06 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 86c2cdddc5bbd9616e12226759d34e6ce36f2a61
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jun 6 19:41:42 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jun 6 19:41:42 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=86c2cddd
description_fields.conf: add isList to dep fields
modified: description_fields.conf
---
description_fields.conf | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/description_fields.conf b/description_fields.conf
index 7702296..864d95e 100644
--- a/description_fields.conf
+++ b/description_fields.conf
@@ -89,18 +89,23 @@ joinValues
[Suggests]
alias_nocase = Suggests, Suggest, %Suggests, Suggets, Recommends
+isList
[Depends]
alias_nocase = Depends, Dependencies, Dependes, %Depends, Depents, Require, Requires
+isList
[Imports]
alias_nocase = Imports, Import
+isList
[LinkingTo]
alias_nocase = LinkingTo, LinkingdTo, LinkinTo
+isList
[SystemRequirements]
alias_nocase = SystemRequirements, SystemRequirement
+isList
[OS_Type]
alias_nocase = OS_TYPE
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-01 15:46 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-01 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 8c6654317cc7d17cdb6014b30d1d8c51cbbfa32a
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 1 14:58:36 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 1 14:58:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8c665431
temporary files: test scripts
* removed test-desc from Makefile and added test-ebuild_creation2
* added PYTHON=2|3 to test_ebuildcreation.sh
modified: Makefile
modified: test_ebuildcreation.sh
---
Makefile | 11 +++++------
test_ebuildcreation.sh | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 10911c0..abc4fe8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,11 @@ EXAMPLES = ./examples
PYVER = 3
PY = python$(PYVER)
-PY_DESC_TESTER = ./run_descreader.py
PY_NOP = ./nop.py
PY_EBU = ./run_ebuildcreation.py
+PY_EBU2 = ./test_ebuildcreation.sh
-.PHONY: default dummy test test-nop \
- test-ebuild_creation test-desc
+.PHONY: default dummy test test-nop test-ebuild_creation test-ebuild_creation2
default: dummy test
@@ -25,7 +24,7 @@ test-nop: $(PY_NOP)
test-ebuild_creation: test-nop $(PY_EBU) $(EXAMPLES)/packages
$(PY) $(PY_EBU) $(EXAMPLES)/packages/*.tar.gz
-test-desc: test-nop $(PY_DESC_TESTER) $(EXAMPLES)/packages
- $(PY) $(PY_DESC_TESTER) $(EXAMPLES)/packages/*.tar.gz
+test-ebuild_creation2: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
+ PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 1000
-test: test-nop test-desc test-ebuild_creation
+test: test-nop test-ebuild_creation test-ebuild_creation2
diff --git a/test_ebuildcreation.sh b/test_ebuildcreation.sh
index 7f838e8..71b352d 100755
--- a/test_ebuildcreation.sh
+++ b/test_ebuildcreation.sh
@@ -6,7 +6,7 @@ readonly _SELF="${0##*/}"
readonly _SELF_NAME="${_SELF%.*sh}"
readonly TEST_SECTION="${_SELF_NAME#test_}"
#
-readonly py=python3
+readonly py=${PYTHON:-python3}
#
_ROOT=`pwd`
if [[ ! -e "${_ROOT}/examples" ]]; then
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-06-01 15:46 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-06-01 15:46 UTC (permalink / raw
To: gentoo-commits
commit: b926a22a4ce705cb9ddf2bce8253ed8c708d4993
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 1 15:00:18 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 1 15:00:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b926a22a
README and description_fields.conf
new file: README
new file: description_fields.conf
---
README | 51 ++++++++++++++++++++++
description_fields.conf | 107 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+), 0 deletions(-)
diff --git a/README b/README
new file mode 100644
index 0000000..8147b52
--- /dev/null
+++ b/README
@@ -0,0 +1,51 @@
+R overlay -- README
+
+== How to use ==
+
+There is currently no "R overlay" script, only modules that implement functionality.
+
+=== Running tests ===
+
+Real tests are scheduled for July 10 - July 30.
+
+In the meantime, there are some test scripts (run_<something>.py,test_<something>.sh)
+and a Makefile that provide basic testing.
+
+To run them you need to create a directory <root>/examples/packages and
+put some R packages into it (expected suffix is .tar.gz),
+where <root> is the directory containing this README file.
+
+You can then run:
+ make <some test>
+ where <some test> is
+ * test-nop -- tries to import roverlay, but does nothing
+ * test-ebuild_creation -- tries to create an ebuild for each package in examples/packages
+ * test-ebuild_creation -- tries to create 1000 ebuilds for each package in examples/packages
+ * test -- runs all of the above tests
+ * dummy -- prints python version in use, run
+ make PYVER=2 <some test> or make PYVER=3 <some test>
+ use a specific one
+
+ or:
+ ./test_ebuildcreation.sh [-q] [count]
+ -- runs count * "number of packages in examples/packages"
+ ebuild creations in one script call.
+ Use '-q' to suppress the script output (e.g. ebuilds).
+
+ ./run_ebuildcreation.py <packages>
+ -- runs ebuild creations for the given packages
+
+
+
+
+== Configuration ==
+
+* main configuration
+shell-like syntax (using shlex), TODO
+
+* description field configuration
+ConfigParser syntax, please see 'description_fields.conf' in this directory.
+
+* dependency rules configuration
+<scheduled for July 1>
+
diff --git a/description_fields.conf b/description_fields.conf
new file mode 100644
index 0000000..7702296
--- /dev/null
+++ b/description_fields.conf
@@ -0,0 +1,107 @@
+# R overlay -- description field definition
+# Copyright 2006-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+
+# ----------------------------------------------------------------------------
+#
+# This file controls how DESCRIPTION fields are used
+# It is read in raw mode so that strings like '%var' are not interpolated.
+# A per-field section is introduced with [<field name>] and
+# contains flags and options.
+#
+#
+# known field options are:
+#
+# default_value = <some value>
+# -- set the default value for this field,
+# which implies that any read description data
+# will contain this field (with value either
+# from the description file or the default one).
+# 'Disables' the mandatory flag.
+#
+# allowed_value = <some value>
+# -- declares that this field has a value
+# whitelist and adds <some value> to this list.
+#
+# allowed_values = <some values>
+# -- same as allowed_value but witj multiple values
+#
+# alias_withcase = <aliases>,
+# alias = <aliases>
+# -- declares case-sensitive field name aliases
+# aliases can be used to fix typos as well as
+# to remap/merge fields (e.g. Title -> Description)
+#
+# alias_nocase = <aliases>
+# -- declares case-insenstivite field names aliases
+#
+#
+# flags = <flags>
+# -- add flags to this field; note that any value-less
+# option is interpreted as flag
+#
+# options with multiple values are read as a <value>[, <value>]* list
+#
+# and known field flags are:
+# joinValues
+# -- declares that the field's value is one string even if it
+# spans over multiple lines (the lines will be joined with ' ')
+# isList
+# -- declares that the field's value is a list
+# (the default regex for splitting the values is '\s*[,;]{1}\s*')
+#
+# isWhitespaceList
+# -- declares that the field's value is a list
+# separated by whitespace. Has no effect if 'isList' is set.
+# mandatory
+# -- declares that this field has to have an value that evaluates
+# to True (value is set and not empty).
+# This flag is (effectively) useless in conjunction with
+# default_value unless the default value evaluates to False.
+#
+# ignore
+# -- ignore this field entirely
+#
+#
+# Flags are always case-insensitive.
+# Note that it is not checked whether a flag is known or not,
+# which means you can add anything here.
+#
+# ----------------------------------------------------------------------------
+
+
+[Description]
+joinValues
+
+[Title]
+joinValues
+
+[Package]
+joinValues
+
+[License]
+isList
+
+[Version]
+mandatory
+joinValues
+
+[Suggests]
+alias_nocase = Suggests, Suggest, %Suggests, Suggets, Recommends
+
+[Depends]
+alias_nocase = Depends, Dependencies, Dependes, %Depends, Depents, Require, Requires
+
+[Imports]
+alias_nocase = Imports, Import
+
+[LinkingTo]
+alias_nocase = LinkingTo, LinkingdTo, LinkinTo
+
+[SystemRequirements]
+alias_nocase = SystemRequirements, SystemRequirement
+
+[OS_Type]
+alias_nocase = OS_TYPE
+allowed_values = unix
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-05-31 18:24 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-05-31 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 95226ca095165a2fa021663bc23b52e32f70a1f3
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu May 31 18:22:25 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu May 31 18:22:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=95226ca0
temporary files
---
run_descreader.py | 9 +--------
run_ebuildcreation.py | 3 ++-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/run_descreader.py b/run_descreader.py
index b113510..926281e 100755
--- a/run_descreader.py
+++ b/run_descreader.py
@@ -4,16 +4,9 @@
# Distributed under the terms of the GNU General Public License v2
import sys
-sys.stderr.write ( "<=== run_descreader start ===>\n" )
+print ( "<=== run_descreader start ===>\n" )
try:
- import roverlay.fileio
-
- reader = roverlay.fileio.DescriptionReader()
-
- for tarball in sys.argv[1:]:
- reader.readfile ( tarball )
-
print ( "<=== run_descreader end ===>\n" )
except Exception as err:
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index 2f522b5..239ba82 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -24,7 +24,8 @@ try:
ec.run ()
for e in ec.collect_ebuilds ():
- sys.stderr.write ( '\n[### this is an ebuild: ###]\n' )
+ sys.stderr.write ( '\n** ebuild, filename=' + e.suggest_name ( '__undef__' ) + '.ebuild\n' )
+ sys.stderr.write ( '[### this is an ebuild: ###]\n' )
e.show ( sys.stderr )
sys.stderr.write ( '[### this was an ebuild: ###]\n' )
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-05-31 18:24 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-05-31 18:24 UTC (permalink / raw
To: gentoo-commits
commit: cbaac66e07248d36498d842debb10995464b8652
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu May 31 18:21:45 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu May 31 18:21:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=cbaac66e
gitignore
---
.gitignore | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index e63ec4d..776f770 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/examples/packages/*.tgz
/examples/packages/*.tar.gz
/bak/
+/perf-stats/
# these are just symlinks to files in roverlay/
/c.py
@@ -12,3 +13,6 @@
*~
~*
*.swp
+
+roverlay.log
+/TODO
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-05-30 19:36 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-05-30 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 4244739b888da20e9203b2ccd6c16978790865e7
Author: Andre Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May 30 18:03:44 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May 30 18:03:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=4244739b
test_ebuildcreation.sh: temporary script; tests run_ebuildcreation.py with a high package number at once
new file: test_ebuildcreation.sh
---
test_ebuildcreation.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/test_ebuildcreation.sh b/test_ebuildcreation.sh
new file mode 100755
index 0000000..7f838e8
--- /dev/null
+++ b/test_ebuildcreation.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+set -u
+set -e
+readonly ARGV="$*"
+readonly _SELF="${0##*/}"
+readonly _SELF_NAME="${_SELF%.*sh}"
+readonly TEST_SECTION="${_SELF_NAME#test_}"
+#
+readonly py=python3
+#
+_ROOT=`pwd`
+if [[ ! -e "${_ROOT}/examples" ]]; then
+ _ROOT="${_ROOT%/*}"
+fi
+readonly EXAMPLES="${_ROOT}/examples"
+readonly PKGDIR="${EXAMPLES}/packages"
+
+
+if [[ "${TEST_SECTION}" == "ebuildcreation" ]]; then
+ if [[ "${1:-}" == "-q" ]]; then
+ q=1
+ shift ||:
+ else q=0; fi
+
+ declare -i multiply=${1:-1}
+ [[ $multiply -gt 0 ]] || multiply=1
+ pkgline=""
+ pkgcount=0
+ for x in "${PKGDIR}"/*.tar.gz "${PKGDIR}"/*.tgz; do
+ if [[ -r "$x" ]]; then
+ pkgline+=" ${x}"
+ ((pkgcount++)) ||:
+ fi
+ done
+ pkgline="${pkgline# }"
+
+ argline=""
+ for i in `seq 1 $multiply`; do
+ argline+=" ${pkgline}"
+ done
+
+ num=$(( $multiply * $pkgcount ))
+ echo "Please note: python may return 'Argument list too long'. Double check your result if it's too fantastic to believe. (28500 pkgs could work, but 30000 don't)." 1>&2
+ echo "Creating $num packages" 1>&2
+ time {
+ if [[ $q -eq 1 ]]; then
+ &>/dev/null $py "${_ROOT}/run_ebuildcreation.py" $argline || echo fail 1>&2
+ else
+ $py "${_ROOT}/run_ebuildcreation.py" $argline
+ fi;
+ }
+ echo "Done creating $num packages" 1>&2
+else
+ echo "test section not defined: ${TEST_SECTION}"
+ exit ${__UNDEF__:-102}
+fi
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-05-30 16:09 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-05-30 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 8b8b3983172965c2534e15172814af79c0286d4e
Author: Andre Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May 30 16:06:44 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May 30 16:06:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8b8b3983
run_ebuildcreation : more verbose, run_ebuildcreation not run_x
---
run_ebuildcreation.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index ee9ea49..2f522b5 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -6,7 +6,7 @@
import sys
def me ( msg ):
- sys.stderr.write ("<=== run_x " + msg + " ===>\n" )
+ sys.stderr.write ("<=== run_ebuildcreation " + msg + " ===>\n" )
me ( "start" )
@@ -17,6 +17,7 @@ try:
ec = EbuildCreator ()
for tarball in sys.argv[1:]:
+ sys.stderr.write ( "Adding tarball " + tarball + " to the EbuildCreator.\n" )
if ec.add_package ( tarball ) is None:
raise Exception ( "ec.add() returns None, fix that." )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/R_overlay:master commit in: /
@ 2012-05-30 10:58 André Erdmann
0 siblings, 0 replies; 146+ messages in thread
From: André Erdmann @ 2012-05-30 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 402cab389f93837f91bb6146fdca342468f7a2eb
Author: Andre Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May 30 10:57:14 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May 30 10:58:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=402cab38
temporary files: add encoding / run_ebuildcreation update
---
run_descreader.py | 1 +
run_ebuildcreation.py | 33 +++++++++++++++++++++------------
2 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/run_descreader.py b/run_descreader.py
index 9ea0c92..b113510 100755
--- a/run_descreader.py
+++ b/run_descreader.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
# Copyright 2006-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index e67b772..ee9ea49 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -1,28 +1,37 @@
#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
# Copyright 2006-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import sys
-sys.stderr.write ( "<=== run_ebuildcreation start ===>\n" )
+def me ( msg ):
+ sys.stderr.write ("<=== run_x " + msg + " ===>\n" )
-try:
- import roverlay.ebuildcreator
+me ( "start" )
- efac = roverlay.ebuildcreator.EbuildFactory()
+try:
+ from roverlay.ebuildjob import EbuildJob
+ from roverlay.ebuildcreator import EbuildCreator
- ebuild_creators = []
+ ec = EbuildCreator ()
for tarball in sys.argv[1:]:
- ec = efac.get_ebuild_creator ( tarball )
- if ec: ebuild_creators.append ( ec )
+ if ec.add_package ( tarball ) is None:
+ raise Exception ( "ec.add() returns None, fix that." )
+
+ ec.run ()
- for job in ebuild_creators:
- job.run ()
+ for e in ec.collect_ebuilds ():
+ sys.stderr.write ( '\n[### this is an ebuild: ###]\n' )
+ e.show ( sys.stderr )
+ sys.stderr.write ( '[### this was an ebuild: ###]\n' )
- sys.stderr.write ( "<=== run_ebuildcreation end ===>\n" )
+ me ( "end" )
except Exception as err:
- sys.stderr.write ( str ( err ) + "\n" )
- sys.stderr.write ( "<=== run_ebuildcreation failed ===>\n" )
+ print ( str ( err ) )
+ me ( "failed" )
raise
+
+
^ permalink raw reply related [flat|nested] 146+ messages in thread
end of thread, other threads:[~2020-11-24 10:41 UTC | newest]
Thread overview: 146+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-01 12:44 [gentoo-commits] proj/R_overlay:master commit in: / André Erdmann
-- strict thread matches above, loose matches on Subject: below --
2020-11-24 10:41 Benda XU
2015-11-05 5:15 Benda XU
2015-01-26 17:41 André Erdmann
2014-07-16 15:14 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-06-05 22:09 André Erdmann
2014-04-01 16:38 André Erdmann
2014-04-01 16:38 André Erdmann
2014-02-22 14:56 André Erdmann
2014-02-22 14:56 André Erdmann
2014-02-21 18:15 André Erdmann
2014-02-16 3:44 Benda XU
2014-01-25 18:14 André Erdmann
2013-12-11 18:40 André Erdmann
2013-09-23 15:30 André Erdmann
2013-09-23 15:30 André Erdmann
2013-09-23 15:30 André Erdmann
2013-09-23 15:30 André Erdmann
2013-09-18 14:00 André Erdmann
2013-09-18 14:00 André Erdmann
2013-09-16 8:56 André Erdmann
2013-09-13 15:10 André Erdmann
2013-09-12 16:36 André Erdmann
2013-09-12 8:27 André Erdmann
2013-09-12 8:27 André Erdmann
2013-09-11 14:59 André Erdmann
2013-09-11 14:59 André Erdmann
2013-09-11 10:27 André Erdmann
2013-09-11 10:19 André Erdmann
2013-09-11 10:19 André Erdmann
2013-09-04 15:36 André Erdmann
2013-08-29 15:22 André Erdmann
2013-08-16 10:58 André Erdmann
2013-08-16 10:57 André Erdmann
2013-08-16 10:53 André Erdmann
2013-08-16 10:43 André Erdmann
2013-08-16 10:43 André Erdmann
2013-08-14 14:56 André Erdmann
2013-08-14 14:56 André Erdmann
2013-08-12 8:18 André Erdmann
2013-08-09 10:18 André Erdmann
2013-08-05 11:44 André Erdmann
2013-08-01 12:44 André Erdmann
2013-07-25 13:25 André Erdmann
2013-07-23 18:34 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-23 18:34 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-23 14:57 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-23 14:57 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-12 17:11 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-12 17:11 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-12 14:03 André Erdmann
2013-07-11 16:44 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-11 16:29 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-11 10:36 André Erdmann
2013-07-10 16:16 André Erdmann
2013-07-10 16:16 André Erdmann
2013-07-10 15:10 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
2013-07-10 16:16 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
2013-07-03 10:05 André Erdmann
2013-06-22 15:24 André Erdmann
2013-06-22 15:24 André Erdmann
2013-02-09 21:23 André Erdmann
2013-02-09 20:45 André Erdmann
2013-02-03 19:32 André Erdmann
2013-01-28 23:56 André Erdmann
2013-01-27 16:51 Denis Dupeyron
2013-01-25 23:27 Denis Dupeyron
2013-01-25 17:44 Denis Dupeyron
2013-01-09 19:15 André Erdmann
2012-08-20 10:39 André Erdmann
2012-08-20 10:39 André Erdmann
2012-08-17 17:26 André Erdmann
2012-08-10 15:16 André Erdmann
2012-08-10 15:16 André Erdmann
2012-08-10 15:16 André Erdmann
2012-08-10 15:16 André Erdmann
2012-08-08 23:46 André Erdmann
2012-08-08 23:46 André Erdmann
2012-08-07 8:50 André Erdmann
2012-08-06 19:01 André Erdmann
2012-08-03 15:04 André Erdmann
2012-08-03 15:04 André Erdmann
2012-08-03 15:04 André Erdmann
2012-08-03 15:04 André Erdmann
2012-08-03 13:59 André Erdmann
2012-08-03 13:38 André Erdmann
2012-08-03 13:38 André Erdmann
2012-08-01 21:10 André Erdmann
2012-08-01 7:38 André Erdmann
2012-07-30 15:53 André Erdmann
2012-07-30 15:53 André Erdmann
2012-07-16 16:15 André Erdmann
2012-07-11 18:43 André Erdmann
2012-07-11 18:43 André Erdmann
2012-07-10 18:03 André Erdmann
2012-07-09 17:19 André Erdmann
2012-07-09 17:19 André Erdmann
2012-07-09 17:19 André Erdmann
2012-07-09 17:19 André Erdmann
2012-07-06 22:19 André Erdmann
2012-07-06 22:19 André Erdmann
2012-07-06 8:15 André Erdmann
2012-07-05 16:01 André Erdmann
2012-07-05 16:00 André Erdmann
2012-07-04 18:21 André Erdmann
2012-07-04 18:21 André Erdmann
2012-07-04 18:21 André Erdmann
2012-07-03 17:48 André Erdmann
2012-07-03 17:48 André Erdmann
2012-06-29 22:48 André Erdmann
2012-06-29 22:48 André Erdmann
2012-06-27 14:46 André Erdmann
2012-06-27 14:46 André Erdmann
2012-06-26 15:42 André Erdmann
2012-06-26 15:42 André Erdmann
2012-06-25 18:19 André Erdmann
2012-06-22 18:13 André Erdmann
2012-06-22 18:13 André Erdmann
2012-06-22 18:13 André Erdmann
2012-06-21 16:55 André Erdmann
2012-06-20 19:03 André Erdmann
2012-06-20 19:03 André Erdmann
2012-06-15 20:34 André Erdmann
2012-06-15 20:34 André Erdmann
2012-06-15 20:34 André Erdmann
2012-06-15 20:34 André Erdmann
2012-06-13 16:34 André Erdmann
2012-06-13 16:34 André Erdmann
2012-06-12 17:17 André Erdmann
2012-06-11 18:31 André Erdmann
2012-06-11 18:31 André Erdmann
2012-06-11 18:31 André Erdmann
2012-06-08 17:48 André Erdmann
2012-06-06 19:52 André Erdmann
2012-06-06 19:52 André Erdmann
2012-06-06 19:52 André Erdmann
2012-06-01 15:46 André Erdmann
2012-06-01 15:46 André Erdmann
2012-05-31 18:24 André Erdmann
2012-05-31 18:24 André Erdmann
2012-05-30 19:36 André Erdmann
2012-05-30 16:09 André Erdmann
2012-05-30 10:58 André Erdmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox