Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cppstd as a subsetting of compiler #4917

Merged
merged 73 commits into from May 3, 2019
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
84009cb
create migration and introduce compiler.cppstd setting
jgsogo Apr 5, 2019
03cb75e
add tests at the profile level
jgsogo Apr 5, 2019
3928d79
add comment
jgsogo Apr 5, 2019
fc87bbb
keep old naming, add per compiler
jgsogo Apr 5, 2019
ebc3662
validation of package settings is done in the graph
jgsogo Apr 9, 2019
5033e8e
add checks for scoped settings
jgsogo Apr 9, 2019
dd67039
fix some tests (still some failing)
jgsogo Apr 9, 2019
ed405e1
use compiler.cppstd instead of .cppstd (fix some tests)
jgsogo Apr 10, 2019
82d3b92
raise for undefined setting compiler.cppstd
jgsogo Apr 10, 2019
166b814
fix test, mocked settings needs a fields
jgsogo Apr 10, 2019
c4643b2
remove typos
jgsogo Apr 10, 2019
db138de
Merge remote-tracking branch 'conan/develop' into feat/4873-cppstd-su…
jgsogo Apr 10, 2019
2451039
lost in migration
jgsogo Apr 10, 2019
93536a4
catch deprecation warnings for tests coming from previous merge
jgsogo Apr 10, 2019
374dfc2
check settings after contraining
jgsogo Apr 10, 2019
35c2a4d
test recipe with cppstd but without compiler
jgsogo Apr 10, 2019
3bac571
fix pep8
jgsogo Apr 10, 2019
98c3989
fix some tests
jgsogo Apr 10, 2019
9f9620b
up parameterized (add handy parameterized_class decorator)
jgsogo Apr 10, 2019
67db297
Merge branch 'dep/up-parameterized' into feat/4873-cppstd-subsetting
jgsogo Apr 10, 2019
9cb9faf
no need to warn twice (if we are check_cppstd for the conanfile)
jgsogo Apr 10, 2019
a14a495
keep the warning for the user (in console, not to stderr)
jgsogo Apr 10, 2019
1b6d458
need fields attribute again
jgsogo Apr 10, 2019
7ecf2ea
calls to build need to silence warnings
jgsogo Apr 10, 2019
f874eda
need a better mock
jgsogo Apr 10, 2019
9307770
add compiler version (needed to pass tests when the default compiler …
jgsogo Apr 10, 2019
85b8d23
add libcxx to compiler
jgsogo Apr 10, 2019
6a2e831
use cppstd=17 as it is also supported for Visual Studio (when running…
jgsogo Apr 10, 2019
c5c1965
catch warnings of test using cppstd in command line
jgsogo Apr 10, 2019
bb2bc3d
force a known default profile
jgsogo Apr 10, 2019
6036696
fix test for windows
jgsogo Apr 10, 2019
3007f8d
Add tests checking ID for different 'cppstd' strategies
jgsogo Apr 15, 2019
b64ec64
Merge branch 'feat/4873-cppstd-tests' into feat/4873-cppstd-subsetting
jgsogo Apr 15, 2019
f372619
catch warnings
jgsogo Apr 15, 2019
b2b45b1
order imports
jgsogo Apr 15, 2019
f3df1e6
Merge branch 'feat/4873-cppstd-tests' into feat/4873-cppstd-subsetting
jgsogo Apr 15, 2019
7629f1e
do not allow the user to specify both settings
jgsogo Apr 15, 2019
da53c5d
fix cancelation of cppstd for default value
jgsogo Apr 15, 2019
c3cf564
add tests (methodic) for compiler.cppstd with default value
jgsogo Apr 15, 2019
0b8cc79
Add some notices: settings are being constrained before check
jgsogo Apr 15, 2019
65b4339
typo, proper way to check if in settings
jgsogo Apr 15, 2019
809661c
no need to try/except
jgsogo Apr 15, 2019
b28a400
set compiler.cppstd to default value if it is not given (neither cpps…
jgsogo Apr 26, 2019
35e55fa
note about ConanInfo.loads
jgsogo Apr 26, 2019
8e8fcf5
at the moment of executing, settings can be different (info.header_on…
jgsogo Apr 26, 2019
4bd4974
Merge remote-tracking branch 'conan/develop' into feat/4873-cppstd-su…
jgsogo Apr 26, 2019
5242eae
organize code related to std_matching
jgsogo Apr 29, 2019
5e64300
minimize changes in default_cppstd_test
jgsogo Apr 29, 2019
61d47ba
Merge remote-tracking branch 'conan/develop' into feat/4873-cppstd-su…
jgsogo Apr 29, 2019
38ec954
add settings for 1.15
jgsogo Apr 29, 2019
28cf036
remove comment
jgsogo Apr 29, 2019
193be14
validate scoped profile at the very beginning
jgsogo Apr 29, 2019
b6a0a50
do not copy if not needed
jgsogo Apr 29, 2019
141d402
we removed a call to deprecation... we raise less deprecation errors
jgsogo Apr 29, 2019
c726584
we removed a call to deprecation... we raise less deprecation errors
jgsogo Apr 29, 2019
a958a47
cppstd deprecation message (for recipe) as warning
jgsogo Apr 30, 2019
6ddc385
Merge remote-tracking branch 'conan/develop' into feat/4873-cppstd-su…
jgsogo Apr 30, 2019
124ac14
use setting compiler.cppstd in build_helpers
jgsogo Apr 30, 2019
5526a98
deprecate functions 'default_std_[non_]matching' for compiler.cppstd
jgsogo Apr 30, 2019
6a59a69
Merge remote-tracking branch 'conan/develop' into feat/4873-cppstd-su…
jgsogo Apr 30, 2019
325f964
for pure_c, remove the compiler.cppstd subsetting
jgsogo Apr 30, 2019
5785d10
checksum for conanfile template is different
jgsogo Apr 30, 2019
3edfe5c
the flag is passed to the compiler
jgsogo Apr 30, 2019
218a148
examples of C library
jgsogo May 1, 2019
2a54111
ID will be different for different platforms
jgsogo May 1, 2019
1db65da
the id depends on other defaults (remove that test)
jgsogo May 1, 2019
ffd567c
Merge branch 'feat/4873-cppstd-subsetting-c-library' into feat/4873-c…
jgsogo May 1, 2019
92ea7ff
do not populate default value of 'compiler.cppstd'
jgsogo May 3, 2019
b3c0c50
no longer used function
jgsogo May 3, 2019
de8d7fe
revert changes associated to checksum of conanfile generated for testing
jgsogo May 3, 2019
c27c802
relax failure on user side
jgsogo May 3, 2019
57e53b7
remove tests (not for this PR)
jgsogo May 3, 2019
b5f2300
migrations_settings is populated just before the release
jgsogo May 3, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

remove typos

  • Loading branch information...
jgsogo committed Apr 10, 2019
commit c4643b28d7413659890b44b1d05ee201b3f4e6ba
@@ -66,7 +66,6 @@ def build(self):
'-s compiler.libcxx="libstdc++" '
'--build missing')
self.assertIn("BUILDING!", client.out)
client.run("search MyLib/0.1@user/testing")

# Add the setting but with the default value, should not build again
client.save({CONANFILE: conanfile % '"cppstd"'}) # With the setting
@@ -75,7 +74,6 @@ def build(self):
'-s compiler.libcxx="libstdc++" '
'-s cppstd=gnu14 '
'--build missing')
client.run("search MyLib/0.1@user/testing")

if client.cache.config.revisions_enabled:
self.assertIn("doesn't belong to the installed recipe revision, removing folder",
@@ -48,7 +48,7 @@ def variables_setup_test(self):
self.assertIn('set(CONAN_USER_LIB1_myvar2 "myvalue2")', cmake_lines)
self.assertIn('set(CONAN_USER_LIB2_MYVAR2 "myvalue4")', cmake_lines)

def test_paths_cmake_multi_user_vars_test(self):
def paths_cmake_multi_user_vars_test(self):
settings_mock = namedtuple("Settings", "build_type, os, os_build, constraint, fields")
conanfile = ConanFile(TestBufferConanOutput(), None)
conanfile.initialize(settings_mock("Release", None, None,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.