From 3cf59fdf9a1ebdde176835dd2f986dd6465d6dd4 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 23:45:56 +0200 Subject: [PATCH] always use dynamic version - on shipping included generated version Signed-off-by: Nico Schottelius --- bin/cdist | 1 + build | 12 ++---------- cdist/version.py | 1 - cdist/version_dynamic.py | 27 --------------------------- 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 120000 cdist/version.py delete mode 100644 cdist/version_dynamic.py diff --git a/bin/cdist b/bin/cdist index 15127d2b..5c1239fb 100755 --- a/bin/cdist +++ b/bin/cdist @@ -22,4 +22,5 @@ # Wrapper for real script to allow execution from checkout dir=${0%/*} +"$dir/../build" version "$dir/../cdist.py" "$@" diff --git a/build b/build index 7d73224d..f8d6c74a 100755 --- a/build +++ b/build @@ -172,16 +172,8 @@ 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 + version) + echo "VERSION=\"$version\"" > cdist/version.py ;; *) diff --git a/cdist/version.py b/cdist/version.py deleted file mode 120000 index 153cf043..00000000 --- a/cdist/version.py +++ /dev/null @@ -1 +0,0 @@ -version_dynamic.py \ No newline at end of file diff --git a/cdist/version_dynamic.py b/cdist/version_dynamic.py deleted file mode 100644 index 5f69f374..00000000 --- a/cdist/version_dynamic.py +++ /dev/null @@ -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 . -# -# - -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')