always use dynamic version - on shipping included generated version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
		
					parent
					
						
							
								136bb01a67
							
						
					
				
			
			
				commit
				
					
						3cf59fdf9a
					
				
			
		
					 4 changed files with 3 additions and 38 deletions
				
			
		| 
						 | 
					@ -22,4 +22,5 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Wrapper for real script to allow execution from checkout
 | 
					# Wrapper for real script to allow execution from checkout
 | 
				
			||||||
dir=${0%/*}
 | 
					dir=${0%/*}
 | 
				
			||||||
 | 
					"$dir/../build" version
 | 
				
			||||||
"$dir/../cdist.py" "$@"
 | 
					"$dir/../cdist.py" "$@"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										12
									
								
								build
									
										
									
									
									
								
							
							
						
						
									
										12
									
								
								build
									
										
									
									
									
								
							| 
						 | 
					@ -172,16 +172,8 @@ case "$1" in
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    version-dynamic)
 | 
					    version)
 | 
				
			||||||
        cd cdist/
 | 
					        echo "VERSION=\"$version\"" > cdist/version.py
 | 
				
			||||||
        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
 | 
					 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    *)
 | 
					    *)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1 +0,0 @@
 | 
				
			||||||
version_dynamic.py
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,27 +0,0 @@
 | 
				
			||||||
# -*- 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