diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-03-20 22:44:35 +0100 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-03-22 11:02:49 +0100 |
commit | 05b2f6b5d141dc888f753fd531cf6bbf4889f3a0 (patch) | |
tree | c02dc6311414fad3a8aa6a12f02ba957d54b9962 | |
parent | ae8c6f417e9f5259ecc4ddd6dfa09f309db97c61 (diff) | |
download | OSELAS.Toolchain-05b2f6b5d141dc888f753fd531cf6bbf4889f3a0.tar.gz OSELAS.Toolchain-05b2f6b5d141dc888f753fd531cf6bbf4889f3a0.tar.xz |
makefile: add make {dist,release} target
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | Makefile | 26 | ||||
-rwxr-xr-x | scripts/make_release.sh | 92 | ||||
-rwxr-xr-x | scripts/setlocalversion | 111 |
3 files changed, 229 insertions, 0 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..be9c11b --- /dev/null +++ b/Makefile @@ -0,0 +1,26 @@ +version := $(shell ./scripts/setlocalversion ./.tarball-version) +project := OSELAS.Toolchain-$(version) +v := v$(version) + +all: + @echo "Please use 'build_all_v2.mk'" + +dirty-check: + @case "$(version)" in \ + *-dirty) echo "refusing to install or package a dirty git tree!" ; exit 1 ;; \ + esac + +dist: dirty-check + rm -rf "$(project)" "$(project).tar.bz2" + git archive "$(v)" --prefix="$(project)"/ > "${project}.tar" + mkdir -p "${project}" + echo -n "${version}" > "${project}/.tarball-version" + + tar -rf "${project}.tar" \ + "${project}/.tarball-version" + bzip2 "${project}.tar" + md5sum "${project}.tar.bz2" > "${project}.tar.bz2.md5" + rm -rf "${project}" + +release: + @scripts/make_$@.sh diff --git a/scripts/make_release.sh b/scripts/make_release.sh new file mode 100755 index 0000000..3d6e9d3 --- /dev/null +++ b/scripts/make_release.sh @@ -0,0 +1,92 @@ +#!/bin/bash + +set -e + +origin=origin +v="v" + +branch="$(git symbolic-ref HEAD)" +branch="${branch##refs/heads/}" + +trap_exit_handler() { + if [ -n "${tmp}" -a -d "${tmp}" ]; then + rm -rf "${tmp}" + fi +} +trap 'trap_exit_handler' 0 1 15 + +# Update index only on r/w media +if [ -w . ]; then + git update-index --refresh --unmerged > /dev/null || true +fi + +# Check for uncommitted changes +if git diff-index --name-only HEAD \ + | read dummy; then + echo "tree dirty, refusing to make a release" >&2 + exit 1 +fi + +# guess if we're going to make a new or stable release +case "${branch}" in + master) + release="${v}$(date +%Y.%m).0" + prev_release="${v}*.0" + ;; + stable/*) + release="${branch##stable/}" + release="${release%.x}" + inc="$(git tag -l "${release}.*" | wc -l)" + if [ ${inc} -eq 0 ]; then + echo "about to make stable a release for '${release}', but no '.0' found" >&2 + exit 1 + fi + prev_release="${release}.$((inc - 1))" + release="${release}.${inc}" + ;; + *) + echo "please checkout either master or stable branch" >&2 + exit 1 + ;; +esac + +# get previous release +prev_release=( $(git tag -l "${prev_release}" | sort -r -n) ) +if [ -z "${prev_release}" ]; then + echo "previous release not found" >&2 + exit 1 +fi + +# check if to-be-made release already exists +if git rev-parse -q --verify "refs/tags/$release" >/dev/null 2>&1; then + echo "release '${release}' already exists" >&2 + exit 1 +fi + +tmp="$(mktemp -d /tmp/${0##*/}.XXXXXX)" +log="${tmp}/log" + +# create tag message +printf "${release}\n\n" > "${log}" +git shortlog "${prev_release}"..HEAD >> "${log}" +echo "creating tag '${release}'" +git tag -s -F "${log}" "${release}" + +# create tarball +here="$(pwd)" +pushd "${tmp}" >/dev/null +git clone "${here}" "${release}" +cd "${release}" +git checkout "${release}" + +make dist +popd >/dev/null + +# now push to origin +echo +echo "pushing '${release}' to $origin, press '[Ctrl] + c' to abort" +echo +read +git push "${origin}" "${branch}" +git push "${origin}" "${release}" +mv "${tmp}/${release}/"*tar.bz2* "${here}" diff --git a/scripts/setlocalversion b/scripts/setlocalversion new file mode 100755 index 0000000..63928cd --- /dev/null +++ b/scripts/setlocalversion @@ -0,0 +1,111 @@ +#!/bin/sh +# +# This scripts adds local version information from the version +# control systems git, mercurial (hg) and subversion (svn). +# +# If something goes wrong, send a mail the kernel build mailinglist +# (see MAINTAINERS) and CC Nico Schottelius +# <nico-linuxsetlocalversion -at- schottelius.org>. +# +# + +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project@example]) +# + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file="$1" +nl=' +' + +# First see if there is a tarball-only version file. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 + + echo -n "$v" + exit +fi + +cd "$(dirname "${tarball_version_file}")" + +# Check for git and a git repo. +if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then + + # If we are at a tagged commit (like "ptxdist-2010.05.0"), we + # print it here + if atag="`git describe --exact-match 2>/dev/null`"; then + echo "$atag" | awk -F'[v-]' '{printf("%s", $(NF))}' + + # If we are past a tagged commit (like "ptxdist-2010.03.0-130-g3c60777"), + # we pretty print it. + elif atag="`git describe 2>/dev/null`"; then + echo "$atag" | awk -F'[v-]' '{printf("%s-%05d-%s", $(NF-2),$(NF-1),$(NF))}' + + # If we don't have a tag at all we print ????.??.?-?-g{commitish}. + else + printf '%s%s' '????.??.?-?-g' $head + fi + + # Is this git on svn? + if git config --get svn-remote.svn.url >/dev/null; then + printf -- '-svn%s' "`git svn find-rev $head`" + fi + + # Update index only on r/w media + [ -w . ] && git update-index --refresh --unmerged > /dev/null + + # Check for uncommitted changes + if git diff-index --name-only HEAD \ + | read dummy; then + printf '%s' -dirty + fi + + # All done with git + exit +fi + +# Check for mercurial and a mercurial repo. +if hgid=`hg id 2>/dev/null`; then + tag=`printf '%s' "$hgid" | cut -d' ' -f2` + + # Do we have an untagged version? + if [ -z "$tag" -o "$tag" = tip ]; then + id=`printf '%s' "$hgid" | sed 's/[+ ].*//'` + printf '%s%s' hg "$id" + fi + + # Are there uncommitted changes? + # These are represented by + after the changeset id. + case "$hgid" in + *+|*+\ *) printf '%s' -dirty ;; + esac + + # All done with mercurial + exit +fi + +# Check for svn and a svn repo. +if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then + rev=`echo $rev | awk '{print $NF}'` + printf -- 'svn%s' "$rev" + + # All done with svn + exit +fi |