From 9cf0f338498fe0d3b65a0b63bf89210d2bacacde Mon Sep 17 00:00:00 2001 From: Lightmann Date: Sun, 7 Jan 2024 11:20:09 -0500 Subject: [PATCH] Remove obsolete 'vendor' refs --- docs/source/structure.rst | 2 -- src/dragon/config/defaults.yml | 2 +- src/dragon/wizard.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/source/structure.rst b/docs/source/structure.rst index 05c99b432..b51aec992 100755 --- a/docs/source/structure.rst +++ b/docs/source/structure.rst @@ -17,5 +17,3 @@ src/: A place for out-sourced tools modified and built for use with dragon toolchain/: A place for a user-provided toolchain [unnecessary on Darwin platforms] -vendor/: - A place for tools and resources provided by dragon [not meant to be edited] diff --git a/src/dragon/config/defaults.yml b/src/dragon/config/defaults.yml index 8e5cf2f97..e8f542eb0 100644 --- a/src/dragon/config/defaults.yml +++ b/src/dragon/config/defaults.yml @@ -35,7 +35,7 @@ Defaults: additional_lib_dirs: additional_fw_dirs: prefix: [] - cinclude: '-I$dragon_root_dir/include -I$dragon_root_dir/vendor/include -I$dragon_root_dir/include/_fallback -I$dragon_root_dir/headers/ -I$pwd' + cinclude: '-I$dragon_root_dir/include -I$dragon_root_dir/include/_fallback -I$dragon_root_dir/headers/ -I$pwd' stagedir: '_' modulesinternal: '-fmodules -fcxx-modules -fmodule-name=$name -fbuild-session-file=$dragon_data_dir/modules/ -fmodules-validate-once-per-build-session -fmodules-prune-after=345600 -fmodules-prune-interval=86400' diff --git a/src/dragon/wizard.py b/src/dragon/wizard.py index b5d689a34..ec58f3d87 100644 --- a/src/dragon/wizard.py +++ b/src/dragon/wizard.py @@ -28,7 +28,7 @@ def setup_wizard(): os.chdir(dragon_root_dir) - for repo in ('lib', 'include', 'frameworks', 'vendor', 'sdks', 'src'): + for repo in ('lib', 'include', 'frameworks', 'sdks', 'src'): try: get_supporting( f'https://api.github.com/repos/DragonBuild/{repo}/releases/latest',