From 136bb01a67fed7c55426b62cbe84b1dc8818a55f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:43:12 +0200 Subject: [PATCH] correct placement in build script Signed-off-by: Nico Schottelius --- build | 33 +++++++++++++++++++-------------- setup.py | 9 +++++++-- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/build b/build index 1dedabba..7d73224d 100755 --- a/build +++ b/build @@ -89,8 +89,13 @@ case "$1" in ;; pypi) - $0 very-clean - $0 man + #$0 very-clean + #$0 man + $0 version-dist + $0 sdist + $0 version-dynamic + ;; + sdist) python3 setup.py sdist ;; @@ -159,7 +164,6 @@ case "$1" in test) shift # skip t - export PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib if [ $# -lt 1 ]; then python3 -m cdist.test @@ -168,6 +172,18 @@ case "$1" in fi ;; + version-dynamic) + cd cdist/ + ln -sf version_dynamic.py version.py + ;; + + version-dist) + version=$(cat .version) + cd cdist/ + echo "VERSION=\"$version\"" > version_static.py + ln -sf version_static.py version.py + ;; + *) echo '' echo 'Welcome to cdist!' @@ -183,15 +199,4 @@ case "$1" in exit 1 ;; - version-dynamic) - cd lib/cdist/ - ln -sf version_dynamic.py version.py - ;; - - version-dist) - version=$(cat .version) - cd lib/cdist/ - echo "VERSION=\"$version\"" > version_static.py - ln -sf version_static.py version.py - ;; esac diff --git a/setup.py b/setup.py index 92194071..62ee480c 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,14 @@ from distutils.core import setup +package_dir = {'': 'lib'} + +import cdist + setup( name = "cdist", - packages = ["cdist"], - version = "2.1.0", + packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ], + scripts = ["cdist.py"], + version = cdist.version.VERSION, description = "Usable configuration management system", author = "Nico Schottelius", author_email = "nico-cdist-pypi@schottelius.org",