forked from ungleich-public/cdist
		
	include base for dynamic and static versioning
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								afbfc031f7
							
						
					
				
			
			
				commit
				
					
						637e4b28cb
					
				
			
		
					 5 changed files with 49 additions and 13 deletions
				
			
		
							
								
								
									
										16
									
								
								build
									
										
									
									
									
								
							
							
						
						
									
										16
									
								
								build
									
										
									
									
									
								
							| 
						 | 
					@ -134,7 +134,7 @@ case "$1" in
 | 
				
			||||||
   ;;
 | 
					   ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   clean)
 | 
					   clean)
 | 
				
			||||||
      rm -f ${MAN7DSTDIR}/cdist-reference.text
 | 
					      rm -f ${MAN7DSTDIR}/cdist-reference.text lib/cdist/version.py
 | 
				
			||||||
      find "${MANDIR}" -mindepth 2 -type l \
 | 
					      find "${MANDIR}" -mindepth 2 -type l \
 | 
				
			||||||
         -o -name "*.1" \
 | 
					         -o -name "*.1" \
 | 
				
			||||||
         -o -name "*.7" \
 | 
					         -o -name "*.7" \
 | 
				
			||||||
| 
						 | 
					@ -154,7 +154,19 @@ case "$1" in
 | 
				
			||||||
      fi
 | 
					      fi
 | 
				
			||||||
   ;;
 | 
					   ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   *)
 | 
					    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
 | 
				
			||||||
 | 
					    ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    *)
 | 
				
			||||||
      echo ''
 | 
					      echo ''
 | 
				
			||||||
      echo 'Welcome to cdist!'
 | 
					      echo 'Welcome to cdist!'
 | 
				
			||||||
      echo ''
 | 
					      echo ''
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,4 @@
 | 
				
			||||||
- store version in .version
 | 
					x store version in .version
 | 
				
			||||||
- when distributed / packaged, include .version into sourcecode
 | 
					x when distributed / packaged, include .version into sourcecode
 | 
				
			||||||
- when in git checkout, use dynamic versioning
 | 
					    split into two files
 | 
				
			||||||
 | 
					x when in git checkout, use dynamic versioning
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,14 +22,9 @@
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import subprocess
 | 
					import subprocess
 | 
				
			||||||
 | 
					
 | 
				
			||||||
try:
 | 
					import cdist.version
 | 
				
			||||||
    with open(os.devnull, 'w') as devnull:
 | 
					
 | 
				
			||||||
        here = os.path.dirname(os.path.realpath(__file__))
 | 
					VERSION = cdist.version.VERSION
 | 
				
			||||||
        VERSION = subprocess.check_output(
 | 
					 | 
				
			||||||
                    'cd "%s" && git describe' % here,
 | 
					 | 
				
			||||||
                    stderr=devnull, shell=True).decode('utf-8')
 | 
					 | 
				
			||||||
except:
 | 
					 | 
				
			||||||
    VERSION     = "2.0.14"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
BANNER = """
 | 
					BANNER = """
 | 
				
			||||||
             ..          .       .x+=:.        s
 | 
					             ..          .       .x+=:.        s
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										1
									
								
								lib/cdist/version.py
									
										
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								lib/cdist/version.py
									
										
									
									
									
										Symbolic link
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					version_dynamic.py
 | 
				
			||||||
							
								
								
									
										27
									
								
								lib/cdist/version_dynamic.py
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								lib/cdist/version_dynamic.py
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,27 @@
 | 
				
			||||||
 | 
					# -*- coding: utf-8 -*-
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 2010-2012 Nico Schottelius (nico-cdist at schottelius.org)
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# This file is part of cdist.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# cdist is free software: you can redistribute it and/or modify
 | 
				
			||||||
 | 
					# it under the terms of the GNU General Public License as published by
 | 
				
			||||||
 | 
					# the Free Software Foundation, either version 3 of the License, or
 | 
				
			||||||
 | 
					# (at your option) any later version.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# cdist is distributed in the hope that it will be useful,
 | 
				
			||||||
 | 
					# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
				
			||||||
 | 
					# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
				
			||||||
 | 
					# GNU General Public License for more details.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# You should have received a copy of the GNU General Public License
 | 
				
			||||||
 | 
					# along with cdist. If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import os
 | 
				
			||||||
 | 
					import subprocess
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					here = os.path.dirname(os.path.realpath(__file__))
 | 
				
			||||||
 | 
					VERSION = subprocess.check_output('cd "%s" && git describe' % here,
 | 
				
			||||||
 | 
					    shell=True).decode('utf-8')
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue