[PATCH] Fix building in git shallow clones
Anton Lundin
glance at acc.umu.se
Tue Jan 21 10:11:42 UTC 2014
On 21 January, 2014 - Dirk Hohndel wrote:
>
> I don't think this is correct. With this patch, someone building from
> the release tar file will now suddenly get a -git version.
>
> That seems wrong.
>
They won't. Its still in the exists(.git/HEAD):-block.
If you read the $$system("sh scripts/get-version... blocks you see that
if the command fails it tries to _run_ the version, not echo it, so this
is code that never worked.
I can change it to default to whatever hard-coded version we have and
just skip the -git part if you would like that.
//Anton
> On Mon, 2014-01-20 at 13:19 +0100, Anton Lundin wrote:
> > If we are building from a shallow clone, just guess the version based on
> > whats hard-coded in VERSION and append a -git to show thats it somwhere
> > behind that.
> >
> > Signed-off-by: Anton Lundin <glance at acc.umu.se>
> > ---
> > subsurface-gen-version.pri | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri
> > index e0d0ea5..6910050 100644
> > --- a/subsurface-gen-version.pri
> > +++ b/subsurface-gen-version.pri
> > @@ -10,10 +10,10 @@ exists(.git/HEAD): {
> > VERSION_SCRIPT = $$PWD/scripts/get-version
> > # always use linux here -------------------vvv so we get the true full version
> > FULL_VERSION = "`$$VERSION_SCRIPT linux`"
> > - PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || $${VERSION}.0.0")
> > - VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || $${VERSION}")
> > + PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || echo $${VERSION}.0.0-git")
> > + VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || echo $${VERSION}-git")
> > version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("$$SET_GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD")
> > - version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT}
> > + version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS || echo $$VERSION-git`\\\" > ${QMAKE_FILE_OUT}
> > version_h.input = GIT_HEAD
> > version_h.output = $$VERSION_FILE
> > version_h.variable_out = GENERATED_FILES
>
--
Anton Lundin +46702-161604
More information about the subsurface
mailing list