[Kicad-developers] Build failed in Jenkins: linux-kicad-full-gcc-head #4542

See Changes: [jean-pierre charras] fp editor: very minor fix: fix incorrect icon in toolbar -- [...truncated 155.80 KB...] [ 87%] Building CXX object

Re: [Kicad-developers] Pulling mac 5.0.2...

Sorry, resending since I sent from the wrong address. On Fri, Jan 18, 2019, 6:57 PM Adam Wolf If I use git am, how do I release another 5.0.2, Nick? > > On Fri, Jan 18, 2019, 6:08 PM Nick Østergaard >> IMHO, just use git am and be happy with the output. I should be unique >> and mention 5.0.2

Re: [Kicad-developers] Pulling mac 5.0.2...

IMHO, just use git am and be happy with the output. I should be unique and mention 5.0.2 plus some additions. fre. 18. jan. 2019 22.33 skrev Bob Gustafson : > Maybe the suffix would start with an alpha character (a,b,c,d,..) The > first would start with a. If another patch comes along, change

Re: [Kicad-developers] Pulling mac 5.0.2...

Maybe the suffix would start with an alpha character (a,b,c,d,..) The first would start with a. If another patch comes along, change the suffix to b, ... etc. When the number come back in sync, drop the suffix. Anyway - a suggestion. On 1/18/19 3:25 PM, Adam Wolf wrote: Exactly.  I won't say

Re: [Kicad-developers] Pulling mac 5.0.2...

That make sense to me. This way we will know that there are patches applied to the macos build that are beyond the 5.0.2 tag. On 1/18/19 3:13 PM, Adam Wolf wrote: > So I originally used git am.  I apply 4 patches, so my first release was > 5.0.2-4-SOMESHA.  I want to make a new version, that is

Re: [Kicad-developers] Pulling mac 5.0.2...

So I originally used git am. I apply 4 patches, so my first release was 5.0.2-4-SOMESHA. I want to make a new version, that is obviously newer and higher than that. I asked Wayne, and he said to apply the macOS-packaging-specific patches outside of git, so that git describe is OK. I forgot

Re: [Kicad-developers] Pulling mac 5.0.2...

If you use `git am` to apply the patches, you wont get -dirty appended to the version string. However, you will end up with -###-gcommithash appended so you still wont end up with 5.0.2 as the version string which is what I'm gessing Adam is looking for. On 1/18/19 2:33 PM, Nick Østergaard

Re: [Kicad-developers] Pulling mac 5.0.2...

Mmm, what is wrong wit the git describe when the patches are applied with git am? fre. 18. jan. 2019 20.11 skrev Wayne Stambaugh : > This is a result of modifications to the repo. The --dirty option of > `git describe` checks to see anything is modified and appends -dirty to > the version

Re: [Kicad-developers] Pulling mac 5.0.2...

This is a result of modifications to the repo. The --dirty option of `git describe` checks to see anything is modified and appends -dirty to the version string. This way we know if someone modified the source for a given commit. You could change the command in CreateGitVersionHeader.cmake to

Re: [Kicad-developers] Pulling mac 5.0.2...

Hi Wayne! I have since fixed the ngspice build race condition on macOS. I have modified the build scripts so that patches occur via patch, not git itself. Unfortunately, now the git version info shows 5.0.2-dirty. Is this how it shows on the Windows builds too? Adam Wolf On Tue, Jan 8, 2019

[Kicad-developers] Build failed in Jenkins: linux-kicad-full-gcc-head #4541

See Changes: [hillbrand] polygon: Fix missing steiner removal and fracture -- [...truncated 155.84 KB...] [ 88%] Building CXX object

[Kicad-developers] Build failed in Jenkins: linux-kicad-full-gcc-head #4540

See Changes: [jean-pierre charras] Toolbars with wxComboboxes: Fix incorrect ReCreate Toolbar methods: they -- [...truncated 156.18 KB...] Scanning dependencies