Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
On 11-10-15 13:31, Dirk Stöcker wrote: > On Sat, 10 Oct 2015, Sebastiaan Couwenberg wrote: > >> On 10-10-15 00:01, Dirk Stöcker wrote: >>> On Fri, 9 Oct 2015, Sebastiaan Couwenberg wrote: >>> > No. As you mark it as Debian in the agent it's correct to strip the > SVN > text. This patch as far as I remember was designed in cooperation with > me. For SVN we react different in tickets - We tell the user first to > update to recent SVN version assuming the user can build the software > himself. This is not the correct reply for Debian version, so the SVN > should not be there. Simply change the patch to set "Debian" > instead of > "SVN", as I see that there is no patch in the GIT yet for this > purpose. Based on the bug report and your changes to the VersionTest macro, it seemed the patch may have been unneeded in the first place. I prefer the User-Agent without SVN substring anyway, so I'll happily keep it for the Debian package. The Debian Build-Name change is currently only available in the 00-build.patch on the stretch branch: https://anonscm.debian.org/cgit/pkg-grass/josm.git/tree/debian/patches/00-build.patch?h=stretch#n57 >>> >>> Hmm, maybe these two together need some rework. If you simply change >>> Is-Local-Build (above the Build-Name) to false the patch to Version.java >>> can be dropped and manifest is more correct. >> >> Settings Is-Local-Build to false goes against the guidelines from the >> 'How to create a build' documentation [0]. >> >> The Debian package is not an "official" release provided by >> josm.openstreetmap.de for which Is-Local-Build: true is appropriate. > > I added " or another approved organization" there, so it's appropriate > now :-) Alright, the Debian package has been updated accordingly. :-) It will be included in the next upload, that should be next weekend to give the freeplane maintainer a little time to look into supporting JMapViewer 1.11 in the freeplane openmaps plugin. >> If the motivation for this change is to not need the Version.java >> change, I don't think that's appropriate. I prefer keeping Version.java >> change and correctly identifying the Debian package builds as a custom >> build not provided by josm.openstreetmap.de. > > Local build really means user local builds. That's not true for Debian. > As we discussed and agreed on a proper marking of the Debian version > setting this to false is better. All these settings are only there to > allow us proper support reaction for requests. Shouldn't the Main-Version in the MANIFEST.MF now also include Debian instead of SVN? Or should we just keep stripping the SVN string? Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
On 10-10-15 00:01, Dirk Stöcker wrote: > On Fri, 9 Oct 2015, Sebastiaan Couwenberg wrote: > >>> No. As you mark it as Debian in the agent it's correct to strip the SVN >>> text. This patch as far as I remember was designed in cooperation with >>> me. For SVN we react different in tickets - We tell the user first to >>> update to recent SVN version assuming the user can build the software >>> himself. This is not the correct reply for Debian version, so the SVN >>> should not be there. Simply change the patch to set "Debian" instead of >>> "SVN", as I see that there is no patch in the GIT yet for this purpose. >> >> Based on the bug report and your changes to the VersionTest macro, it >> seemed the patch may have been unneeded in the first place. >> >> I prefer the User-Agent without SVN substring anyway, so I'll happily >> keep it for the Debian package. >> >> The Debian Build-Name change is currently only available in the >> 00-build.patch on the stretch branch: >> >> https://anonscm.debian.org/cgit/pkg-grass/josm.git/tree/debian/patches/00-build.patch?h=stretch#n57 >> > > Hmm, maybe these two together need some rework. If you simply change > Is-Local-Build (above the Build-Name) to false the patch to Version.java > can be dropped and manifest is more correct. Settings Is-Local-Build to false goes against the guidelines from the 'How to create a build' documentation [0]. The Debian package is not an "official" release provided by josm.openstreetmap.de for which Is-Local-Build: true is appropriate. If the motivation for this change is to not need the Version.java change, I don't think that's appropriate. I prefer keeping Version.java change and correctly identifying the Debian package builds as a custom build not provided by josm.openstreetmap.de. [0] https://josm.openstreetmap.de/wiki/DevelopersGuide/CreateBuild#TheREVISIONfile > Removing SVN from the other line in build.xml is probably still required > (we don't use build.xml but a makefile on the server). But I'd include > that single change in your 00-build.patch for better readability. The patches have different origins and authors, that's why I prefer to keep them separate. I've also considered merging all build.xml changes in 00-build.patch, but so far prefer to keep the separate patches. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
Speaking of Debian patches, I think you should also remove the "macosx" folder, like what is done for the "windows" folder. You may also remove from build.xml the following targets: mac, distmac, distwin You can also remove xmltask.jar from tools directory (it is only used to build the OSX package) Cheers, Vincent 2015-10-10 0:01 GMT+02:00 Dirk Stöcker: > On Fri, 9 Oct 2015, Sebastiaan Couwenberg wrote: > > No. As you mark it as Debian in the agent it's correct to strip the SVN >>> text. This patch as far as I remember was designed in cooperation with >>> me. For SVN we react different in tickets - We tell the user first to >>> update to recent SVN version assuming the user can build the software >>> himself. This is not the correct reply for Debian version, so the SVN >>> should not be there. Simply change the patch to set "Debian" instead of >>> "SVN", as I see that there is no patch in the GIT yet for this purpose. >>> >> >> Based on the bug report and your changes to the VersionTest macro, it >> seemed the patch may have been unneeded in the first place. >> >> I prefer the User-Agent without SVN substring anyway, so I'll happily >> keep it for the Debian package. >> >> The Debian Build-Name change is currently only available in the >> 00-build.patch on the stretch branch: >> >> >> https://anonscm.debian.org/cgit/pkg-grass/josm.git/tree/debian/patches/00-build.patch?h=stretch#n57 >> > > Hmm, maybe these two together need some rework. If you simply change > Is-Local-Build (above the Build-Name) to false the patch to Version.java > can be dropped and manifest is more correct. > > Removing SVN from the other line in build.xml is probably still required > (we don't use build.xml but a makefile on the server). But I'd include that > single change in your 00-build.patch for better readability. > > Ciao > -- > http://www.dstoecker.eu/ (PGP key available) > > ___ > josm-dev mailing list > josm-dev@openstreetmap.org > https://lists.openstreetmap.org/listinfo/josm-dev > ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
2015-10-09 21:44 GMT+02:00 Sebastiaan Couwenberg: > We still don't have JCS packaged for Debian, but thanks to Emmanuel > Bourg there is some progress on this front with the upload of the jcache > spec. > > I'm currently working on updating the JOSM package to 8800 using the > embedded JCS and newer metadata-extractor version. > > Great news! ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
On Fri, 9 Oct 2015, Sebastiaan Couwenberg wrote: No. As you mark it as Debian in the agent it's correct to strip the SVN text. This patch as far as I remember was designed in cooperation with me. For SVN we react different in tickets - We tell the user first to update to recent SVN version assuming the user can build the software himself. This is not the correct reply for Debian version, so the SVN should not be there. Simply change the patch to set "Debian" instead of "SVN", as I see that there is no patch in the GIT yet for this purpose. Based on the bug report and your changes to the VersionTest macro, it seemed the patch may have been unneeded in the first place. I prefer the User-Agent without SVN substring anyway, so I'll happily keep it for the Debian package. The Debian Build-Name change is currently only available in the 00-build.patch on the stretch branch: https://anonscm.debian.org/cgit/pkg-grass/josm.git/tree/debian/patches/00-build.patch?h=stretch#n57 Hmm, maybe these two together need some rework. If you simply change Is-Local-Build (above the Build-Name) to false the patch to Version.java can be dropped and manifest is more correct. Removing SVN from the other line in build.xml is probably still required (we don't use build.xml but a makefile on the server). But I'd include that single change in your 00-build.patch for better readability. Ciao -- http://www.dstoecker.eu/ (PGP key available) ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
[josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
Is the source for the JOSM Version check, the VersionTest macro used in StartupPageSource wiki, available somewhere? It currently is unable to handle the version used for the Debian package which is reported as a strange version: '8159 Debian nl) Linux Debian GNU/Linux unstable (sid' This was triggered by the addition of the Build-Name property to better identify the Debian builds. I suspect that the VersionTest regex doesn't support the use of the Build-Name property. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
On 09-10-15 17:39, Dirk Stöcker wrote: >> Works now? Please check that it checks against tested and does not >> tell to update unless there's really a newer one. SVN version already >> tell you to update when a new latest is there. > > Need to correct me. For SVN it only tells you to update when you are > least 50 versions behind. So it can't be tested ATM, as tested to latest > diff is only 40. Thanks for the quick fixes, the Startup page now reports: * Active version '8159 Debian' should be updated! The current stable snapshot is 8800 and 8840 is the unstable development version. This is for http.agent: 'JOSM/1.5 (8159 Debian en) Linux Debian GNU/Linux unstable (sid)' The Debian package carries a very old patch [0] that strips the addition of the SVN substring for local builds to fix Debian Bug #598920 [1]. We may need to consider dropping that patch now. What are your thoughts about that? [0] http://anonscm.debian.org/cgit/pkg-grass/josm.git/tree/debian/patches/05-fix_version.patch [1] https://bugs.debian.org/598920 Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
On 09-10-15 21:27, Dirk Stöcker wrote: > On Fri, 9 Oct 2015, Sebastiaan Couwenberg wrote: > >> Thanks for the quick fixes, the Startup page now reports: >> >> * Active version '8159 Debian' should be updated! The current stable >> snapshot is 8800 and 8840 is the unstable development version. > > Well yes, that will remain a Debian problem. Will you ever get a version > where the Wiki will not ask for an update with our monthly cycle :-) We still don't have JCS packaged for Debian, but thanks to Emmanuel Bourg there is some progress on this front with the upload of the jcache spec. I'm currently working on updating the JOSM package to 8800 using the embedded JCS and newer metadata-extractor version. >> The Debian package carries a very old patch [0] that strips the addition >> of the SVN substring for local builds to fix Debian Bug #598920 [1]. We >> may need to consider dropping that patch now. >> >> What are your thoughts about that? > > No. As you mark it as Debian in the agent it's correct to strip the SVN > text. This patch as far as I remember was designed in cooperation with > me. For SVN we react different in tickets - We tell the user first to > update to recent SVN version assuming the user can build the software > himself. This is not the correct reply for Debian version, so the SVN > should not be there. Simply change the patch to set "Debian" instead of > "SVN", as I see that there is no patch in the GIT yet for this purpose. Based on the bug report and your changes to the VersionTest macro, it seemed the patch may have been unneeded in the first place. I prefer the User-Agent without SVN substring anyway, so I'll happily keep it for the Debian package. The Debian Build-Name change is currently only available in the 00-build.patch on the stretch branch: https://anonscm.debian.org/cgit/pkg-grass/josm.git/tree/debian/patches/00-build.patch?h=stretch#n57 These changes are also in my local master branch that I'll push to the git repository on Alioth soon after finishing the changes for JOSM 8800. > But you can drop "08-disable_gettext-merge.patch". That speed issue has > been fixed some time ago. That patch has also been disabled some time ago, as part of the changes for JOSM 8800 these old disabled patches are now removed entirely, not just disabled in the series file. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
On Fri, 9 Oct 2015, Sebastiaan Couwenberg wrote: Is the source for the JOSM Version check, the VersionTest macro used in StartupPageSource wiki, available somewhere? Yes. But not public :-) It currently is unable to handle the version used for the Debian package which is reported as a strange version: '8159 Debian nl) Linux Debian GNU/Linux unstable (sid' This was triggered by the addition of the Build-Name property to better identify the Debian builds. Works now? Please check that it checks against tested and does not tell to update unless there's really a newer one. SVN version already tell you to update when a new latest is there. I suspect that the VersionTest regex doesn't support the use of the Build-Name property. Nah, it was hardcoded to only "SVN". Sometimes it seems brain is turned off when writing such code. Ciao -- http://www.dstoecker.eu/ (PGP key available) ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev
Re: [josm-dev] JOSM Version check source (VersionTest macro) to troubleshoot strange version
Hello, Works now? Please check that it checks against tested and does not tell to update unless there's really a newer one. SVN version already tell you to update when a new latest is there. Need to correct me. For SVN it only tells you to update when you are least 50 versions behind. So it can't be tested ATM, as tested to latest diff is only 40. Ciao -- http://www.dstoecker.eu/ (PGP key available) ___ josm-dev mailing list josm-dev@openstreetmap.org https://lists.openstreetmap.org/listinfo/josm-dev