This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c1addefc0fbd43392332a52483ce5f2cc1324003 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 27 03:42:08 2015 +0200 {macbuild,res/osxbundle/postbuild}.sh: add support for git information if not building from a tag. Also includes build date. --- debian/changelog | 2 ++ macbuild.sh | 7 +++++++ res/osxbundle/postbuild.sh | 14 +++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c57f679..88d8266 100644 --- a/debian/changelog +++ b/debian/changelog @@ -336,6 +336,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - help.h: lower default splitting length to 100 characters. - onmainwindow.cpp: fix up pulse config file generation and PULSE_CLIENTCONFIG setting once more. + - {macbuild,res/osxbundle/postbuild}.sh: add support for git information + if not building from a tag. Also includes build date. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/macbuild.sh b/macbuild.sh index 5e68928..097ac91 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -84,6 +84,13 @@ set -e phase "Cleaning" make clean +# Create gitlog. +git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "ChangeLog.gitlog" +mv "ChangeLog.gitlog" "res/txt/git-info" + +# Copy debian changelog as the general changelog. +cp -a "debian/changelog" "res/txt/" + [ -e "${BUILD_DIR}" ] && rm -rf "${BUILD_DIR}" mkdir "${BUILD_DIR}" diff --git a/res/osxbundle/postbuild.sh b/res/osxbundle/postbuild.sh index 1b78d05..72f13fe 100755 --- a/res/osxbundle/postbuild.sh +++ b/res/osxbundle/postbuild.sh @@ -12,8 +12,20 @@ ICON_OUT_DIR="${6:?"no destination icon path given"}" # Do NOT change this to gnused. The inplace options for bsdsed and gnused differ. SED="/usr/bin/sed" +GIT_VER="" + +if [ "$(git rev-parse --is-inside-git-dir)" = "true" ] || [ "$(git rev-parse --is-inside-work-tree)" = "true" ]; then + GIT_SHA="$(git rev-parse --short=12 HEAD)" + GIT_DESCRIPTION="$(git describe)" + + TMP_REGEX='^.+-[0-9]+-g[0-9A-Fa-f]+$' + if [[ "${GIT_DESCRIPTION}" =~ ${TMP_REGEX} ]]; then + GIT_VER=" git-${GIT_SHA} $(date +'%Y%m%d')" + fi +fi + # Substitute FULL_VERSION in Info.plist file. -${SED} -i '' -e "s/@FULL_VERSION@/${VERSION}/g" -e "s/@TARGET@/${TARGET}/g" "${INFO_PLIST_OUT_PATH}" +${SED} -i '' -e "s/@FULL_VERSION@/${VERSION}${GIT_VER}/g" -e "s/@TARGET@/${TARGET}/g" "${INFO_PLIST_OUT_PATH}" # Copy icon. ${COPY_CMD} "${ICON_PATH}" "${ICON_OUT_DIR}" -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git