adding meson-build to the linux VM provisioning script #12224

marzer · 2020-07-02T18:56:03Z

A number of minor things relating to the use of the meson build system:

Adds a step to the x64-linux provisioning script to install meson 0.54.3
Fixes vcpkg_find_acquire_program suggesting that linux users use apt to install meson, instead of pip3
Updates vcpkg_find_acquire_program meson version to 0.54.3
Updates ports/tool-meson/CONTROL version to 0.54.3

What does your PR fix?
Doesn't fix, but contributes to, the resolution of #10786. A quick search of the issues for meson suggests that it would be useful for a number of others, too.

Which triplets are supported/not supported? Have you updated the CI baseline?
I don't think this question is relevant to my change, since I'm not submitting a port.

Does your PR follow the maintainer guide?
I believe so.

Neumann-A · 2020-07-02T20:00:55Z

actually it is better to use the meson supplied by VCPKG on linux and macos since the version in the system package manager is probably outdated by a lot and meson is more or less a moving target currently.
E.g. to correctly use meson with cmake dependency lookup it is basically required to use at least version 0.54.3

marzer · 2020-07-02T20:03:51Z

@Neumann-A I don't follow. meson doesn't seem to be on the x64-linux CI servers at all. That's what this PR is addressing.

scripts/azure-pipelines/linux/provision-image.sh

Neumann-A · 2020-07-02T20:14:07Z

@marzer: The trick is to make vcpkg_find_acquire_program work on linux. The main reason it is not working is because the script name in the download is meson.py and not just meson.

Neumann-A · 2020-07-02T20:15:43Z

considering that mesonbuild/meson#7190 is still not merged we may be forced to manually patch meson from within VCPKG.

MVoz · 2020-07-02T20:16:13Z

example ubuntu
https://launchpad.net/meson/+packages

...
Ubuntu | Cosmic (18.10) | meson | 0.47.2-1ubuntu2 |  
-- | -- | -- | -- | --
Ubuntu | Trusty (14.04) | meson |   |  
Ubuntu | Bionic (18.04) | meson | 0.45.1-2ubuntu0.18.04.2 |  
Ubuntu | Xenial (16.04) | meson | 0.40.1-1~ubuntu16.04.1
...

c72578 · 2020-07-02T20:19:24Z

example ubuntu
https://launchpad.net/meson/+packages

...
Ubuntu | Cosmic (18.10) | meson | 0.47.2-1ubuntu2 |  
-- | -- | -- | -- | --
Ubuntu | Trusty (14.04) | meson |   |  
Ubuntu | Bionic (18.04) | meson | 0.45.1-2ubuntu0.18.04.2 |  
Ubuntu | Xenial (16.04) | meson | 0.40.1-1~ubuntu16.04.1
...

Exactly - outdated versions.
And a recent version of meson can be obtained using pip - as suggested here in the PR.

MVoz · 2020-07-02T20:27:31Z

@marzer
https://pypi.org/project/meson/

latest
meson 0.54.3

pip3 install meson

marzer · 2020-07-02T20:30:44Z

@voskrese ...I know? That's what's being installed by this PR.

MVoz · 2020-07-02T20:32:08Z

@marzer
you do not need to specify the version to constantly change it to a newer one, the latest release is always installed

Neumann-A · 2020-07-02T20:32:14Z

please also update:

vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake

Lines 230 to 244 in 2ad4074

    
             elseif(VAR MATCHES "MESON") 
        
               set(PROGNAME meson) 
        
               set(REQUIRED_INTERPRETER PYTHON3) 
        
               set(BREW_PACKAGE_NAME "meson") 
        
               set(APT_PACKAGE_NAME "meson") 
        
               if(CMAKE_HOST_WIN32) 
        
                 set(SCRIPTNAME meson.py) 
        
               else() 
        
                 set(SCRIPTNAME meson) 
        
               endif() 
        
               set(PATHS ${DOWNLOADS}/tools/meson/meson-0.54.2) 
        
               set(URL "https://github.com/mesonbuild/meson/archive/0.54.2.zip") 
        
               set(ARCHIVE "meson-0.54.2.zip") 
        
               set(HASH 8d19110bad3e6a223d1d169e833b746b884ece9cd23d2539ec02dccb5cd0c56542414b7afc0f7f2adcec9d957e4120d31f41734397aa0a7ee7f9c29ebdc9eb4c) 
        
             elseif(VAR MATCHES "FLEX")

Neumann-A · 2020-07-02T20:33:04Z

@voskrese:
We need a fixed version for tools in vcpkg. Especially for meson where behavior might change drastically between versions

marzer · 2020-07-02T20:33:12Z

@voskrese I know. I added the explicit version as a result of a comment by @c72578 above.

MVoz · 2020-07-02T20:38:23Z

@Neumann-A

vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake

Lines 230 to 244 in 2ad4074

    
             elseif(VAR MATCHES "MESON") 
        
               set(PROGNAME meson) 
        
               set(REQUIRED_INTERPRETER PYTHON3) 
        
               set(BREW_PACKAGE_NAME "meson") 
        
               set(APT_PACKAGE_NAME "meson") 
        
               if(CMAKE_HOST_WIN32) 
        
                 set(SCRIPTNAME meson.py) 
        
               else() 
        
                 set(SCRIPTNAME meson) 
        
               endif() 
        
               set(PATHS ${DOWNLOADS}/tools/meson/meson-0.54.2) 
        
               set(URL "https://github.com/mesonbuild/meson/archive/0.54.2.zip") 
        
               set(ARCHIVE "meson-0.54.2.zip") 
        
               set(HASH 8d19110bad3e6a223d1d169e833b746b884ece9cd23d2539ec02dccb5cd0c56542414b7afc0f7f2adcec9d957e4120d31f41734397aa0a7ee7f9c29ebdc9eb4c) 
        
             elseif(VAR MATCHES "FLEX")

set(APT_PACKAGE_NAME "meson")

for users need to redo

Neumann-A · 2020-07-02T20:38:45Z

@BillyONeal: The question is do you want to update the VM or do you want to have vcpkg_find_acquire_program work on linux for meson. #11543 should have the required changes for vcpkg_find_acquire_program

Neumann-A · 2020-07-02T20:39:26Z

@voskrese: Maybe we should just make vcpkg_find_acquire_program just work on linux and osx

ghost · 2020-07-02T20:40:19Z

All CLA requirements met.

BillyONeal · 2020-07-02T20:54:56Z

@BillyONeal: The question is do you want to update the VM or do you want to have vcpkg_find_acquire_program work on linux for meson. #11543 should have the required changes for vcpkg_find_acquire_program

Just making find_acquire_program do the right thing would be preferable because there's less stuff for users to do.

@voskrese I know. I added the explicit version as a result of a comment by @c72578 above.

That's fixing our test machines to use the same version but I think @voskrese's comment is that we want the same version used on everyone's machine, so vcpkg should acquire this thing itself if possible.

marzer · 2020-07-02T20:57:48Z

Right, well I updated vcpkg_find_acquire_program, though I did nothing to fix it to use pip instead of apt. I know exactly zero cmake so I lack the skills to perform that in this PR (the other edits were simple substitutions)...

Edit: Oh, wait, it seems that APT_PACKAGE_NAME is just used for a help message. That wouldn't be too hard to add. Anything else would be well beyond me, though.

BillyONeal · 2020-07-02T21:02:10Z

I see, I'm not super familiar myself. Tagging 'requires:discussion' so other maintainers see.

marzer · 2020-07-02T21:03:11Z

I've also just realized I need to add ninja-build to the VM for meson to work, too.

BillyONeal · 2020-07-02T21:32:49Z

@marzer We should use the copy of ninja that Vcpkg already acquires in bootstrap if possible.

After some discussion we think this PR is OK: we still would prefer to see a better solution in vcpkg_find_acquire_program but this PR isn't really changing the status quo, it is only changing the specific version.

marzer · 2020-07-02T21:35:55Z

@BillyONeal

We should use the copy of ninja that Vcpkg already acquires in bootstrap if possible.

Alrighty, so should I remove ninja-build from the apt list?

we still would prefer to see a better solution in vcpkg_find_acquire_program

