kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

Patch committed in the product branch r5928.  Thanks.


On 7/11/2015 2:43 PM, Nick Østergaard wrote:
> Aha, ok, I see. I must have been at bit tired at the time, but I
> hereby attach a rebased patch which I can not make to fail, so I guess
> it is ok, but please remember to review.
> 
> 2015-07-11 1:59 GMT+02:00 Wayne Stambaugh <stambaughw@xxxxxxxxx>:
>> On 7/10/2015 6:04 PM, Nick Østergaard wrote:
>>> 2015-07-10 20:52 GMT+02:00 Wayne Stambaugh <stambaughw@xxxxxxxxx>:
>>>> On 7/6/2015 6:25 PM, Nick Østergaard wrote:
>>>>>>>> I've only tested this on windows so please let me know if you find any
>>>>>>>> issues on other platforms.  For those of you who are using the msys2
>>>>>>>> package builder file PKGBUILD to build kicad, please note that the msys2
>>>>>>>> version of bzr is broken and will fail attempting to determine the bzr
>>>>>>>> version.  Please comment out the bzr source build dependency in PKGBUILD
>>>>>>>> and use one of the native bzr windows installers instead.  Make sure to
>>>>>>>> add the bzr executable to your system path so CMake can find it during
>>>>>>>> configuration.  I will remove it from the PKGBUILD file and send a pull
>>>>>>>> request to the msys2 devs when I get a chance.
>>>>>>>
>>>>>>> The PKGBUILD I am using is using git, because that is what the initial
>>>>>>> PKGBUILD was based upon, and git has proven much easier to work with
>>>>>>> in this regard too... bzr is very slow.
>>>>>>>
>>>>>>> With this I am currently patching the version string to calculate BZR
>>>>>>> version string and also list the short git commit hash.
>>>>>>>
>>>>>>> Are you interested in merging this patch by now?  It will also help
>>>>>>> other people using git to build with.  I guess I will have to apply
>>>>>>> the new logic from CreateBzrVersionHeader.cmake to my
>>>>>>> CreateGitVersionHeader.cmake.
>>>>>>
>>>>>> I will merge it if it helps create usable build version information.
>>>>>
>>>>> I hereby attach my patch, please consider it.
>>>>>
>>>>> Regards
>>>>> Nick Østergaard
>>>>>
>>>>
>>>> I managed to make a mess of this again.  It appears that I must have
>>>> been making changes to the CMake files which was forcing the version
>>>> header file to get rebuilt.  I did not fix the original issue of
>>>> updating the version header when the repo version was updated.  I just
>>>> committed a fix which actually works (I hope).  Please refactor your
>>>> patch accordingly.  It should be fairly trivial.  Sorry about the mistake.
>>>>
>>>> Cheers,
>>>>
>>>> Wayne
>>>
>>> I just tried to uplevel the patch, but I noticed that your latest
>>> commit does not seem to work. I don't get a version.h file by doing a
>>> regular cmake ../kicad-source
>>>
>>
>> This is correct.  Run make and see what happens when the common library
>> dependencies are resolved.  This was always the problem.  The version
>> header has to be check and updated or created every time make is run.
>> Otherwise it only gets run when cmake or make rebuild_cache (which
>> reruns the config with the previous settings) is run.
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> More help   : https://help.launchpad.net/ListHelp