Wireshark · Wireshark-dev: Re: [Wireshark-dev] Usage of make-version.pl

[Juan Jose Martin Carrascosa <juanjo@xxxxxxx>]

Actually, this is the one winning:

enable: 1

pkg_format: -ABCD

pkg_enable: 1

Thanks Pascal!

Juanjo

On Mon, Mar 23, 2015 at 6:47 PM, Pascal Quantin <pascal.quantin@xxxxxxxxx> wrote:

2015-03-23 18:42 GMT+01:00 Juan Jose Martin Carrascosa <juanjo@xxxxxxx>:

Thanks for the prompt reply Pascal.

I already knew how to "hard code" it within configure.ac. I just wanted to know if we had a more elegant way.

Thanks again, it is awesome to have this help since I am alone working on this :)

Juanjo

Did you give a try to the following command?

perl make-version.pl --set-release

with a version.conf file containing:
enable: 1
pkg_format: %#-ABCD
pkg_enable: 1

Pascal.

On Mon, Mar 23, 2015 at 6:38 PM, Pascal Quantin <pascal.quantin@xxxxxxxxx> wrote:

2015-03-23 17:49 GMT+01:00 Juan Jose Martin Carrascosa <juanjo@xxxxxxx>:

Hi all,

I am building Wireshark for Windows, Linux and Mac. I have been reading and analyzing the make-version.pl script and I have found that I am not a perl expert: I have no idea about how to use version.conf.

Can anyone tell me what to put in version.conf and what arguments to use when calling make-version.pl if I want to add an extra version like "-ABCD"?

For instance, Wireshark 1.99.1-ABCD. Sorry for the newbie question!

Hi Juanjo,

this is supported natively for Windows, you just need to edit config.nmake to set the VERSION_EXTRA variable.

For Linux/Mac, this does not seem to be supported out of the box. What you might try (but I have not verified this myself and I'm more a Windows guy so autofoo is kind of magic for me) is to edit configure.ac and put your string in the empty square brackets of the line:
m4_append([version_micro_extra], [])

Other might have a better answers ;)

Regards,

Pascal.

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe