forked from ungleich-public/cdist
		
	correct placement in build script
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								91c1374657
							
						
					
				
			
			
				commit
				
					
						136bb01a67
					
				
			
		
					 2 changed files with 26 additions and 16 deletions
				
			
		
							
								
								
									
										33
									
								
								build
									
										
									
									
									
								
							
							
						
						
									
										33
									
								
								build
									
										
									
									
									
								
							| 
						 | 
					@ -89,8 +89,13 @@ case "$1" in
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pypi)
 | 
					    pypi)
 | 
				
			||||||
        $0 very-clean
 | 
					        #$0 very-clean
 | 
				
			||||||
        $0 man
 | 
					        #$0 man
 | 
				
			||||||
 | 
					        $0 version-dist
 | 
				
			||||||
 | 
					        $0 sdist
 | 
				
			||||||
 | 
					        $0 version-dynamic
 | 
				
			||||||
 | 
					    ;;
 | 
				
			||||||
 | 
					    sdist)
 | 
				
			||||||
        python3 setup.py sdist
 | 
					        python3 setup.py sdist
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -159,7 +164,6 @@ case "$1" in
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    test)
 | 
					    test)
 | 
				
			||||||
        shift # skip t
 | 
					        shift # skip t
 | 
				
			||||||
        export PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if [ $# -lt 1 ]; then
 | 
					        if [ $# -lt 1 ]; then
 | 
				
			||||||
            python3 -m cdist.test
 | 
					            python3 -m cdist.test
 | 
				
			||||||
| 
						 | 
					@ -168,6 +172,18 @@ case "$1" in
 | 
				
			||||||
        fi
 | 
					        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 ''
 | 
				
			||||||
        echo 'Welcome to cdist!'
 | 
					        echo 'Welcome to cdist!'
 | 
				
			||||||
| 
						 | 
					@ -183,15 +199,4 @@ case "$1" in
 | 
				
			||||||
        exit 1
 | 
					        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
 | 
					esac
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										9
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										9
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -1,9 +1,14 @@
 | 
				
			||||||
from distutils.core import setup
 | 
					from distutils.core import setup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					package_dir = {'': 'lib'}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import cdist
 | 
				
			||||||
 | 
					
 | 
				
			||||||
setup(
 | 
					setup(
 | 
				
			||||||
    name = "cdist",
 | 
					    name = "cdist",
 | 
				
			||||||
    packages = ["cdist"],
 | 
					    packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ],
 | 
				
			||||||
    version = "2.1.0",
 | 
					    scripts = ["cdist.py"],
 | 
				
			||||||
 | 
					    version = cdist.version.VERSION,
 | 
				
			||||||
    description = "Usable configuration management system",
 | 
					    description = "Usable configuration management system",
 | 
				
			||||||
    author = "Nico Schottelius",
 | 
					    author = "Nico Schottelius",
 | 
				
			||||||
    author_email = "nico-cdist-pypi@schottelius.org",
 | 
					    author_email = "nico-cdist-pypi@schottelius.org",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue