Fix wacky line endings

This commit is contained in:
AKLabs Jenkins
2015-01-11 19:21:10 +01:00
parent 7ce5fabce7
commit 34e33a6f4d
5 changed files with 246 additions and 246 deletions

View File

@@ -1,78 +1,78 @@
#!/bin/bash #!/bin/bash
LOGSPEC='%ci %an <%aE>%n%n %s%n [%h]%d%n' LOGSPEC='%ci %an <%aE>%n%n %s%n [%h]%d%n'
VERSIONERS_SEPARATOR=${VERSIONERS_SEPARATOR:-,} VERSIONERS_SEPARATOR=${VERSIONERS_SEPARATOR:-,}
BRANCH=$2 BRANCH=$2
if [ "${BRANCH}" == "" ]; then if [ "${BRANCH}" == "" ]; then
BRANCH=$(git branch | grep '^\*\s*.*' | cut -d ' ' -f 2-) BRANCH=$(git branch | grep '^\*\s*.*' | cut -d ' ' -f 2-)
fi fi
REBUILDING=0 REBUILDING=0
SHA1=$(git rev-parse HEAD) SHA1=$(git rev-parse HEAD)
TAG=$(git describe --tags --abbrev=0 2>/dev/null) TAG=$(git describe --tags --abbrev=0 2>/dev/null)
BUILD=0 BUILD=0
TAGSHA=$(git rev-list $TAG | head -n 1) TAGSHA=$(git rev-list $TAG | head -n 1)
CHANGELOG="$(git log --format="format:$LOGSPEC" ${TAGSHA}..HEAD)" CHANGELOG="$(git log --format="format:$LOGSPEC" ${TAGSHA}..HEAD)"
if [ "$TAG" == "" ]; then if [ "$TAG" == "" ]; then
BUILD=0 BUILD=0
REBUILDING=1 REBUILDING=1
MAJOR=$BRANCH MAJOR=$BRANCH
else else
MAJOR=$(echo $TAG | cut -d ${VERSIONERS_SEPARATOR} -f 2) MAJOR=$(echo $TAG | cut -d ${VERSIONERS_SEPARATOR} -f 2)
BUILD=$(echo $TAG | cut -d ${VERSIONERS_SEPARATOR} -f 3) BUILD=$(echo $TAG | cut -d ${VERSIONERS_SEPARATOR} -f 3)
if [ "$TAGSHA" != "$SHA1" ]; then if [ "$TAGSHA" != "$SHA1" ]; then
CHANGELOG="$(git log --format="format:$LOGSPEC" $TAGSHA..$SHA1)" CHANGELOG="$(git log --format="format:$LOGSPEC" $TAGSHA..$SHA1)"
BUILD=$(expr $BUILD + 1) BUILD=$(expr $BUILD + 1)
REBUILDING=1 REBUILDING=1
else else
SHA1=$TAGSHA SHA1=$TAGSHA
fi fi
fi fi
OS_NAME="" OS_NAME=""
OS_VERSION="" OS_VERSION=""
if [ "$OS_NAME" == "" ] && [ "$(uname)" == "Darwin" ]; then if [ "$OS_NAME" == "" ] && [ "$(uname)" == "Darwin" ]; then
OS_NAME="osx" OS_NAME="osx"
elif [ "$OS_NAME" == "" ] && [ -f /etc/redhat-release ]; then elif [ "$OS_NAME" == "" ] && [ -f /etc/redhat-release ]; then
OS_NAME="el" OS_NAME="el"
elif [ "$OS_NAME" == "" ] && [ "$(uname | grep -i '^MINGW')" != "" ] || [ "$(uname | grep -i '^CYGWIN')" != "" ]; then elif [ "$OS_NAME" == "" ] && [ "$(uname | grep -i '^MINGW')" != "" ] || [ "$(uname | grep -i '^CYGWIN')" != "" ]; then
OS_NAME="win" OS_NAME="win"
fi fi
if [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "el" ]; then if [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "el" ]; then
OS_VERSION=$(cat /etc/redhat-release | grep -o "release [0-9]" | cut -d " " -f 2) OS_VERSION=$(cat /etc/redhat-release | grep -o "release [0-9]" | cut -d " " -f 2)
RHEL_VERSION=$OS_VERSION RHEL_VERSION=$OS_VERSION
elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "osx" ]; then elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "osx" ]; then
OS_VERSION="$(sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*')" OS_VERSION="$(sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*')"
elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "win" ]; then elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "win" ]; then
echo "OS_VERSION unsupported on Microsoft Windows." >&2 echo "OS_VERSION unsupported on Microsoft Windows." >&2
fi fi
if [ "$ARCH" == "" ]; then if [ "$ARCH" == "" ]; then
if [ "$OS_NAME" == "osx" ]; then if [ "$OS_NAME" == "osx" ]; then
ARCH=$(uname -m) ARCH=$(uname -m)
elif [ "$OS_NAME" != "win" ]; then elif [ "$OS_NAME" != "win" ]; then
ARCH=$(uname -i) ARCH=$(uname -i)
elif [ "$OS_NAME" == "win" ]; then elif [ "$OS_NAME" == "win" ]; then
ARCH=$(uname -m) ARCH=$(uname -m)
fi fi
fi fi
SOURCE=$((git remote show origin 2>/dev/null | grep "Fetch URL" | cut -d : -f 2- | cut -d ' ' -f 2-) || echo '') SOURCE=$((git remote show origin 2>/dev/null | grep "Fetch URL" | cut -d : -f 2- | cut -d ' ' -f 2-) || echo '')
echo "TAG=\"${TAG}\"" echo "TAG=\"${TAG}\""
echo "BRANCH=\"${BRANCH}\"" echo "BRANCH=\"${BRANCH}\""
echo "MAJOR=\"${MAJOR}\"" echo "MAJOR=\"${MAJOR}\""
echo "BUILD=\"${BUILD}\"" echo "BUILD=\"${BUILD}\""
echo "SHA1=\"${SHA1}\"" echo "SHA1=\"${SHA1}\""
echo "OS_NAME=\"\${OS_NAME:-$OS_NAME}\"" echo "OS_NAME=\"\${OS_NAME:-$OS_NAME}\""
echo "OS_VERSION=\"\${OS_VERSION:-$OS_VERSION}\"" echo "OS_VERSION=\"\${OS_VERSION:-$OS_VERSION}\""
echo "ARCH=\"\${ARCH:-$ARCH}\"" echo "ARCH=\"\${ARCH:-$ARCH}\""
echo "VERSION=\"${MAJOR}-${BUILD}\"" echo "VERSION=\"${MAJOR}-${BUILD}\""
echo "BUILDHOST=\"$(hostname)\"" echo "BUILDHOST=\"$(hostname)\""
echo "BUILDUSER=\"$(whoami)\"" echo "BUILDUSER=\"$(whoami)\""
echo "BUILDDIR=\"$(pwd)\"" echo "BUILDDIR=\"$(pwd)\""
echo "SOURCE=\"${SOURCE}\"" echo "SOURCE=\"${SOURCE}\""
echo "REBUILDING=$REBUILDING" echo "REBUILDING=$REBUILDING"
echo "CHANGELOG=\"$CHANGELOG\"" echo "CHANGELOG=\"$CHANGELOG\""

View File

@@ -1,77 +1,77 @@
#!/bin/bash #!/bin/bash
BRANCH=$2 BRANCH=$2
if [ "${BRANCH}" == "" ]; then if [ "${BRANCH}" == "" ]; then
BRANCH=$(hg identify -b) BRANCH=$(hg identify -b)
fi fi
REBUILDING=0 REBUILDING=0
SHA1=$(hg identify -i | grep -Eo "[a-zA-Z0-9]+") SHA1=$(hg identify -i | grep -Eo "[a-zA-Z0-9]+")
TAG=$(hg parents --template '{latesttag}') TAG=$(hg parents --template '{latesttag}')
TAGSHA=$(hg identify -r $TAG | cut -d ' ' -f 1) TAGSHA=$(hg identify -r $TAG | cut -d ' ' -f 1)
BUILD=0 BUILD=0
CHANGELOG="$(hg log --branch $BRANCH -X .hgtags --style=changelog -r ${TAG}:${SHA1})" CHANGELOG="$(hg log --branch $BRANCH -X .hgtags --style=changelog -r ${TAG}:${SHA1})"
if [ "$TAG" == "" ]; then if [ "$TAG" == "" ]; then
BUILD=0 BUILD=0
REBUILDING=1 REBUILDING=1
MAJOR=$BRANCH MAJOR=$BRANCH
else else
MAJOR=$(echo $TAG | cut -d \| -f 2) MAJOR=$(echo $TAG | cut -d \| -f 2)
BUILD=$(echo $TAG | cut -d \| -f 3) BUILD=$(echo $TAG | cut -d \| -f 3)
SHORTTAGSHA=${TAGSHA:0:12} SHORTTAGSHA=${TAGSHA:0:12}
hg log -r tip | grep "Added tag build|${BRANCH}|${BUILD} for changeset ${SHORTTAGSHA}" >/dev/null hg log -r tip | grep "Added tag build|${BRANCH}|${BUILD} for changeset ${SHORTTAGSHA}" >/dev/null
if [ $? -ne 0 ] && [ "$TAGSHA" != "$SHA1" ]; then if [ $? -ne 0 ] && [ "$TAGSHA" != "$SHA1" ]; then
CHANGELOG="$(hg log --branch $BRANCH -X .hgtags --style=changelog -r ${SHORTTAGSHA}:${SHA1})" CHANGELOG="$(hg log --branch $BRANCH -X .hgtags --style=changelog -r ${SHORTTAGSHA}:${SHA1})"
BUILD=$(expr $BUILD + 1) BUILD=$(expr $BUILD + 1)
REBUILDING=1 REBUILDING=1
else else
SHA1=$TAGSHA SHA1=$TAGSHA
fi fi
fi fi
OS_NAME="" OS_NAME=""
OS_VERSION="" OS_VERSION=""
if [ "$OS_NAME" == "" ] && [ "$(uname)" == "Darwin" ]; then if [ "$OS_NAME" == "" ] && [ "$(uname)" == "Darwin" ]; then
OS_NAME="osx" OS_NAME="osx"
elif [ "$OS_NAME" == "" ] && [ -f /etc/redhat-release ]; then elif [ "$OS_NAME" == "" ] && [ -f /etc/redhat-release ]; then
OS_NAME="el" OS_NAME="el"
elif [ "$OS_NAME" == "" ] && [ "$(uname | grep -i '^MINGW')" != "" ] || [ "$(uname | grep -i '^CYGWIN')" != "" ]; then elif [ "$OS_NAME" == "" ] && [ "$(uname | grep -i '^MINGW')" != "" ] || [ "$(uname | grep -i '^CYGWIN')" != "" ]; then
OS_NAME="win" OS_NAME="win"
fi fi
if [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "el" ]; then if [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "el" ]; then
OS_VERSION=$(cat /etc/redhat-release | grep -o "release [0-9]" | cut -d " " -f 2) OS_VERSION=$(cat /etc/redhat-release | grep -o "release [0-9]" | cut -d " " -f 2)
RHEL_VERSION=$OS_VERSION RHEL_VERSION=$OS_VERSION
elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "osx" ]; then elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "osx" ]; then
OS_VERSION="$(sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*')" OS_VERSION="$(sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*')"
elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "win" ]; then elif [ "$OS_VERSION" == "" ] && [ "$OS_NAME" == "win" ]; then
echo "OS_VERSION unsupported on Microsoft Windows." >&2 echo "OS_VERSION unsupported on Microsoft Windows." >&2
fi fi
if [ "$ARCH" == "" ]; then if [ "$ARCH" == "" ]; then
if [ "$OS_NAME" == "osx" ]; then if [ "$OS_NAME" == "osx" ]; then
ARCH=$(uname -m) ARCH=$(uname -m)
elif [ "$OS_NAME" != "win" ]; then elif [ "$OS_NAME" != "win" ]; then
ARCH=$(uname -i) ARCH=$(uname -i)
elif [ "$OS_NAME" == "win" ]; then elif [ "$OS_NAME" == "win" ]; then
ARCH=$(uname -m) ARCH=$(uname -m)
fi fi
fi fi
SOURCE=$((cat .hg/hgrc 2>/dev/null | grep default | cut -d = -f 2 | sed s/"^ *"//g) || echo '') SOURCE=$((cat .hg/hgrc 2>/dev/null | grep default | cut -d = -f 2 | sed s/"^ *"//g) || echo '')
echo "TAG=\"${TAG}\"" echo "TAG=\"${TAG}\""
echo "BRANCH=\"${BRANCH}\"" echo "BRANCH=\"${BRANCH}\""
echo "MAJOR=\"${MAJOR}\"" echo "MAJOR=\"${MAJOR}\""
echo "BUILD=\"${BUILD}\"" echo "BUILD=\"${BUILD}\""
echo "SHA1=\"${SHA1}\"" echo "SHA1=\"${SHA1}\""
echo "OS_NAME=\"\${OS_NAME:-$OS_NAME}\"" echo "OS_NAME=\"\${OS_NAME:-$OS_NAME}\""
echo "OS_VERSION=\"\${OS_VERSION:-$OS_VERSION}\"" echo "OS_VERSION=\"\${OS_VERSION:-$OS_VERSION}\""
echo "ARCH=\"\${ARCH:-$ARCH}\"" echo "ARCH=\"\${ARCH:-$ARCH}\""
echo "VERSION=\"${MAJOR}-${BUILD}\"" echo "VERSION=\"${MAJOR}-${BUILD}\""
echo "BUILDHOST=\"$(hostname)\"" echo "BUILDHOST=\"$(hostname)\""
echo "BUILDUSER=\"$(whoami)\"" echo "BUILDUSER=\"$(whoami)\""
echo "BUILDDIR=\"$(pwd)\"" echo "BUILDDIR=\"$(pwd)\""
echo "SOURCE=\"${SOURCE}\"" echo "SOURCE=\"${SOURCE}\""
echo "REBUILDING=$REBUILDING" echo "REBUILDING=$REBUILDING"
echo "CHANGELOG=\"$CHANGELOG\"" echo "CHANGELOG=\"$CHANGELOG\""

View File

@@ -1,34 +1,34 @@
#!/bin/bash #!/bin/bash
SEP=${VERSIONERS_SEPARATOR:-,} SEP=${VERSIONERS_SEPARATOR:-,}
VERSIONERS_TAGBASE=${VERSIONERS_TAGBASE:-build} VERSIONERS_TAGBASE=${VERSIONERS_TAGBASE:-build}
if [ "$MAKETAG" == "false" ]; then if [ "$MAKETAG" == "false" ]; then
exit 0 exit 0
fi fi
if [ ! -f version.sh ]; then if [ ! -f version.sh ]; then
$(dirname $BASH_SOURCE)/gitversion.sh > version.sh $(dirname $BASH_SOURCE)/gitversion.sh > version.sh
fi fi
. ~/.buildtoolsrc || echo . ~/.buildtoolsrc || echo
. version.sh . version.sh
WHOLETAG="${VERSIONERS_TAGBASE}${SEP}${MAJOR}${SEP}${BUILD}" WHOLETAG="${VERSIONERS_TAGBASE}${SEP}${MAJOR}${SEP}${BUILD}"
git fetch --tags git fetch --tags
TAGSHA1=$(git rev-list $TAG | head -n 1) TAGSHA1=$(git rev-list $TAG | head -n 1)
if [ $REBUILDING -eq 0 ]; then if [ $REBUILDING -eq 0 ]; then
echo "This is a rebuild of a previous tag, not tagging or pushing" >&2 echo "This is a rebuild of a previous tag, not tagging or pushing" >&2
elif [ "$(git tag | grep $WHOLETAG)" != "" ] && [ "$TAGSHA1" != "" ] && [ "$TAGSHA1" != "$SHA1" ]; then elif [ "$(git tag | grep $WHOLETAG)" != "" ] && [ "$TAGSHA1" != "" ] && [ "$TAGSHA1" != "$SHA1" ]; then
echo "Someone else tagged my buildnumber (${WHOLETAG}) onto $TAGSHA1, while I built it from $SHA1 ... "'Help!' >&2 echo "Someone else tagged my buildnumber (${WHOLETAG}) onto $TAGSHA1, while I built it from $SHA1 ... "'Help!' >&2
exit 1 exit 1
elif [ "$TAGSHA1" != "" ] && [ "$TAGSHA1" == "$SHA1" ]; then elif [ "$TAGSHA1" != "" ] && [ "$TAGSHA1" == "$SHA1" ]; then
echo "Someone else built this version at the same time I did, and we both tagged the same SHA1 with the same build tag. Not pushing my tag." echo "Someone else built this version at the same time I did, and we both tagged the same SHA1 with the same build tag. Not pushing my tag."
else else
git tag -f -a "${WHOLETAG}" -m "Tagging for ${MAJOR}-${BUILD}" $SHA1 git tag -f -a "${WHOLETAG}" -m "Tagging for ${MAJOR}-${BUILD}" $SHA1
if [ "$PUSHTAG" != "false" ]; then if [ "$PUSHTAG" != "false" ]; then
git push --tags git push --tags
fi fi
fi fi

View File

@@ -1,30 +1,30 @@
#!/bin/bash #!/bin/bash
if [ "$MAKETAG" == "false" ]; then if [ "$MAKETAG" == "false" ]; then
exit 0 exit 0
fi fi
if [ ! -f version ]; then if [ ! -f version ]; then
${dirname $BASH_SOURCE)/genversion > version ${dirname $BASH_SOURCE)/genversion > version
fi fi
. ~/.buildtoolsrc . ~/.buildtoolsrc
. version . version
hg pull -u --branch $(hg branch) hg pull -u --branch $(hg branch)
TAGSHA1=$(cat .hgtags | grep "build,${MAJOR},${BUILD}" | cut -d " " -f 1) TAGSHA1=$(cat .hgtags | grep "build,${MAJOR},${BUILD}" | cut -d " " -f 1)
echo "$TAGSHA1" | grep "^$SHA1" >/dev/null 2>&1 echo "$TAGSHA1" | grep "^$SHA1" >/dev/null 2>&1
SHORTSHAMATCH=$? SHORTSHAMATCH=$?
if [ $REBUILDING -eq 0 ]; then if [ $REBUILDING -eq 0 ]; then
echo "This is a rebuild of a previous tag, not tagging or pushing" >&2 echo "This is a rebuild of a previous tag, not tagging or pushing" >&2
elif [ "$TAGSHA1" != "" ] && [ $SHORTSHAMATCH -ne 0 ]; then elif [ "$TAGSHA1" != "" ] && [ $SHORTSHAMATCH -ne 0 ]; then
echo "Someone else tagged my buildnumber (branch|${MAJOR}|${BUILD}) onto $TAGSHA1, while I built it from $SHA1 ... "'Help!' >&2 echo "Someone else tagged my buildnumber (branch|${MAJOR}|${BUILD}) onto $TAGSHA1, while I built it from $SHA1 ... "'Help!' >&2
exit 1 exit 1
elif [ "$TAGSHA1" != "" ] && [ $SHORTSHAMATCH -eq 0 ]; then elif [ "$TAGSHA1" != "" ] && [ $SHORTSHAMATCH -eq 0 ]; then
echo "Someone else built this version at the same time I did, and we both tagged the same SHA1 with the same build tag. Not pushing my tag." echo "Someone else built this version at the same time I did, and we both tagged the same SHA1 with the same build tag. Not pushing my tag."
else else
hg tag -f -r ${SHA1} "build|${MAJOR}|${BUILD}" hg tag -f -r ${SHA1} "build|${MAJOR}|${BUILD}"
if [ "$PUSHTAG" != "false" ]; then if [ "$PUSHTAG" != "false" ]; then
hg push hg push
fi fi
fi fi

View File

@@ -1,27 +1,27 @@
%define __os_install_post %{nil} %define __os_install_post %{nil}
Summary: Automatic Versioning Tools Summary: Automatic Versioning Tools
Name: versioners Name: versioners
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
License: Andrew Kesterson License: Andrew Kesterson
Vendor: Andrew Kesterson Vendor: Andrew Kesterson
Packager: Andrew Kesterson <andrew@aklabs.net> Packager: Andrew Kesterson <andrew@aklabs.net>
Group: Development Tools Group: Development Tools
Provides: %{name} Provides: %{name}
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Source: %{name}-%{version}-%{release}.tar.gz Source: %{name}-%{version}-%{release}.tar.gz
Requires: bash Requires: bash
%description %description
%install %install
mkdir -p %{buildroot}/usr/src mkdir -p %{buildroot}/usr/src
tar -zxvf %{_sourcedir}/%{name}-%{version}-%{release}.tar.gz tar -zxvf %{_sourcedir}/%{name}-%{version}-%{release}.tar.gz
cd %{name}-%{version}-%{release} cd %{name}-%{version}-%{release}
PREFIX=%{buildroot} make install PREFIX=%{buildroot} make install
PREFIX=%{buildroot} make MANIFEST PREFIX=%{buildroot} make MANIFEST
cp MANIFEST /tmp/ cp MANIFEST /tmp/
%files -f /tmp/MANIFEST %files -f /tmp/MANIFEST