Re: [Geeqie-devel] Git repository workflow
On 2016-05-05 12:39 -0400, Greg Troxel wrote: > For developer use, there's no need for tarballs or generated files; > people can just git clone. As I understand it, the problems with this position are: 1. There is no clear distinction between developers and non-developers. There are many ppl including me who are mostly end users but contribute the occassional patch. 2. It is not just a matter of what is easy/natural for the person installing the package, but also how to make bug reports clearly and reliably include the source version that was used. This will not happen without somehow patching the VC info into the binary. -- Please *no* private copies of mailing list or newsgroup messages. Rule 420: All persons more than eight miles high to leave the court. -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi, Am Do den 5. Mai 2016 um 13:02 schrieb Colin Clark: > > I now set version in configure.in using the short commit release. > > > > That is not perfect as it will not be rebuild with a subsequent make but > > at least it is a start. > > > > For Release this need to be set manually as before. Maybe I can make a > > better solution or someone comes up with one. > I am not sure if this is a problem or not. > > My local installation is now putting the help files into: > > /usr/local/share/doc/geeqie-6faca40 Well, that is somehow expectable. I don't know if we should change that as it has pro and cons. Regards Klaus - -- Klaus Ethgen http://www.ethgen.ch/ pub 4096R/4E20AF1C 2011-05-16 Klaus EthgenFingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C -BEGIN PGP SIGNATURE- Version: GnuPG v1 Comment: Charset: ISO-8859-1 iQGcBAEBCgAGBQJXKzx1AAoJEKZ8CrGAGfas/twMALizWr+nFowsnyvN7f77RnBq 7ZFllxnFqXZrA5mJJz4QiHe7E43TQwQU7iFsI8StkU7KGmVxoKhQaJJKU3iIi/iA AIZoFBW2+7snTc2ywGuPmJbs9+enKs5ZbiPUsnz+fn0iPsSTyxRNuvO1P55e3G8K CA7Qd1rzX0bjcOlzyYuM7fDCnn7eZiSCiWWbX2jpI6tHwQZR87WZjCTuAKTnEa/i HBRPc5vIvyDZXTzl5TDThXaShpKLGiIyAwJXhaRuQf82ZHwnEY5z7D7tkcPddOm9 Po2JnqsvsFECEzw9XkZmVNbtAlQsdgfCePXDLa78vTxe+F/zqqaOU7veOadSX9nu uOr696UZpWS9r1OKQ6+EQzJcqvZcQCBOkL9AE5ygW1xqghv3wcdPES6R9tQtLN+e +mv/7goRVDfM0AUKeiAh8QwI34bcwxFRM3JaW7UOeNKrGQGbbaZeGXrgaiPf4lpc 6cKcR2nX2Y6IN38RaURTEPfgVbdvQibBr4CyNPnzFA== =AqUu -END PGP SIGNATURE- -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
Klaus Ethgen wrote, on 3.5.2016 15:18: > Am Di den 3. Mai 2016 um 13:06 schrieb Josef Kufner: >> Klaus Ethgen wrote, on 3.5.2016 12:30: >>> For Release this need to be set manually as before. Maybe I can make a >>> better solution or someone comes up with one. > >> Is there really a difference between release build and ordinary build? >> Does it have to be? > > I would say so: > - Release build must not fail So there must be a fallback for tarballs (directory name?). > - Release build has a version (not a hash number git describe produces very nice string: tag, number of commits from the tag and hash. If current commit is tagged, it produces only a tag name. > - Release build only receive stable and/or security patches That does not conflict with anything. Still all releases should be tagged (incrementing patch number), so it does not change anything. -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Am Di den 3. Mai 2016 um 13:06 schrieb Josef Kufner: > Klaus Ethgen wrote, on 3.5.2016 12:30: > > For Release this need to be set manually as before. Maybe I can make a > > better solution or someone comes up with one. > > Is there really a difference between release build and ordinary build? > Does it have to be? I would say so: - - Release build must not fail - - Release build has a version (not a hash number - - Release build only receive stable and/or security patches Regards Klaus - -- Klaus Ethgen http://www.ethgen.ch/ pub 4096R/4E20AF1C 2011-05-16 Klaus EthgenFingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C -BEGIN PGP SIGNATURE- Version: GnuPG v1 Comment: Charset: ISO-8859-1 iQGcBAEBCgAGBQJXKKUTAAoJEKZ8CrGAGfasZ+cL/iCHx4RayRdxXFesZjQIIZKz 1/7ZFfd9KtwH1sD12Pc2qS9FbyuHsWnL6h3v+qSBeNooLX3W1e5PAb5c8C3vO/39 eCvQ3XwU+6Vp6iFjE1E4DqWjxLZBxUBRayqTPWI771esBiFB+CUQ29xSrgUN0CWD yPuaquAJnHGIXqhWQ5DuToRCy9Z1VG/f5dR6oOV6GYP2DYYRW5AOiv61jqWsKHAO D3kr1jZ/vcN3rLR8GdMBxdJXZJTy8uGvXiMYgapH9iI0YlaODHrmQy1czGsRM7tF +yWIvgLJJPN92LpBg7BLyDDiCmH87A03riUMS4vqxe3+NosTIsIlXagFXrAAwuZO eoURxyPIxNR0tx0UDhKP/j3sP4IR/S1ZQvlbEW2wwOVk3O8TDpvA8Yl6ifLtDfKy xdaHfjsejRmiDleiECpQWb6o1WXXOewzI4wvlGmqiBl9IiBn2cgnc99qD1OZ8qSj nfrSpX/kTjiVoiElSq2+kZImoEl7SNAwmApHCoF62w== =wBkl -END PGP SIGNATURE- -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
Klaus Ethgen wrote, on 3.5.2016 12:30: > For Release this need to be set manually as before. Maybe I can make a > better solution or someone comes up with one. Is there really a difference between release build and ordinary build? Does it have to be? -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
> Am Mo den 2. Mai 2016 um 18:53 schrieb Josef Kufner: >> Git hooks are not the right tool for this task. It is better to run `git >> describe` during the build process to generate a version file, which >> will be compiled in and shown by `geeqie --version`. > >> It is easy to automatically generate version.h with few #define >> statements or something like that and include it wherever neccessary. > > Yes. That is also what I think about that. > > But there is a problem when people use the tarbal to build their > version. > > So the version has to be in the checked out file. There is some substs > that could be used eventually. But finally it has to be set with > checkin, so a hook. Unfortunately for a hook, every developer has to > have them in all the clones. There is no way to manage them within git. > > Nevertheless, it is easy to have just "master" in version information. Tarball from Github contains root directory named geeqie-1.2.3. So there is a reasonable fallback. Not perfect, but good enough. Simply force generation of version.h during build and it will be fine. Hooks are much more problematic. I use generated version info in all my projects and it works very well. My last Qt project used this in qmake project file: GIT_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD \ describe --always --tags) DEFINES += GIT_VERSION=\\\"$$GIT_VERSION\\\" It results in gcc -DGIT_VERSION=\"1.2.3\" ... -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
Git hooks are not the right tool for this task. It is better to run `git describe` during the build process to generate a version file, which will be compiled in and shown by `geeqie --version`. It is easy to automatically generate version.h with few #define statements or something like that and include it wherever neccessary. Colin Clark wrote, on 2.5.2016 19:46: > >> I'll post in the issues if appropriate: the question I have at the >> moment is that the about box seems woefully out of date, as is "geeqie >> --version". I am fairly sure I am compiling master HEAD. >> > Hi Klaus > > There have been quite a few updates to the repository recently, and > maybe a few more to come from me - e.g. copy/move with thumbnail preview > and simultaneous rename, additional search functions. > > I think people may try to keep up to date by downloading the master > rather than wait for a release, but that gives a problem when they > report problems - what have they compiled?. > > Is it a simple thing to use git hooks to run a command to update a file > in the repo at each commit, so that the About window can show not just > major/minor version, but also e.g. the output of "git describe" at the > time the last commit was made? > > If not, no problem. > > > Colin... > > > -- > Find and fix application performance issues faster with Applications Manager > Applications Manager provides deep performance insights into multiple tiers of > your business applications. It resolves application problems quickly and > reduces your MTTR. Get your free trial! > https://ad.doubleclick.net/ddm/clk/302982198;130105516;z > ___ > Geeqie-devel mailing list > Geeqie-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/geeqie-devel > -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
> I'll post in the issues if appropriate: the question I have at the > moment is that the about box seems woefully out of date, as is "geeqie > --version". I am fairly sure I am compiling master HEAD. > Hi Klaus There have been quite a few updates to the repository recently, and maybe a few more to come from me - e.g. copy/move with thumbnail preview and simultaneous rename, additional search functions. I think people may try to keep up to date by downloading the master rather than wait for a release, but that gives a problem when they report problems - what have they compiled?. Is it a simple thing to use git hooks to run a command to update a file in the repo at each commit, so that the About window can show not just major/minor version, but also e.g. the output of "git describe" at the time the last commit was made? If not, no problem. Colin... -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
On Mon, 2016-05-02 at 11:18 +0100, Klaus Ethgen wrote: > […] > > Well, it is the only place, we have currently. Works for me. :-) […] > > Well, that is only in the head. If you checkout current released > version > 1.2.3, you have a actual version there. OK. I got confused because the master about was not clearly a development one. Debian Sid and Fedora Rawhide both have 1.2.2 which doesn't do dark theme properly. Given I am compiling locally, I might as well compile head rather than the release, then at least I can report problems I see. -- Russel. = Dr Russel Winder t: +44 20 7585 2200 voip: sip:russel.win...@ekiga.net 41 Buckmaster Roadm: +44 7770 465 077 xmpp: rus...@winder.org.uk London SW11 1EN, UK w: www.russel.org.uk skype: russel_winder signature.asc Description: This is a digitally signed message part -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi, Am Mo den 2. Mai 2016 um 11:04 schrieb Russel Winder: > > I do manually sync them one between the other currently. So if you > > have > > a pull request on Github, it will work too currently. > > So I guess the Issues on this repository are the official p[lace to > post issues on the code? Well, it is the only place, we have currently. > > But with git it doesn't really matter which is main and which is > > mirror. > > Both have the same content. (Most of the time) > > The "most of the time" is actually the crucial bit in ,any cases, hence > my question about which is the mainline. Th "most of the time" just mean that there might be one or two commits more on geeqie.org that will end in Github later. > > Colin and myself currently are working primary on geeqie.org. It is > > most > > likely that this repository is the most current one. > > > I'll post in the issues if appropriate: the question I have at the > moment is that the about box seems woefully out of date, as is "geeqie > --version". I am fairly sure I am compiling master HEAD. Well, that is only in the head. If you checkout current released version 1.2.3, you have a actual version there. Regards Klaus - -- Klaus Ethgen http://www.ethgen.ch/ pub 4096R/4E20AF1C 2011-05-16 Klaus EthgenFingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C -BEGIN PGP SIGNATURE- Version: GnuPG v1 Comment: Charset: ISO-8859-1 iQGbBAEBCgAGBQJXJyl3AAoJEKZ8CrGAGfasicQL91+zIU5UhP/f3dy6MzW3AyHw YPprirOqaGRTLTuZR2gc8965xCFdODD6gETcDXFcfZUTCugM3nEMKXQW1aY7yLqy B0UtLMc3EUo6i+8WkF2UjELQPLjXszKtGQPafGG8Vr1RO9WGb6pQrYbXcqiJ3sC5 bB0dA6TWx1GqWt15BldSsFk/SIltbBiskkYTGE9mJ/8z9HzZ+s9Gy/VtU99Pgkhv cE0J5Cy6i7bP/o6nUG0lvPWcyfTZ+n6eAu8iMrKOlDgKTjjV8gp3/RAh7URjLPIP ZyZ/Cc4yabUwStlm8NC6i9c60rZWRkzFCFnLOeI+WdmIeeUirKtCgOFKe11EUhC1 DwM2FCEGeoA18/rat4gnwEAWPA0pqBm2zuqhF6izqx3em6XuDuNPX7yOE20ibHG4 nAhcMjVFOo0SvQL0jIV91pc/Mu/EOR/tuy6KlOxpSExVhAhuCESGFZX52O93ltL9 ldlMqEFD8F/OuquZ6aZatKUNTBvkdhKQODA6loFa =ukOj -END PGP SIGNATURE- -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
Klaus, Thanks for getting back to me quickly, much appreciated. On Mon, 2016-05-02 at 10:47 +0100, Klaus Ethgen wrote: > Hi Russel, > […] > > The one on www.geeqie.org is the main one. This is the one I currently have a clone of so I will stick with that, at least for now. > I do manually sync them one between the other currently. So if you > have > a pull request on Github, it will work too currently. So I guess the Issues on this repository are the official p[lace to post issues on the code? > But with git it doesn't really matter which is main and which is > mirror. > Both have the same content. (Most of the time) The "most of the time" is actually the crucial bit in ,any cases, hence my question about which is the mainline. > Colin and myself currently are working primary on geeqie.org. It is > most > likely that this repository is the most current one. > I'll post in the issues if appropriate: the question I have at the moment is that the about box seems woefully out of date, as is "geeqie --version". I am fairly sure I am compiling master HEAD. -- Russel. = Dr Russel Winder t: +44 20 7585 2200 voip: sip:russel.win...@ekiga.net 41 Buckmaster Roadm: +44 7770 465 077 xmpp: rus...@winder.org.uk London SW11 1EN, UK w: www.russel.org.uk skype: russel_winder signature.asc Description: This is a digitally signed message part -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
Re: [Geeqie-devel] Git repository workflow
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi Russel, Am Mo den 2. Mai 2016 um 8:56 schrieb Russel Winder: > Is the Git repository on www.geeqie.org the mainline and the one on > GitHub (https://github.com/BestImageViewer/geeqie) a mirror or is the > one on GitHub the mainline and the one on www.geeqie.org a mirror? The one on www.geeqie.org is the main one. I do manually sync them one between the other currently. So if you have a pull request on Github, it will work too currently. But with git it doesn't really matter which is main and which is mirror. Both have the same content. (Most of the time) Colin and myself currently are working primary on geeqie.org. It is most likely that this repository is the most current one. Gruß Klaus - -- Klaus Ethgen http://www.ethgen.ch/ pub 4096R/4E20AF1C 2011-05-16 Klaus EthgenFingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C -BEGIN PGP SIGNATURE- Version: GnuPG v1 Comment: Charset: ISO-8859-1 iQGcBAEBCgAGBQJXJyIoAAoJEKZ8CrGAGfasMS4MAKxSVKLyRkv5hN9OvSDajKji QNZzbKqsyT5XsBil7s96+bHZ274BFAThOQCqmyGM7lOmrg3d+fTSEKHRItrPYRu9 UdJtoAHqaUDJgyuIO1tvUZ7sEer2vCnnR1TisjcHyID2QtEAxBxuIVU4oMygwYsF dzMjFMENY9NUuTKecxhrONvZzNaUIRkmi4FFp/mXu4Xo4gjIw+c2Z/InhHhWPtjn HPBSKm5cGbAeCKy8Z7Np1oW4oXJLEh80vxNfmp0yhPr1Rucx+fMtK/cGwM1HgUvF U70/0veqzOGG1XPAE5D0v71NRmK20vCLF3IsNz1dUHBxxJFw5hHBL/s/TxcHMpmV J9qSUzxjpB3dyEEw95SOJBcNDzQl1j0mpVPdD/2lHU6CNlxtxfGu1Jw3noVSKo+I MD8Hu1qvDNFs9v3PRhWg0ElbqgSf2QVnn9yO4FOu4LoykhJMeKadPxq+bBX3LN3a IlJ/o/udfk26jj6BL4JT5xTGz0KJiVAWnhVRjyINoA== =Nmfz -END PGP SIGNATURE- -- Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z ___ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel