On 5/8/18 9:04 AM, Jaap Keuter wrote:
>
>
>> On 8 May 2018, at 17:06, Graham Bloice <graham.bloice@xxxxxxxxxxxxx
>> <mailto:graham.bloice@xxxxxxxxxxxxx>> wrote:
>>
>>
>>
>> On Tue, 8 May 2018 at 15:46, Jaap Keuter <jaap.keuter@xxxxxxxxx
>> <mailto:jaap.keuter@xxxxxxxxx>> wrote:
>>
>>
>>
>>> On 8 May 2018, at 14:20, Graham Bloice <graham.bloice@xxxxxxxxxxxxx
>>> <mailto:graham.bloice@xxxxxxxxxxxxx>> wrote:
>>>
>>>
>>>
>>> On Tue, 8 May 2018 at 13:11, Jaap Keuter <jaap.keuter@xxxxxxxxx
>>> <mailto:jaap.keuter@xxxxxxxxx>> wrote:
>>>
>>> Hi list,
>>>
>>> In autotools times (i.e., 2.6.x) I was used to run:
>>>
>>> $ make dist
>>>
>>> to get a Wireshark source code tarball.
>>> It looks like CMake wants to offer something similar
>>>
>>> $ cmake ../ -DWS_SOURCE_DIR=“/tmp/wireshark”
>>> $ make dist
>>>
>>> But this fails over unreachable target ‘package_source’.
>>> So, is this even supposed to work?
>>> It uses cmake/modules/Dist.cmake, a module gone from the master.
>>> Do we now fall back to tools/git-export-release.sh?
>>> What am I missing here?
>>>
>>>
>>> Seems to be what the buildbot is
>>> doing: https://buildbot.wireshark.org/wireshark-master/builders/Ubuntu%2016.04%20x64/builds/5055/steps/git-export-release/logs/stdio
>>>
>>> --
>>> Graham Bloice
>>>
>>>
>>
>> Indeed, for master.
>>
>> What about master-2.6? There the autotools tarball build is used on
>> the buildbot.
>> How is it supposed to work there with CMake?
>>
>> Thanks,
>> Jaap
>>
>>
>>
>> That would seem to still be using autotools and "make
>> dist": https://buildbot.wireshark.org/wireshark-2.6/builders/Ubuntu%2016.04%20x64/builds/101/steps/shell_2/logs/stdio
>>
>> --
>> Graham Bloice
>
> For the official release tarballs, yes.
> But that is not the question. The question is how this is supposed to work
> with CMake in master-2.6?
> Or is is not supposed to work at all, because then there’s rubbish in the
> repository suggesting it is.
It looks like we originally tried to leverage CPack for the CMake "dist" target in 035e404fff, then removed support for CPack itself in 0831becc1a. We don't exercise this target on the builders and I'm not sure if anyone else uses it. We could remove it or backport the non-RPM parts of c8cf127375 to master-2.6. Which would make more sense?