After reading the script a bit I'm starting to understand what's wrong with the current approach, given that (new, pip-installed) meson is a python script masquerading as a regular application, though I don't know how to make it work myself. @Neumann-A has some changes in another PR that might be relevant

c72578 · 2020-07-03T11:49:16Z

Please update also:
ports/tool-meson/CONTROL
Then, the version of meson is in sync at 0.54.3 with the other involved files.

also: - updated meson version in `vcpkg_find_acquire_program` to 0.54.3 - added a `PIP3_PACKAGE_NAME` option to the `vcpkg_find_acquire_program` help message generator - updated `ports/tool-meson/CONTROL` version to 0.54.3

marzer · 2020-08-11T17:26:46Z

I'm going to re-create this PR from a branch other than master because I've just realized doing it from master was, ahem, less-than-smart

~~New PR: #12858~~ Never mind. #12393 is a thing.

marzer mentioned this pull request Jul 2, 2020

[tomlplusplus] Add new port #10786

Merged

c72578 reviewed Jul 2, 2020

View reviewed changes

scripts/azure-pipelines/linux/provision-image.sh Outdated Show resolved Hide resolved

BillyONeal added the depends:vm-update PR contains changes to the VM provisioning scripts label Jul 2, 2020

BillyONeal added the requires:discussion label Jul 2, 2020

vicroms assigned BillyONeal Jul 2, 2020

BillyONeal removed the requires:discussion label Jul 2, 2020

adding meson-build to the linux VM provisioning script

961b953

also: - updated meson version in `vcpkg_find_acquire_program` to 0.54.3 - added a `PIP3_PACKAGE_NAME` option to the `vcpkg_find_acquire_program` help message generator - updated `ports/tool-meson/CONTROL` version to 0.54.3

marzer closed this Aug 11, 2020

marzer mentioned this pull request Aug 11, 2020

adding meson-build to the linux VM provisioning script #12858

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adding meson-build to the linux VM provisioning script #12224

adding meson-build to the linux VM provisioning script #12224

marzer commented Jul 2, 2020 •

edited

Loading

Neumann-A commented Jul 2, 2020

marzer commented Jul 2, 2020 •

edited

Loading

Neumann-A commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

MVoz commented Jul 2, 2020

c72578 commented Jul 2, 2020

MVoz commented Jul 2, 2020

marzer commented Jul 2, 2020

MVoz commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

marzer commented Jul 2, 2020

MVoz commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

ghost commented Jul 2, 2020 •

edited by ghost

Loading

BillyONeal commented Jul 2, 2020

marzer commented Jul 2, 2020 •

edited

Loading

BillyONeal commented Jul 2, 2020

marzer commented Jul 2, 2020

BillyONeal commented Jul 2, 2020

marzer commented Jul 2, 2020 •

edited

Loading

c72578 commented Jul 3, 2020

marzer commented Aug 11, 2020 •

edited

Loading

adding meson-build to the linux VM provisioning script #12224

adding meson-build to the linux VM provisioning script #12224

Conversation

marzer commented Jul 2, 2020 • edited Loading

Neumann-A commented Jul 2, 2020

marzer commented Jul 2, 2020 • edited Loading

Neumann-A commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

MVoz commented Jul 2, 2020

c72578 commented Jul 2, 2020

MVoz commented Jul 2, 2020

marzer commented Jul 2, 2020

MVoz commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

marzer commented Jul 2, 2020

MVoz commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

Neumann-A commented Jul 2, 2020

ghost commented Jul 2, 2020 • edited by ghost Loading

BillyONeal commented Jul 2, 2020

marzer commented Jul 2, 2020 • edited Loading

BillyONeal commented Jul 2, 2020

marzer commented Jul 2, 2020

BillyONeal commented Jul 2, 2020

marzer commented Jul 2, 2020 • edited Loading

c72578 commented Jul 3, 2020

marzer commented Aug 11, 2020 • edited Loading

marzer commented Jul 2, 2020 •

edited

Loading

marzer commented Jul 2, 2020 •

edited

Loading

ghost commented Jul 2, 2020 •

edited by ghost

Loading

marzer commented Jul 2, 2020 •

edited

Loading

marzer commented Jul 2, 2020 •

edited

Loading

marzer commented Aug 11, 2020 •

edited

Loading