* [gentoo-commits] proj/R_overlay:gsoc13/next commit in: /, scripts/
2013-07-10 16:16 [gentoo-commits] proj/R_overlay:master commit in: /, scripts/ André Erdmann
@ 2013-07-10 15:10 ` André Erdmann
0 siblings, 0 replies; 2+ messages in thread
From: André Erdmann @ 2013-07-10 15:10 UTC (permalink / raw
To: gentoo-commits
commit: b405f92a6f08763c2af4d4d36c66e0c0f979c58b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 14:51:24 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 14:51:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b405f92a
update setup.py / exclude local directories
---
scripts/gen_setuppy.sh | 28 +++++++++++++---
setup.py | 88 ++++++++++++++++++++++++++++++--------------------
2 files changed, 76 insertions(+), 40 deletions(-)
diff --git a/scripts/gen_setuppy.sh b/scripts/gen_setuppy.sh
index ebba44e..01a2087 100755
--- a/scripts/gen_setuppy.sh
+++ b/scripts/gen_setuppy.sh
@@ -27,7 +27,7 @@ readonly S="${PRJROOT}"
: ${PRJ_AUTHOR_EMAIL:='dywi@mailerd.de'}
: ${PRJ_LICENSE:='GPLv2+'}
: ${PRJ_URL:='http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary'}
-: ${PRJ_SCRIPTS:='roverlay.py'}
+: ${PRJ_SCRIPTS='roverlay.py'}
if [ -z "${PRJ_VERSION-}" ]; then
PRJ_VERSION=$( sed -rn -e \
@@ -46,11 +46,29 @@ case "${PRJ_VERSION}" in
esac
# --- end PRJ_* ---
+get_pkglist() {
+ if [ -e "${1}/local" ]; then
+ echo "excluding ${1}: local" 1>&2
+ elif [ "${1##*/}" == '__pycache__' ]; then
+ true
+ else
+ echo "${I}${I}${Q}${1%/}${Q}"
+ local d
+ for d in ${1}/*; do
+ if [ -d "${d}" ]; then
+ get_pkglist "${d}" || return
+ fi
+ done
+ fi
+ return 0
+}
-PKGLIST=$(
- find roverlay/ -type d -not -name __pycache__| \
- sort | sed -e "s=^=${I}${I}$Q=" -e "s=[/]*$=$Q,=" -e 's=[/]=.=g'
-)
+PKGLIST=$( get_pkglist roverlay | sort | sed -e 's=[/]=.=g' )
+
+#PKGLIST=$(
+# find roverlay/ -type d -not -name __pycache__| \
+# sort | sed -e "s=^=${I}${I}$Q=" -e "s=[/]*$=$Q,=" -e 's=[/]=.=g'
+#)
diff --git a/setup.py b/setup.py
index 3631094..24cc7d9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,40 +1,58 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# -*- coding: utf-8 -*-
-from distutils import core
+import distutils.core
-VERSION = '0.2.4'
+distutils.core.setup (
+ name = 'R_Overlay',
+ version = '0.2.4',
+ description = 'Automatically generated overlay of R packages (SoC2012)',
+ author = 'André Erdmann',
+ author_email = 'dywi@mailerd.de',
+ license = 'GPLv2+',
+ url = 'http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary',
+ packages = [
+ 'roverlay'
+ 'roverlay.config'
+ 'roverlay.db'
+ 'roverlay.depres'
+ 'roverlay.depres.simpledeprule'
+ 'roverlay.ebuild'
+ 'roverlay.interface'
+ 'roverlay.overlay'
+ 'roverlay.overlay.pkgdir'
+ 'roverlay.overlay.pkgdir.distroot'
+ 'roverlay.overlay.pkgdir.manifest'
+ 'roverlay.overlay.pkgdir.metadata'
+ 'roverlay.packagerules'
+ 'roverlay.packagerules.abstract'
+ 'roverlay.packagerules.acceptors'
+ 'roverlay.packagerules.actions'
+ 'roverlay.packagerules.parser'
+ 'roverlay.packagerules.parser.context'
+ 'roverlay.recipe'
+ 'roverlay.remote'
+ 'roverlay.rpackage'
+ 'roverlay.tools'
+ 'roverlay.util'
+ ],
+ scripts = [
+ 'roverlay.py',
+ ],
+ data_files = [
-core.setup (
- name = 'R_Overlay',
- version = VERSION,
- description = 'Automatically generated overlay of R packages (SoC2012)',
- author = 'André Erdmann',
- author_email = 'dywi@mailerd.de',
- license = 'GPL',
- url = 'http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary',
- packages = (
- 'roverlay',
- 'roverlay/config',
- 'roverlay/db',
- 'roverlay/depres',
- 'roverlay/depres/simpledeprule',
- 'roverlay/ebuild',
- 'roverlay/overlay',
- 'roverlay/overlay/pkgdir',
- 'roverlay/overlay/pkgdir/distroot',
- #'roverlay/overlay/pkgdir/manifest',
- 'roverlay/overlay/pkgdir/metadata',
- 'roverlay/packagerules',
- 'roverlay/packagerules/abstract',
- 'roverlay/packagerules/acceptors',
- 'roverlay/packagerules/actions',
- 'roverlay/packagerules/parser',
- 'roverlay/packagerules/parser/context',
- 'roverlay/recipe',
- 'roverlay/remote',
- 'roverlay/rpackage',
- 'roverlay/tools',
- 'roverlay/util',
- ),
+ ],
+ classifiers = [
+ #'Development Status :: 3 - Alpha',
+ 'Development Status :: 4 - Beta',
+ 'Environment :: Console',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: System Administrators',
+ 'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
+ 'Operating System :: POSIX :: Linux',
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Unix Shell',
+ 'Topic :: System :: Software Distribution',
+ ],
)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/R_overlay:master commit in: /, scripts/
@ 2013-07-10 16:16 André Erdmann
2013-07-10 15:10 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
0 siblings, 1 reply; 2+ messages in thread
From: André Erdmann @ 2013-07-10 16:16 UTC (permalink / raw
To: gentoo-commits
commit: b405f92a6f08763c2af4d4d36c66e0c0f979c58b
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 14:51:24 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 14:51:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b405f92a
update setup.py / exclude local directories
---
scripts/gen_setuppy.sh | 28 +++++++++++++---
setup.py | 88 ++++++++++++++++++++++++++++++--------------------
2 files changed, 76 insertions(+), 40 deletions(-)
diff --git a/scripts/gen_setuppy.sh b/scripts/gen_setuppy.sh
index ebba44e..01a2087 100755
--- a/scripts/gen_setuppy.sh
+++ b/scripts/gen_setuppy.sh
@@ -27,7 +27,7 @@ readonly S="${PRJROOT}"
: ${PRJ_AUTHOR_EMAIL:='dywi@mailerd.de'}
: ${PRJ_LICENSE:='GPLv2+'}
: ${PRJ_URL:='http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary'}
-: ${PRJ_SCRIPTS:='roverlay.py'}
+: ${PRJ_SCRIPTS='roverlay.py'}
if [ -z "${PRJ_VERSION-}" ]; then
PRJ_VERSION=$( sed -rn -e \
@@ -46,11 +46,29 @@ case "${PRJ_VERSION}" in
esac
# --- end PRJ_* ---
+get_pkglist() {
+ if [ -e "${1}/local" ]; then
+ echo "excluding ${1}: local" 1>&2
+ elif [ "${1##*/}" == '__pycache__' ]; then
+ true
+ else
+ echo "${I}${I}${Q}${1%/}${Q}"
+ local d
+ for d in ${1}/*; do
+ if [ -d "${d}" ]; then
+ get_pkglist "${d}" || return
+ fi
+ done
+ fi
+ return 0
+}
-PKGLIST=$(
- find roverlay/ -type d -not -name __pycache__| \
- sort | sed -e "s=^=${I}${I}$Q=" -e "s=[/]*$=$Q,=" -e 's=[/]=.=g'
-)
+PKGLIST=$( get_pkglist roverlay | sort | sed -e 's=[/]=.=g' )
+
+#PKGLIST=$(
+# find roverlay/ -type d -not -name __pycache__| \
+# sort | sed -e "s=^=${I}${I}$Q=" -e "s=[/]*$=$Q,=" -e 's=[/]=.=g'
+#)
diff --git a/setup.py b/setup.py
index 3631094..24cc7d9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,40 +1,58 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# -*- coding: utf-8 -*-
-from distutils import core
+import distutils.core
-VERSION = '0.2.4'
+distutils.core.setup (
+ name = 'R_Overlay',
+ version = '0.2.4',
+ description = 'Automatically generated overlay of R packages (SoC2012)',
+ author = 'André Erdmann',
+ author_email = 'dywi@mailerd.de',
+ license = 'GPLv2+',
+ url = 'http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary',
+ packages = [
+ 'roverlay'
+ 'roverlay.config'
+ 'roverlay.db'
+ 'roverlay.depres'
+ 'roverlay.depres.simpledeprule'
+ 'roverlay.ebuild'
+ 'roverlay.interface'
+ 'roverlay.overlay'
+ 'roverlay.overlay.pkgdir'
+ 'roverlay.overlay.pkgdir.distroot'
+ 'roverlay.overlay.pkgdir.manifest'
+ 'roverlay.overlay.pkgdir.metadata'
+ 'roverlay.packagerules'
+ 'roverlay.packagerules.abstract'
+ 'roverlay.packagerules.acceptors'
+ 'roverlay.packagerules.actions'
+ 'roverlay.packagerules.parser'
+ 'roverlay.packagerules.parser.context'
+ 'roverlay.recipe'
+ 'roverlay.remote'
+ 'roverlay.rpackage'
+ 'roverlay.tools'
+ 'roverlay.util'
+ ],
+ scripts = [
+ 'roverlay.py',
+ ],
+ data_files = [
-core.setup (
- name = 'R_Overlay',
- version = VERSION,
- description = 'Automatically generated overlay of R packages (SoC2012)',
- author = 'André Erdmann',
- author_email = 'dywi@mailerd.de',
- license = 'GPL',
- url = 'http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary',
- packages = (
- 'roverlay',
- 'roverlay/config',
- 'roverlay/db',
- 'roverlay/depres',
- 'roverlay/depres/simpledeprule',
- 'roverlay/ebuild',
- 'roverlay/overlay',
- 'roverlay/overlay/pkgdir',
- 'roverlay/overlay/pkgdir/distroot',
- #'roverlay/overlay/pkgdir/manifest',
- 'roverlay/overlay/pkgdir/metadata',
- 'roverlay/packagerules',
- 'roverlay/packagerules/abstract',
- 'roverlay/packagerules/acceptors',
- 'roverlay/packagerules/actions',
- 'roverlay/packagerules/parser',
- 'roverlay/packagerules/parser/context',
- 'roverlay/recipe',
- 'roverlay/remote',
- 'roverlay/rpackage',
- 'roverlay/tools',
- 'roverlay/util',
- ),
+ ],
+ classifiers = [
+ #'Development Status :: 3 - Alpha',
+ 'Development Status :: 4 - Beta',
+ 'Environment :: Console',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: System Administrators',
+ 'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
+ 'Operating System :: POSIX :: Linux',
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Unix Shell',
+ 'Topic :: System :: Software Distribution',
+ ],
)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-10 16:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-10 16:16 [gentoo-commits] proj/R_overlay:master commit in: /, scripts/ André Erdmann
2013-07-10 15:10 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox