Date: Thursday, January 9, 2014 @ 10:26:59 Author: alucryd Revision: 103673
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: aegisub/repos/community-testing-i686/PKGBUILD (from rev 103672, aegisub/trunk/PKGBUILD) aegisub/repos/community-testing-i686/aegisub-wx-stl.patch (from rev 103672, aegisub/trunk/aegisub-wx-stl.patch) aegisub/repos/community-testing-i686/aegisub.install (from rev 103672, aegisub/trunk/aegisub.install) aegisub/repos/community-testing-x86_64/PKGBUILD (from rev 103672, aegisub/trunk/PKGBUILD) aegisub/repos/community-testing-x86_64/aegisub-wx-stl.patch (from rev 103672, aegisub/trunk/aegisub-wx-stl.patch) aegisub/repos/community-testing-x86_64/aegisub.install (from rev 103672, aegisub/trunk/aegisub.install) Deleted: aegisub/repos/community-testing-i686/PKGBUILD aegisub/repos/community-testing-i686/aegisub.install aegisub/repos/community-testing-i686/version.patch aegisub/repos/community-testing-x86_64/PKGBUILD aegisub/repos/community-testing-x86_64/aegisub.install aegisub/repos/community-testing-x86_64/version.patch -----------------------------------------------+ /PKGBUILD | 86 ++++++++++++++++++++++++ /aegisub.install | 28 +++++++ community-testing-i686/PKGBUILD | 38 ---------- community-testing-i686/aegisub-wx-stl.patch | 61 +++++++++++++++++ community-testing-i686/aegisub.install | 14 --- community-testing-i686/version.patch | 76 --------------------- community-testing-x86_64/PKGBUILD | 38 ---------- community-testing-x86_64/aegisub-wx-stl.patch | 61 +++++++++++++++++ community-testing-x86_64/aegisub.install | 14 --- community-testing-x86_64/version.patch | 76 --------------------- 10 files changed, 236 insertions(+), 256 deletions(-) Deleted: community-testing-i686/PKGBUILD =================================================================== --- community-testing-i686/PKGBUILD 2014-01-09 09:26:44 UTC (rev 103672) +++ community-testing-i686/PKGBUILD 2014-01-09 09:26:59 UTC (rev 103673) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@gmail.com> -# Contributor: kozec <ko...@kozec.com> -# Contributor: Limao Luo <luolimao+...@gmail.com> - -pkgname=aegisub -pkgver=3.1.0 -pkgrel=1 -pkgdesc="A general-purpose subtitle editor with ASS/SSA support" -arch=('i686' 'x86_64') -url="http://www.aegisub.org" -license=('GPL' 'BSD') -depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk') -makedepends=('boost' 'intltool' 'mesa') -install="${pkgname}.install" -source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" - 'version.patch') -sha256sums=('0d2befed013f3c64ab2cdf725f2b865fe2d074b35b621b7a61298b95f67def15' - '4119b79363512b18c6ddcbbdfb87b35c51e0ea149e763b126f568e80f956a01f') - -prepare() { - patch -Np1 -i version.patch -} - -build() { - ./configure --prefix='/usr' --without-{portaudio,openal,oss} - make -} - -package() { - make DESTDIR="${pkgdir}" install - -# License - install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub - install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE -} - -# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-testing-i686/PKGBUILD (from rev 103672, aegisub/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2014-01-09 09:26:59 UTC (rev 103673) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@gmail.com> +# Contributor: kozec <ko...@kozec.com> +# Contributor: Limao Luo <luolimao+...@gmail.com> + +pkgname=aegisub +pkgver=3.1.0 +pkgrel=2 +pkgdesc="A general-purpose subtitle editor with ASS/SSA support" +arch=('i686' 'x86_64') +url="http://www.aegisub.org" +license=('GPL' 'BSD') +depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk') +makedepends=('boost' 'intltool' 'mesa') +install="${pkgname}.install" +source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" + 'aegisub-wx-stl.patch') +sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987' + '1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -Np1 -i ../aegisub-wx-stl.patch +} + +build() { + cd ${pkgname}-${pkgver}/${pkgname} + + ./configure --prefix='/usr' --without-{portaudio,openal,oss} + make +} + +package() { + cd ${pkgname}-${pkgver}/${pkgname} + + make DESTDIR="${pkgdir}" install + + install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub + install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE +} + +# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-testing-i686/aegisub-wx-stl.patch (from rev 103672, aegisub/trunk/aegisub-wx-stl.patch) =================================================================== --- community-testing-i686/aegisub-wx-stl.patch (rev 0) +++ community-testing-i686/aegisub-wx-stl.patch 2014-01-09 09:26:59 UTC (rev 103673) @@ -0,0 +1,61 @@ +From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001 +From: Thomas Goyne <plorkye...@aegisub.org> +Date: Sun, 5 Jan 2014 08:10:08 -0800 +Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl + +--enable-stl replaces the implicit conversion to char/wchar_t* with one +to std::[w]string. This breaks conversions to boost::filesytem::path and +makes some ternaries ambiguous (which GCC helpfully reports as no +conversion existing rather than an ambiguous conversion). +--- + aegisub/src/base_grid.cpp | 6 +++--- + aegisub/src/command/video.cpp | 2 +- + aegisub/src/dialog_attachments.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp +index 9422bf9..4675ad5 100644 +--- a/aegisub/src/base_grid.cpp ++++ b/aegisub/src/base_grid.cpp +@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx + if (paint_columns[4]) strings[4] = to_wx(line->Style); + if (paint_columns[5]) strings[5] = to_wx(line->Actor); + if (paint_columns[6]) strings[6] = to_wx(line->Effect); +- if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxString(); +- if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxString(); +- if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxString(); ++ if (paint_columns[7]) strings[7] = line->Margin[0] ? wxString(std::to_wstring(line->Margin[0])) : wxString(); ++ if (paint_columns[8]) strings[8] = line->Margin[1] ? wxString(std::to_wstring(line->Margin[1])) : wxString(); ++ if (paint_columns[9]) strings[9] = line->Margin[2] ? wxString(std::to_wstring(line->Margin[2])) : wxString(); + + if (paint_columns[10]) { + strings[10].clear(); +diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp +index 010da90..47bf259 100644 +--- a/aegisub/src/command/video.cpp ++++ b/aegisub/src/command/video.cpp +@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) { + // If where ever that is isn't defined, we can't save there + if ((basepath == "\\") || (basepath == "/")) { + // So save to the current user's home dir instead +- basepath = wxGetHomeDir(); ++ basepath = wxGetHomeDir().c_str(); + } + } + // Actual fixed (possibly relative) path, decode it +diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp +index 5465b39..2ff696e 100644 +--- a/aegisub/src/dialog_attachments.cpp ++++ b/aegisub/src/dialog_attachments.cpp +@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) { + + // Multiple or single? + if (listView->GetNextSelected(i) != -1) +- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())); ++ path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str(); + else { + path = SaveFileSelector( + _("Select the path to save the file to:"), +-- +1.8.5.2 + Deleted: community-testing-i686/aegisub.install =================================================================== --- community-testing-i686/aegisub.install 2014-01-09 09:26:44 UTC (rev 103672) +++ community-testing-i686/aegisub.install 2014-01-09 09:26:59 UTC (rev 103673) @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -ftq usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-testing-i686/aegisub.install (from rev 103672, aegisub/trunk/aegisub.install) =================================================================== --- community-testing-i686/aegisub.install (rev 0) +++ community-testing-i686/aegisub.install 2014-01-09 09:26:59 UTC (rev 103673) @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: Deleted: community-testing-i686/version.patch =================================================================== --- community-testing-i686/version.patch 2014-01-09 09:26:44 UTC (rev 103672) +++ community-testing-i686/version.patch 2014-01-09 09:26:59 UTC (rev 103673) @@ -1,76 +0,0 @@ ---- a/build/version.sh 2014-01-04 15:24:06.000000000 +0100 -+++ b/build/version.sh 2014-01-04 18:34:30.596106160 +0100 -@@ -1,70 +1,3 @@ --srcdir="$1" -- --# If no git repo try to read from the existing git_version.h, for building from tarballs --if ! test -d "${srcdir}/.git"; then -- version_h_path="${srcdir}/aegisub/build/git_version.h" -- if test -f "${version_h_path}"; then -- while read line; do -- set -- $line -- export $2=$(echo $3 | sed 's/"//g') -- done < "${version_h_path}" -- if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then -- export VERSION_SOURCE="from cached git_version.h" -- return 0 -- else -- echo "invalid git_version.h" -- exit 2 -- fi -- else -- echo "git repo not found and no cached git_version.h" -- exit 2 -- fi --fi -- --last_svn_revision=6962 --last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be" -- --git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l)) --git_version_str=$(git describe --exact-match 2> /dev/null) --if test x$git_version_str != x; then -- git_version_str="${git_version_str##v}" -- tagged_release=1 --else -- git_branch="$(git symbolic-ref HEAD 2> /dev/null)" || git_branch="(unnamed branch)" -- git_branch="${git_branch##refs/heads/}" -- git_hash=$(git rev-parse --short HEAD) -- -- git_version_str="${git_revision}-${git_branch}-${git_hash}" -- tagged_release=0 --fi -- --new_version_h="\ --#define BUILD_GIT_VERSION_NUMBER ${git_revision} --#define BUILD_GIT_VERSION_STRING \"${git_version_str}\" --#define TAGGED_RELEASE ${tagged_release}" -- --# may not exist yet for out of tree builds --mkdir -p build --version_h_path="build/git_version.h" -- --# Write it only if it's changed to avoid spurious rebuilds --# This bizzare comparison method is due to that newlines in shell variables are very exciting --case "$(cat ${version_h_path} 2> /dev/null)" --in -- "${new_version_h}");; -- *) echo "${new_version_h}" > "${version_h_path}" --esac -- --export BUILD_GIT_VERSION_NUMBER="${git_revision}" --export BUILD_GIT_VERSION_STRING="${git_version_str}" --export VERSION_SOURCE="from git" -- --cat << EOF > build/git_version.xml --<?xml version="1.0" encoding="utf-8"?> --<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -- <PropertyGroup> -- <GitVersionNumber>${git_revision}</GitVersionNumber> -- <GitVersionString>${git_version_str}</GitVersionString> -- </PropertyGroup> --</Project> --EOF -+export BUILD_GIT_VERSION_NUMBER='7937' -+export BUILD_GIT_VERSION_STRING='3.1.0' -+export TAGGED_RELEASE=1 Deleted: community-testing-x86_64/PKGBUILD =================================================================== --- community-testing-x86_64/PKGBUILD 2014-01-09 09:26:44 UTC (rev 103672) +++ community-testing-x86_64/PKGBUILD 2014-01-09 09:26:59 UTC (rev 103673) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@gmail.com> -# Contributor: kozec <ko...@kozec.com> -# Contributor: Limao Luo <luolimao+...@gmail.com> - -pkgname=aegisub -pkgver=3.1.0 -pkgrel=1 -pkgdesc="A general-purpose subtitle editor with ASS/SSA support" -arch=('i686' 'x86_64') -url="http://www.aegisub.org" -license=('GPL' 'BSD') -depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk') -makedepends=('boost' 'intltool' 'mesa') -install="${pkgname}.install" -source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" - 'version.patch') -sha256sums=('0d2befed013f3c64ab2cdf725f2b865fe2d074b35b621b7a61298b95f67def15' - '4119b79363512b18c6ddcbbdfb87b35c51e0ea149e763b126f568e80f956a01f') - -prepare() { - patch -Np1 -i version.patch -} - -build() { - ./configure --prefix='/usr' --without-{portaudio,openal,oss} - make -} - -package() { - make DESTDIR="${pkgdir}" install - -# License - install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub - install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE -} - -# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-testing-x86_64/PKGBUILD (from rev 103672, aegisub/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2014-01-09 09:26:59 UTC (rev 103673) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@gmail.com> +# Contributor: kozec <ko...@kozec.com> +# Contributor: Limao Luo <luolimao+...@gmail.com> + +pkgname=aegisub +pkgver=3.1.0 +pkgrel=2 +pkgdesc="A general-purpose subtitle editor with ASS/SSA support" +arch=('i686' 'x86_64') +url="http://www.aegisub.org" +license=('GPL' 'BSD') +depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk') +makedepends=('boost' 'intltool' 'mesa') +install="${pkgname}.install" +source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" + 'aegisub-wx-stl.patch') +sha256sums=('3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987' + '1306b2caf2e192597a99931b4519023ea63b684f330e0838b1152d52b279f6c1') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -Np1 -i ../aegisub-wx-stl.patch +} + +build() { + cd ${pkgname}-${pkgver}/${pkgname} + + ./configure --prefix='/usr' --without-{portaudio,openal,oss} + make +} + +package() { + cd ${pkgname}-${pkgver}/${pkgname} + + make DESTDIR="${pkgdir}" install + + install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub + install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE +} + +# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-testing-x86_64/aegisub-wx-stl.patch (from rev 103672, aegisub/trunk/aegisub-wx-stl.patch) =================================================================== --- community-testing-x86_64/aegisub-wx-stl.patch (rev 0) +++ community-testing-x86_64/aegisub-wx-stl.patch 2014-01-09 09:26:59 UTC (rev 103673) @@ -0,0 +1,61 @@ +From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001 +From: Thomas Goyne <plorkye...@aegisub.org> +Date: Sun, 5 Jan 2014 08:10:08 -0800 +Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl + +--enable-stl replaces the implicit conversion to char/wchar_t* with one +to std::[w]string. This breaks conversions to boost::filesytem::path and +makes some ternaries ambiguous (which GCC helpfully reports as no +conversion existing rather than an ambiguous conversion). +--- + aegisub/src/base_grid.cpp | 6 +++--- + aegisub/src/command/video.cpp | 2 +- + aegisub/src/dialog_attachments.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp +index 9422bf9..4675ad5 100644 +--- a/aegisub/src/base_grid.cpp ++++ b/aegisub/src/base_grid.cpp +@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx + if (paint_columns[4]) strings[4] = to_wx(line->Style); + if (paint_columns[5]) strings[5] = to_wx(line->Actor); + if (paint_columns[6]) strings[6] = to_wx(line->Effect); +- if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxString(); +- if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxString(); +- if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxString(); ++ if (paint_columns[7]) strings[7] = line->Margin[0] ? wxString(std::to_wstring(line->Margin[0])) : wxString(); ++ if (paint_columns[8]) strings[8] = line->Margin[1] ? wxString(std::to_wstring(line->Margin[1])) : wxString(); ++ if (paint_columns[9]) strings[9] = line->Margin[2] ? wxString(std::to_wstring(line->Margin[2])) : wxString(); + + if (paint_columns[10]) { + strings[10].clear(); +diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp +index 010da90..47bf259 100644 +--- a/aegisub/src/command/video.cpp ++++ b/aegisub/src/command/video.cpp +@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) { + // If where ever that is isn't defined, we can't save there + if ((basepath == "\\") || (basepath == "/")) { + // So save to the current user's home dir instead +- basepath = wxGetHomeDir(); ++ basepath = wxGetHomeDir().c_str(); + } + } + // Actual fixed (possibly relative) path, decode it +diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp +index 5465b39..2ff696e 100644 +--- a/aegisub/src/dialog_attachments.cpp ++++ b/aegisub/src/dialog_attachments.cpp +@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) { + + // Multiple or single? + if (listView->GetNextSelected(i) != -1) +- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())); ++ path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str(); + else { + path = SaveFileSelector( + _("Select the path to save the file to:"), +-- +1.8.5.2 + Deleted: community-testing-x86_64/aegisub.install =================================================================== --- community-testing-x86_64/aegisub.install 2014-01-09 09:26:44 UTC (rev 103672) +++ community-testing-x86_64/aegisub.install 2014-01-09 09:26:59 UTC (rev 103673) @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -ftq usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-testing-x86_64/aegisub.install (from rev 103672, aegisub/trunk/aegisub.install) =================================================================== --- community-testing-x86_64/aegisub.install (rev 0) +++ community-testing-x86_64/aegisub.install 2014-01-09 09:26:59 UTC (rev 103673) @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: Deleted: community-testing-x86_64/version.patch =================================================================== --- community-testing-x86_64/version.patch 2014-01-09 09:26:44 UTC (rev 103672) +++ community-testing-x86_64/version.patch 2014-01-09 09:26:59 UTC (rev 103673) @@ -1,76 +0,0 @@ ---- a/build/version.sh 2014-01-04 15:24:06.000000000 +0100 -+++ b/build/version.sh 2014-01-04 18:34:30.596106160 +0100 -@@ -1,70 +1,3 @@ --srcdir="$1" -- --# If no git repo try to read from the existing git_version.h, for building from tarballs --if ! test -d "${srcdir}/.git"; then -- version_h_path="${srcdir}/aegisub/build/git_version.h" -- if test -f "${version_h_path}"; then -- while read line; do -- set -- $line -- export $2=$(echo $3 | sed 's/"//g') -- done < "${version_h_path}" -- if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then -- export VERSION_SOURCE="from cached git_version.h" -- return 0 -- else -- echo "invalid git_version.h" -- exit 2 -- fi -- else -- echo "git repo not found and no cached git_version.h" -- exit 2 -- fi --fi -- --last_svn_revision=6962 --last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be" -- --git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l)) --git_version_str=$(git describe --exact-match 2> /dev/null) --if test x$git_version_str != x; then -- git_version_str="${git_version_str##v}" -- tagged_release=1 --else -- git_branch="$(git symbolic-ref HEAD 2> /dev/null)" || git_branch="(unnamed branch)" -- git_branch="${git_branch##refs/heads/}" -- git_hash=$(git rev-parse --short HEAD) -- -- git_version_str="${git_revision}-${git_branch}-${git_hash}" -- tagged_release=0 --fi -- --new_version_h="\ --#define BUILD_GIT_VERSION_NUMBER ${git_revision} --#define BUILD_GIT_VERSION_STRING \"${git_version_str}\" --#define TAGGED_RELEASE ${tagged_release}" -- --# may not exist yet for out of tree builds --mkdir -p build --version_h_path="build/git_version.h" -- --# Write it only if it's changed to avoid spurious rebuilds --# This bizzare comparison method is due to that newlines in shell variables are very exciting --case "$(cat ${version_h_path} 2> /dev/null)" --in -- "${new_version_h}");; -- *) echo "${new_version_h}" > "${version_h_path}" --esac -- --export BUILD_GIT_VERSION_NUMBER="${git_revision}" --export BUILD_GIT_VERSION_STRING="${git_version_str}" --export VERSION_SOURCE="from git" -- --cat << EOF > build/git_version.xml --<?xml version="1.0" encoding="utf-8"?> --<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -- <PropertyGroup> -- <GitVersionNumber>${git_revision}</GitVersionNumber> -- <GitVersionString>${git_version_str}</GitVersionString> -- </PropertyGroup> --</Project> --EOF -+export BUILD_GIT_VERSION_NUMBER='7937' -+export BUILD_GIT_VERSION_STRING='3.1.0' -+export TAGGED_RELEASE=1