diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh index ed25eb760..b1547df6a 100755 --- a/mk/linux/make-binary-archive.sh +++ b/mk/linux/make-binary-archive.sh @@ -20,6 +20,13 @@ CURRENTDIR="$(dirname $(readlink -f $0))" RELEASEDIR_ROOT="$CURRENTDIR/../../../release/" RELEASEDIR="${RELEASEDIR_ROOT}/${RELEASENAME-$VERSION}" PROJDIR="$CURRENTDIR/" +REPODIR="$CURRENTDIR/../../" +if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then + cd "$REPODIR" + SOURCE_BRANCH="$(git branch | awk -F '* ' '/^* / {print $2}')" + SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")" + echo "Detected parameters for source repository: branch=[$SOURCE_BRANCH], commit=$SOURCE_COMMIT" +fi echo "Creating binary package in $RELEASEDIR" diff --git a/mk/linux/make-data-archive.sh b/mk/linux/make-data-archive.sh index 3a2ada668..b52538771 100755 --- a/mk/linux/make-data-archive.sh +++ b/mk/linux/make-data-archive.sh @@ -10,9 +10,9 @@ KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" if [ "$KERNEL" = "darwin" ]; then - CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" + CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" else - CURRENTDIR="$(dirname "$(readlink -f "$0")")" + CURRENTDIR="$(dirname "$(readlink -f "$0")")" fi cd "$CURRENTDIR" VERSION=`./mg-version.sh --version` @@ -20,13 +20,26 @@ RELEASENAME=megaglest-standalone-data PACKAGE="$RELEASENAME-$VERSION.tar.xz" RELEASEDIR_ROOT="$CURRENTDIR/../../../release" RELEASEDIR="${RELEASEDIR_ROOT}/${RELEASENAME-$VERSION}" -PROJDIR="$CURRENTDIR/../../" REPODIR="$CURRENTDIR/../../" +REPO_DATADIR="$REPODIR/data/glest_game" +if [ -f "$REPO_DATADIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then + cd "$REPO_DATADIR" + DATA_BRANCH="$(git branch | awk -F '* ' '/^* / {print $2}')" + DATA_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")" + echo "Detected parameters for data repository: branch=[$DATA_BRANCH], commit=$DATA_COMMIT" +fi +if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then + cd "$REPODIR" + SOURCE_BRANCH="$(git branch | awk -F '* ' '/^* / {print $2}')" + SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")" + echo "Detected parameters for source repository: branch=[$SOURCE_BRANCH], commit=$SOURCE_COMMIT" +fi +cd "$CURRENTDIR" if [ "$KERNEL" != "darwin" ]; then - echo "Creating data package in $RELEASEDIR" + echo "Creating data package in $RELEASEDIR" else - echo "Creating data directory $RELEASEDIR" + echo "Creating data directory $RELEASEDIR" fi [[ -d "$RELEASEDIR" ]] && rm -rf "$RELEASEDIR" @@ -78,11 +91,11 @@ cd "$CURRENTDIR" cd "$CURRENTDIR" if [ "$KERNEL" != "darwin" ]; then - echo "creating data archive: $PACKAGE" - [[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE" - cd $RELEASEDIR - tar -cf - * | xz > ../$PACKAGE - cd $CURRENTDIR + echo "creating data archive: $PACKAGE" + [[ -f "${RELEASEDIR_ROOT}/$PACKAGE" ]] && rm "${RELEASEDIR_ROOT}/$PACKAGE" + cd $RELEASEDIR + tar -cf - * | xz > ../$PACKAGE + cd $CURRENTDIR - ls -la ${RELEASEDIR_ROOT}/$PACKAGE + ls -la ${RELEASEDIR_ROOT}/$PACKAGE fi diff --git a/mk/macosx/make-binary-archive.sh b/mk/macosx/make-binary-archive.sh index 39fef4f24..5da67e6ef 100755 --- a/mk/macosx/make-binary-archive.sh +++ b/mk/macosx/make-binary-archive.sh @@ -21,6 +21,13 @@ PACKAGE="$RELEASENAME-$VERSION.tar.bz2" CURRENTDIR="$(cd "$(dirname "$0")"; pwd)" RELEASEDIR_ROOT="$CURRENTDIR/../../../release" RELEASEDIR="${RELEASEDIR_ROOT}/${RELEASENAME-$VERSION}" +REPODIR="$CURRENTDIR/../../" +if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then + cd "$REPODIR" + SOURCE_BRANCH="$(git branch | awk -F '* ' '/^* / {print $2}')" + SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")" + echo "Detected parameters for source repository: branch=[$SOURCE_BRANCH], commit=$SOURCE_COMMIT" +fi echo "Creating binary package in $RELEASEDIR"