Add the builded gtk paths (INCLUDE, LIB, LIBPATH, PATH) to the vs env… #125
Conversation
The unzip program is been added to the msys2 requirement.
… not builded in the session
build.py
Outdated
|
|
||
| if not os.path.exists(vcvars_bat): | ||
| raise Exception("'%s' could not be found. Please check you have Visual Studio installed at '%s' and that it supports the target platform '%s'." % (vcvars_bat, opts.vs_install_path, opts.platform)) | ||
|
|
||
| # Add to the environment the gtk paths so meson can find everything | ||
| self.add_env('INCLUDE', self.gtk_dir + r'\INCLUDE') |
There was a problem hiding this comment.
I know that on win upper case does not matter but I'd rather use lower case since it is what we generate, also for consistency do not align the parameters for different calls
There was a problem hiding this comment.
I've got the doubt and I miss both :(
The first version has the environment in lowercase but it feels (to me) a little bit wrong: historically the environment was on windows all uppercase so I upper all. Not a big deal, I fix it at once.
There was a problem hiding this comment.
It's too late, I need to rest. The path (r'\INCLUDE') should be lower case, not the set variable, right ?
There was a problem hiding this comment.
Yeah just the path, the environment variable should still be uppercase
build.py
Outdated
| @@ -1678,12 +1677,23 @@ class Builder(object): | |||
| def __init__(self, opts): | |||
| self.opts = opts | |||
|
|
|||
| self.__check_tools(opts) | |||
| self.__check_vs(opts) | |||
| # Check and normalize the platform | |||
There was a problem hiding this comment.
I'd rather see this as a different patch
build.py
Outdated
| @@ -1740,11 +1751,18 @@ def __check_vs(self, opts): | |||
| if not os.path.exists(vcvars_bat): | |||
| raise Exception("'%s' could not be found. Please check you have Visual Studio installed at '%s' and that it supports the target platform '%s'." % (vcvars_bat, opts.vs_install_path, opts.platform)) | |||
|
|
|||
| # Add to the environment the gtk paths so meson can find everything | |||
| self.add_env('INCLUDE', self.gtk_dir + r'\include') | |||
There was a problem hiding this comment.
sorry to not point out this before, but can we use os.path.join instead of that +?
There was a problem hiding this comment.
Yes, you're completely right.
BTW I finally (once, but I'm confident for the future) been able to do the rebase to squash the commits: I think that my mistake was not using the -f in the final push so git told me that I was not syncronzed with all the refs and then I start to push, pull, fetch, drink & jump, random, to try to fix it, ending up with 10 commits :(
|
Looks good. Can you squash them? |
|
Squashed, I hope (twice, because the first time I forgot a conflict marker). |
|
mmm, there is something wrong, I see 6 commits... |
|
Arghhh! These are coming form before I use the squash, so the last three commits are merged but the old one not, sorry. I opened a new pull request (#127) with the clean commit, sorry. |
|
Closing this one. |
…ironment
Resolve #124.
I have to move up the platform detection & normalization (x86 -> Win32) before checking the vs presence otherwise or the gtk path was missing (attribute error) or badly set (the default is x86 so I end up with a path of c:\gtk-build\gtk\x86.... instead of .. gtk\win32\ ..