diff options
author | Eric Wong <normalperson@yhbt.net> | 2013-02-08 18:50:07 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2013-02-08 18:51:40 +0000 |
commit | cb0623f25db7f06660e563e8e746bfe0ae5ba9c5 (patch) | |
tree | f796b3c1cb733c0ea5b00a58da6e670deb4a88ca /GIT-VERSION-GEN | |
parent | 1b3352ec9b5c9eeb58cf330d6b9ce8753af4ec16 (diff) | |
download | unicorn-cb0623f25db7f06660e563e8e746bfe0ae5ba9c5.tar.gz |
This DRYs out our code and prevents snafus like the 4.6.0 release where UNICORN_VERSION stayed at 4.5.0 Reported-by: Maurizio De Santis <m.desantis@morganspa.com>
Diffstat (limited to 'GIT-VERSION-GEN')
-rwxr-xr-x | GIT-VERSION-GEN | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 56aef5f..e5d414a 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,40 +1,39 @@ -#!/bin/sh - -GVF=GIT-VERSION-FILE -DEF_VER=v4.6.0 - -LF=' -' +#!/usr/bin/env ruby +DEF_VER = "v4.6.0" +CONSTANT = "Unicorn::Const::UNICORN_VERSION" +RVF = "lib/unicorn/version.rb" +GVF = "GIT-VERSION-FILE" +vn = DEF_VER # First see if there is a version file (included in release tarballs), # then try git-describe, then default. -if test -f version -then - VN=$(cat version) || VN="$DEF_VER" -elif test -d .git -o -f .git && - VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && - case "$VN" in - *$LF*) (exit 1) ;; - v[0-9]*) - git update-index -q --refresh - test -z "$(git diff-index --name-only HEAD --)" || - VN="$VN-dirty" ;; - esac -then - VN=$(echo "$VN" | sed -e 's/-/./g'); -else - VN="$DEF_VER" -fi +if File.exist?(".git") + describe = `git describe --abbrev=4 HEAD 2>/dev/null`.strip + case describe + when /\Av[0-9]*/ + vn = describe + system(*%w(git update-index -q --refresh)) + unless `git diff-index --name-only HEAD --`.chomp.empty? + vn << "-dirty" + end + vn.tr!('-', '.') + end +end + +vn = vn.sub!(/\Av/, "") + +# generate the Ruby constant +new_ruby_version = "#{CONSTANT} = '#{vn}'\n" +cur_ruby_version = File.read(RVF) rescue nil +if new_ruby_version != cur_ruby_version + File.open(RVF, "w") { |fp| fp.write(new_ruby_version) } +end -VN=$(expr "$VN" : v*'\(.*\)') +# generate the makefile snippet +new_make_version = "GIT_VERSION = #{vn}\n" +cur_make_version = File.read(GVF) rescue nil +if new_make_version != cur_make_version + File.open(GVF, "w") { |fp| fp.write(new_make_version) } +end -if test -r $GVF -then - VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) -else - VC=unset -fi -test "$VN" = "$VC" || { - echo >&2 "GIT_VERSION = $VN" - echo "GIT_VERSION = $VN" >$GVF -} +puts vn if $0 == __FILE__ |